#include <glib/gi18n-lib.h>
#include <tp-account-widgets/tpaw-camera-monitor.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
#include "empathy-account-selector-dialog.h"
#include "empathy-call-utils.h"
G_DEFINE_TYPE (EmpathyIndividualMenu, empathy_individual_menu, GTK_TYPE_MENU);
-static GtkWidget * empathy_individual_chat_menu_item_new (
- EmpathyIndividualMenu *self, FolksIndividual *individual);
-static GtkWidget * empathy_individual_sms_menu_item_new (
- EmpathyIndividualMenu *self, FolksIndividual *individual);
-static GtkWidget * empathy_individual_log_menu_item_new (
+static GtkWidget * chat_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual);
-static GtkWidget * empathy_individual_info_menu_item_new (
- FolksIndividual *individual);
-static GtkWidget * empathy_individual_edit_menu_item_new (
+static GtkWidget * chat_menu_item_new_contact (EmpathyIndividualMenu *self,
+ EmpathyContact *contact);
+static GtkWidget * sms_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual);
-static GtkWidget * empathy_individual_invite_menu_item_new (
- FolksIndividual *individual,
+static GtkWidget * sms_menu_item_new_contact (EmpathyIndividualMenu *self,
+ EmpathyContact *contact);
+static GtkWidget * audio_call_menu_item_new_contact (
+ EmpathyIndividualMenu *self,
EmpathyContact *contact);
-static GtkWidget * empathy_individual_file_transfer_menu_item_new (
- EmpathyIndividualMenu *self, FolksIndividual *individual);
-static GtkWidget * empathy_individual_share_my_desktop_menu_item_new (
- EmpathyIndividualMenu *self, FolksIndividual *individual);
-static GtkWidget * empathy_individual_favourite_menu_item_new (
+static GtkWidget * video_call_menu_item_new_contact (
+ EmpathyIndividualMenu *self,
+ EmpathyContact *contact);
+static GtkWidget * log_menu_item_new_individual (FolksIndividual *individual);
+static GtkWidget * log_menu_item_new_contact (EmpathyContact *contact);
+static GtkWidget * info_menu_item_new_individual (FolksIndividual *individual);
+static GtkWidget * edit_menu_item_new_individual (FolksIndividual *individual);
+static GtkWidget * invite_menu_item_new (FolksIndividual *individual,
+ EmpathyContact *contact);
+static GtkWidget * file_transfer_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual);
-static GtkWidget * empathy_individual_add_menu_item_new (
+static GtkWidget * file_transfer_menu_item_new_contact (
EmpathyIndividualMenu *self,
+ EmpathyContact *contact);
+static GtkWidget * share_my_desktop_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual);
-static GtkWidget * empathy_individiual_block_menu_item_new (
+static GtkWidget * share_my_desktop_menu_item_new_contact (
+ EmpathyIndividualMenu *self,
+ EmpathyContact *contact);
+static GtkWidget * favourite_menu_item_new_individual (FolksIndividual *individual);
+static GtkWidget * add_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual);
-static GtkWidget * empathy_individiual_remove_menu_item_new (
- EmpathyIndividualMenu *self);
+static GtkWidget * block_menu_item_new_individual (FolksIndividual *individual);
+static GtkWidget * remove_menu_item_new_individual (EmpathyIndividualMenu *self);
static void
individual_menu_add_personas (EmpathyIndividualMenu *self,
g_clear_object (&persona);
}
+ g_clear_object (&iter);
+
/* return early if these entries would add nothing beyond the "quick" items */
if (persona_count <= 1)
goto out;
FolksPersonaStore *store;
const gchar *account;
GtkWidget *action;
- /* Individual containing only persona */
- FolksIndividual *single_individual;
if (!empathy_folks_persona_is_interesting (FOLKS_PERSONA (persona)))
goto while_finish;
goto while_finish;
contact = empathy_contact_dup_from_tp_contact (tp_contact);
- single_individual = empathy_create_individual_from_tp_contact (
- tp_contact);
-
- /* Pretty hacky. Creating single_individual had a side effect to change
- * persona.individual from individual to single_individual which is not
- * what we want so we set it back. See bgo#684971 for details. */
- g_object_set (persona, "individual", individual, NULL);
store = folks_persona_get_store (FOLKS_PERSONA (persona));
account = folks_persona_store_get_display_name (store);
/* Chat */
if (features & EMPATHY_INDIVIDUAL_FEATURE_CHAT)
{
- action = empathy_individual_chat_menu_item_new (self,
- single_individual);
+ action = chat_menu_item_new_contact (self, contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
/* SMS */
if (features & EMPATHY_INDIVIDUAL_FEATURE_SMS)
{
- action = empathy_individual_sms_menu_item_new (self,
- single_individual);
+ action = sms_menu_item_new_contact (self, contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
if (features & EMPATHY_INDIVIDUAL_FEATURE_CALL)
{
/* Audio Call */
- action = empathy_individual_audio_call_menu_item_new (
- self, single_individual);
+ action = audio_call_menu_item_new_contact (self, contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
/* Video Call */
- action = empathy_individual_video_call_menu_item_new (
- self, single_individual);
+ action = video_call_menu_item_new_contact (self, contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
/* Log */
if (features & EMPATHY_INDIVIDUAL_FEATURE_LOG)
{
- action = empathy_individual_log_menu_item_new (single_individual);
+ action = log_menu_item_new_contact (contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
/* Invite */
- action = empathy_individual_invite_menu_item_new (NULL, contact);
+ action = invite_menu_item_new (NULL, contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
/* File transfer */
if (features & EMPATHY_INDIVIDUAL_FEATURE_FILE_TRANSFER)
{
- action = empathy_individual_file_transfer_menu_item_new (
- self, single_individual);
+ action = file_transfer_menu_item_new_contact (self, contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
/* Share my desktop */
- action = empathy_individual_share_my_desktop_menu_item_new (
- self, single_individual);
+ action = share_my_desktop_menu_item_new_contact (self, contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
- /* Block */
- if (features & EMPATHY_INDIVIDUAL_FEATURE_BLOCK &&
- (item = empathy_individiual_block_menu_item_new (single_individual))
- != NULL) {
- GtkWidget *sep;
-
- sep = gtk_separator_menu_item_new ();
- gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), sep);
- gtk_widget_show (sep);
-
- gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), item);
- gtk_widget_show (item);
- }
-
gtk_menu_shell_append (GTK_MENU_SHELL (menu), contact_item);
gtk_widget_show (contact_item);
g_free (label);
g_object_unref (contact);
- g_object_unref (single_individual);
while_finish:
g_clear_object (&persona);
call_phone_number (FolksPhoneFieldDetails *details,
TpAccount *account)
{
- DEBUG ("Try to call %s", folks_phone_field_details_get_normalised (details));
+ gchar *number;
- empathy_call_new_with_streams (
- folks_phone_field_details_get_normalised (details),
- account, TRUE, FALSE, empathy_get_current_action_time ());
+ number = folks_phone_field_details_get_normalised (details);
+ DEBUG ("Try to call %s", number);
+
+ empathy_call_new_with_streams (number,
+ account, FALSE, empathy_get_current_action_time ());
+
+ g_free (number);
}
static void
{
GeeCollection *types;
GeeIterator *iter;
+ const gchar *retval = NULL;
types = folks_abstract_field_details_get_parameter_values (
FOLKS_ABSTRACT_FIELD_DETAILS (details), "type");
iter = gee_iterable_iterator (GEE_ITERABLE (types));
while (gee_iterator_next (iter))
{
- const gchar *type = gee_iterator_get (iter);
+ gchar *type = gee_iterator_get (iter);
if (!tp_strdiff (type, "CELL"))
- return _("Mobile");
+ retval = _("Mobile");
else if (!tp_strdiff (type, "WORK"))
- return _("Work");
+ retval = _("Work");
else if (!tp_strdiff (type, "HOME"))
- return _("HOME");
+ retval = _("HOME");
+
+ g_free (type);
+
+ if (retval != NULL)
+ break;
}
- return NULL;
+ g_object_unref (iter);
+
+ return retval;
}
static void
{
FolksPhoneFieldDetails *details = gee_iterator_get (iter);
GtkWidget *item, *image;
- gchar *tmp;
+ gchar *tmp, *number;
const gchar *type;
type = find_phone_type (details);
+ number = folks_phone_field_details_get_normalised (details);
if (type != NULL)
{
- tmp = g_strdup_printf ("Call %s (%s)",
- folks_phone_field_details_get_normalised (details),
- type);
+ /* translators: first argument is a phone number like +32123456 and
+ * the second one is something like 'home' or 'work'. */
+ tmp = g_strdup_printf (_("Call %s (%s)"), number, type);
}
else
{
- tmp = g_strdup_printf ("Call %s",
- folks_phone_field_details_get_normalised (details));
+ /* translators: argument is a phone number like +32123456 */
+ tmp = g_strdup_printf (_("Call %s"), number);
}
+ g_free (number);
+
item = gtk_image_menu_item_new_with_mnemonic (tmp);
g_free (tmp);
gtk_menu_shell_append (GTK_MENU_SHELL (self), item);
gtk_widget_show (item);
+
+ g_object_unref (details);
}
g_object_unref (iter);
TpConnection *conn;
if (!TPF_IS_PERSONA (persona))
- continue;
+ goto while_next;
contact = tpf_persona_get_contact (persona);
if (contact == NULL)
- continue;
+ goto while_next;
conn = tp_contact_get_connection (contact);
if (tp_proxy_has_interface_by_id (conn,
TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING))
result = g_list_prepend (result, contact);
+
+while_next:
+ g_clear_object (&persona);
}
g_clear_object (&iter);
}
static GtkWidget *
-empathy_individiual_block_menu_item_new (FolksIndividual *individual)
+block_menu_item_new_individual (FolksIndividual *individual)
{
GtkWidget *item;
GList *contacts, *l;
}
static GtkWidget *
-empathy_individiual_remove_menu_item_new (EmpathyIndividualMenu *self)
+remove_menu_item_new_individual (EmpathyIndividualMenu *self)
{
GeeSet *personas;
GeeIterator *iter;
/* Add contact */
if (features & EMPATHY_INDIVIDUAL_FEATURE_ADD_CONTACT)
{
- item = empathy_individual_add_menu_item_new (self, individual);
+ item = add_menu_item_new_individual (self, individual);
if (item != NULL)
{
gtk_menu_shell_append (GTK_MENU_SHELL (shell), item);
/* Chat */
if (features & EMPATHY_INDIVIDUAL_FEATURE_CHAT)
{
- item = empathy_individual_chat_menu_item_new (self, individual);
+ item = chat_menu_item_new_individual (self, individual);
if (item != NULL)
{
gtk_menu_shell_append (shell, item);
/* SMS */
if (features & EMPATHY_INDIVIDUAL_FEATURE_SMS)
{
- item = empathy_individual_sms_menu_item_new (self, individual);
+ item = sms_menu_item_new_individual (self, individual);
if (item != NULL)
{
gtk_menu_shell_append (shell, item);
if (features & EMPATHY_INDIVIDUAL_FEATURE_CALL)
{
/* Audio Call */
- item = empathy_individual_audio_call_menu_item_new (self, individual);
+ item = empathy_individual_audio_call_menu_item_new_individual (self,
+ individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
/* Video Call */
- item = empathy_individual_video_call_menu_item_new (self, individual);
+ item = empathy_individual_video_call_menu_item_new_individual (self,
+ individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
add_phone_numbers (self);
/* Invite */
- item = empathy_individual_invite_menu_item_new (individual, NULL);
+ item = invite_menu_item_new (individual, NULL);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
/* File transfer */
if (features & EMPATHY_INDIVIDUAL_FEATURE_FILE_TRANSFER)
{
- item = empathy_individual_file_transfer_menu_item_new (self, individual);
+ item = file_transfer_menu_item_new_individual (self, individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
/* Share my desktop */
/* FIXME we should add the "Share my desktop" menu item if Vino is
a registered handler in MC5 */
- item = empathy_individual_share_my_desktop_menu_item_new (self, individual);
+ item = share_my_desktop_menu_item_new_individual (self, individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
/* Edit */
if (features & EMPATHY_INDIVIDUAL_FEATURE_EDIT)
{
- item = empathy_individual_edit_menu_item_new (individual);
+ item = edit_menu_item_new_individual (individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
/* Log */
if (features & EMPATHY_INDIVIDUAL_FEATURE_LOG)
{
- item = empathy_individual_log_menu_item_new (individual);
+ item = log_menu_item_new_individual (individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
/* Info */
if (features & EMPATHY_INDIVIDUAL_FEATURE_INFO)
{
- item = empathy_individual_info_menu_item_new (individual);
+ item = info_menu_item_new_individual (individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
/* Favorite checkbox */
if (features & EMPATHY_INDIVIDUAL_FEATURE_FAVOURITE)
{
- item = empathy_individual_favourite_menu_item_new (individual);
+ item = favourite_menu_item_new_individual (individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
/* Separator & Block */
if (features & EMPATHY_INDIVIDUAL_FEATURE_BLOCK &&
- (item = empathy_individiual_block_menu_item_new (individual)) != NULL) {
+ (item = block_menu_item_new_individual (individual)) != NULL) {
GtkWidget *sep;
sep = gtk_separator_menu_item_new ();
/* Separator & Remove */
if (features & EMPATHY_INDIVIDUAL_FEATURE_REMOVE &&
- (item = empathy_individiual_remove_menu_item_new (self)) != NULL) {
+ (item = remove_menu_item_new_individual (self)) != NULL) {
GtkWidget *sep;
sep = gtk_separator_menu_item_new ();
}
static GtkWidget *
-empathy_individual_chat_menu_item_new (EmpathyIndividualMenu *self,
- FolksIndividual *individual)
+chat_menu_item_new (EmpathyIndividualMenu *self)
{
GtkWidget *item;
GtkWidget *image;
- g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual) &&
- empathy_folks_individual_contains_contact (individual), NULL);
-
item = gtk_image_menu_item_new_with_mnemonic (_("_Chat"));
image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_MESSAGE,
GTK_ICON_SIZE_MENU);
gtk_widget_show (image);
g_object_set_data (G_OBJECT (item), "individual-menu", self);
+
+ return item;
+}
+
+static GtkWidget *
+chat_menu_item_new_individual (EmpathyIndividualMenu *self,
+ FolksIndividual *individual)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual) &&
+ empathy_folks_individual_contains_contact (individual), NULL);
+
+ item = chat_menu_item_new (self);
+
menu_item_set_first_contact (item, individual,
G_CALLBACK (empathy_individual_chat_menu_item_activated),
EMPATHY_ACTION_CHAT);
return item;
}
+static GtkWidget *
+chat_menu_item_new_contact (EmpathyIndividualMenu *self,
+ EmpathyContact *contact)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+
+ item = chat_menu_item_new (self);
+
+ menu_item_set_contact (item, contact,
+ G_CALLBACK (empathy_individual_chat_menu_item_activated),
+ EMPATHY_ACTION_CHAT);
+
+ return item;
+}
+
static void
empathy_individual_sms_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
}
static GtkWidget *
-empathy_individual_sms_menu_item_new (EmpathyIndividualMenu *self,
- FolksIndividual *individual)
+sms_menu_item_new (EmpathyIndividualMenu *self)
{
GtkWidget *item;
GtkWidget *image;
- g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual) &&
- empathy_folks_individual_contains_contact (individual), NULL);
-
item = gtk_image_menu_item_new_with_mnemonic (_("_SMS"));
image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_SMS,
GTK_ICON_SIZE_MENU);
gtk_widget_show (image);
g_object_set_data (G_OBJECT (item), "individual-menu", self);
+
+ return item;
+}
+
+static GtkWidget *
+sms_menu_item_new_individual (EmpathyIndividualMenu *self,
+ FolksIndividual *individual)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual) &&
+ empathy_folks_individual_contains_contact (individual), NULL);
+
+ item = sms_menu_item_new (self);
+
menu_item_set_first_contact (item, individual,
G_CALLBACK (empathy_individual_sms_menu_item_activated),
EMPATHY_ACTION_SMS);
return item;
}
+static GtkWidget *
+sms_menu_item_new_contact (EmpathyIndividualMenu *self,
+ EmpathyContact *contact)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+
+ item = sms_menu_item_new (self);
+
+ menu_item_set_contact (item, contact,
+ G_CALLBACK (empathy_individual_sms_menu_item_activated),
+ EMPATHY_ACTION_SMS);
+
+ return item;
+}
+
+
static void
empathy_individual_audio_call_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
empathy_call_new_with_streams (empathy_contact_get_id (contact),
empathy_contact_get_account (contact),
- TRUE, FALSE,
- empathy_get_current_action_time ());
+ FALSE, empathy_get_current_action_time ());
emit_menu_item_activated (item);
}
-GtkWidget *
-empathy_individual_audio_call_menu_item_new (EmpathyIndividualMenu *self,
- FolksIndividual *individual)
+static GtkWidget *
+audio_call_menu_item_new (EmpathyIndividualMenu *self)
{
GtkWidget *item;
GtkWidget *image;
- g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
-
item = gtk_image_menu_item_new_with_mnemonic (C_("menu item", "_Audio Call"));
image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_VOIP, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
gtk_widget_show (image);
g_object_set_data (G_OBJECT (item), "individual-menu", self);
+
+ return item;
+}
+
+GtkWidget *
+empathy_individual_audio_call_menu_item_new_individual (
+ EmpathyIndividualMenu *self,
+ FolksIndividual *individual)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
+
+ item = audio_call_menu_item_new (self);
+
menu_item_set_first_contact (item, individual,
G_CALLBACK (empathy_individual_audio_call_menu_item_activated),
EMPATHY_ACTION_AUDIO_CALL);
return item;
}
+static GtkWidget *
+audio_call_menu_item_new_contact (
+ EmpathyIndividualMenu *self,
+ EmpathyContact *contact)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+
+ item = audio_call_menu_item_new (self);
+
+ menu_item_set_contact (item, contact,
+ G_CALLBACK (empathy_individual_audio_call_menu_item_activated),
+ EMPATHY_ACTION_AUDIO_CALL);
+
+ return item;
+}
+
+
static void
empathy_individual_video_call_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
empathy_call_new_with_streams (empathy_contact_get_id (contact),
empathy_contact_get_account (contact),
- TRUE, TRUE,
- empathy_get_current_action_time ());
+ TRUE, empathy_get_current_action_time ());
emit_menu_item_activated (item);
}
-GtkWidget *
-empathy_individual_video_call_menu_item_new (EmpathyIndividualMenu *self,
- FolksIndividual *individual)
+static GtkWidget *
+video_call_menu_item_new (EmpathyIndividualMenu *self)
{
GtkWidget *item;
GtkWidget *image;
- TpawCameraMonitor *monitor;
-
- g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
item = gtk_image_menu_item_new_with_mnemonic (C_("menu item", "_Video Call"));
image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_VIDEO_CALL,
gtk_widget_show (image);
g_object_set_data (G_OBJECT (item), "individual-menu", self);
- menu_item_set_first_contact (item, individual,
- G_CALLBACK (empathy_individual_video_call_menu_item_activated),
- EMPATHY_ACTION_VIDEO_CALL);
+
+ return item;
+}
+
+static void
+check_camera_available (GtkWidget *item)
+{
+ TpawCameraMonitor *monitor;
/* Only follow available cameras if the contact can do Video calls */
if (gtk_widget_get_sensitive (item))
g_object_bind_property (monitor, "available", item, "sensitive",
G_BINDING_SYNC_CREATE);
}
+}
+
+GtkWidget *
+empathy_individual_video_call_menu_item_new_individual (
+ EmpathyIndividualMenu *self,
+ FolksIndividual *individual)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
+
+ item = video_call_menu_item_new (self);
+
+ menu_item_set_first_contact (item, individual,
+ G_CALLBACK (empathy_individual_video_call_menu_item_activated),
+ EMPATHY_ACTION_VIDEO_CALL);
+
+ check_camera_available (item);
+
+ return item;
+}
+
+GtkWidget *
+video_call_menu_item_new_contact (EmpathyIndividualMenu *self,
+ EmpathyContact *contact)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+
+ item = video_call_menu_item_new (self);
+
+ menu_item_set_contact (item, contact,
+ G_CALLBACK (empathy_individual_video_call_menu_item_activated),
+ EMPATHY_ACTION_VIDEO_CALL);
+
+ check_camera_available (item);
return item;
}
}
static GtkWidget *
-empathy_individual_log_menu_item_new (FolksIndividual *individual)
+log_menu_item_new (void)
{
GtkWidget *item;
GtkWidget *image;
- g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
-
item = gtk_image_menu_item_new_with_mnemonic (_("_Previous Conversations"));
image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_LOG, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
gtk_widget_show (image);
+ return item;
+}
+
+static GtkWidget *
+log_menu_item_new_individual (FolksIndividual *individual)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
+
+ item = log_menu_item_new ();
+
menu_item_set_first_contact (item, individual,
G_CALLBACK (empathy_individual_log_menu_item_activated),
EMPATHY_ACTION_VIEW_LOGS);
return item;
}
+static GtkWidget *
+log_menu_item_new_contact (EmpathyContact *contact)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+
+ item = log_menu_item_new ();
+
+ menu_item_set_contact (item, contact,
+ G_CALLBACK (empathy_individual_log_menu_item_activated),
+ EMPATHY_ACTION_VIEW_LOGS);
+
+ return item;
+}
+
static void
empathy_individual_file_transfer_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
}
static GtkWidget *
-empathy_individual_file_transfer_menu_item_new (EmpathyIndividualMenu *self,
- FolksIndividual *individual)
+file_transfer_menu_item_new (EmpathyIndividualMenu *self)
{
GtkWidget *item;
GtkWidget *image;
- g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
-
item = gtk_image_menu_item_new_with_mnemonic (_("Send File"));
image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_DOCUMENT_SEND,
GTK_ICON_SIZE_MENU);
gtk_widget_show (image);
g_object_set_data (G_OBJECT (item), "individual-menu", self);
+
+ return item;
+}
+
+static GtkWidget *
+file_transfer_menu_item_new_individual (EmpathyIndividualMenu *self,
+ FolksIndividual *individual)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
+
+ item = file_transfer_menu_item_new (self);
+
menu_item_set_first_contact (item, individual,
G_CALLBACK (empathy_individual_file_transfer_menu_item_activated),
EMPATHY_ACTION_SEND_FILE);
return item;
}
+static GtkWidget *
+file_transfer_menu_item_new_contact (EmpathyIndividualMenu *self,
+ EmpathyContact *contact)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+
+ item = file_transfer_menu_item_new (self);
+
+ menu_item_set_contact (item, contact,
+ G_CALLBACK (empathy_individual_file_transfer_menu_item_activated),
+ EMPATHY_ACTION_SEND_FILE);
+
+ return item;
+}
+
static void
empathy_individual_share_my_desktop_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
}
static GtkWidget *
-empathy_individual_share_my_desktop_menu_item_new (EmpathyIndividualMenu *self,
- FolksIndividual *individual)
+share_my_desktop_menu_item_new (EmpathyIndividualMenu *self)
{
GtkWidget *item;
GtkWidget *image;
- g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
-
item = gtk_image_menu_item_new_with_mnemonic (_("Share My Desktop"));
image = gtk_image_new_from_icon_name (GTK_STOCK_NETWORK, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
gtk_widget_show (image);
g_object_set_data (G_OBJECT (item), "individual-menu", self);
+
+ return item;
+}
+
+static GtkWidget *
+share_my_desktop_menu_item_new_individual (EmpathyIndividualMenu *self,
+ FolksIndividual *individual)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
+
+ item = share_my_desktop_menu_item_new (self);
+
menu_item_set_first_contact (item, individual,
G_CALLBACK (empathy_individual_share_my_desktop_menu_item_activated),
EMPATHY_ACTION_SHARE_MY_DESKTOP);
return item;
}
+static GtkWidget *
+share_my_desktop_menu_item_new_contact (EmpathyIndividualMenu *self,
+ EmpathyContact *contact)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+
+ item = share_my_desktop_menu_item_new (self);
+
+ menu_item_set_contact (item, contact,
+ G_CALLBACK (empathy_individual_share_my_desktop_menu_item_activated),
+ EMPATHY_ACTION_SHARE_MY_DESKTOP);
+
+ return item;
+}
+
static void
favourite_menu_item_toggled_cb (GtkCheckMenuItem *item,
FolksIndividual *individual)
}
static GtkWidget *
-empathy_individual_favourite_menu_item_new (FolksIndividual *individual)
+favourite_menu_item_new_individual (FolksIndividual *individual)
{
GtkWidget *item;
}
static GtkWidget *
-empathy_individual_info_menu_item_new (FolksIndividual *individual)
+info_menu_item_new_individual (FolksIndividual *individual)
{
GtkWidget *item;
GtkWidget *image;
}
static GtkWidget *
-empathy_individual_edit_menu_item_new (FolksIndividual *individual)
+edit_menu_item_new_individual (FolksIndividual *individual)
{
EmpathyIndividualManager *manager;
GtkWidget *item;
}
static GtkWidget *
-empathy_individual_invite_menu_item_new (FolksIndividual *individual,
+invite_menu_item_new (FolksIndividual *individual,
EmpathyContact *contact)
{
GtkWidget *item;
}
static GtkWidget *
-empathy_individual_add_menu_item_new (EmpathyIndividualMenu *self,
+add_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual)
{
EmpathyIndividualMenuPriv *priv = GET_PRIV (self);
projects / empathy.git / blobdiff