X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=libempathy-gtk%2Fempathy-individual-menu.c;h=ae489a77ae71e76be123c79ac75918e18920a664;hp=18dc7bb17095f83734bff94dbadf64fdaf194838;hb=1f9230409b3e8bdba369a994102b53a9e591ba6e;hpb=5aab8d1d5ccc341695d3241edc743299c1e62187 diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index 18dc7bb1..ae489a77 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -25,6 +25,7 @@ #include #include +#include #include "empathy-account-selector-dialog.h" #include "empathy-call-utils.h" @@ -71,35 +72,45 @@ static guint signals [LAST_SIGNAL] = { 0 }; G_DEFINE_TYPE (EmpathyIndividualMenu, empathy_individual_menu, GTK_TYPE_MENU); -static GtkWidget * empathy_individual_chat_menu_item_new ( +static GtkWidget * chat_menu_item_new_individual (EmpathyIndividualMenu *self, FolksIndividual *individual); -static GtkWidget * empathy_individual_sms_menu_item_new ( - FolksIndividual *individual); -static GtkWidget * empathy_individual_log_menu_item_new ( - FolksIndividual *individual); -static GtkWidget * empathy_individual_info_menu_item_new ( - FolksIndividual *individual); -static GtkWidget * empathy_individual_edit_menu_item_new ( - FolksIndividual *individual); -static GtkWidget * empathy_individual_invite_menu_item_new ( - FolksIndividual *individual, +static GtkWidget * chat_menu_item_new_contact (EmpathyIndividualMenu *self, EmpathyContact *contact); -static GtkWidget * empathy_individual_file_transfer_menu_item_new ( +static GtkWidget * sms_menu_item_new_individual (EmpathyIndividualMenu *self, FolksIndividual *individual); -static GtkWidget * empathy_individual_share_my_desktop_menu_item_new ( - FolksIndividual *individual); -static GtkWidget * empathy_individual_favourite_menu_item_new ( +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 * 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 (GtkMenuShell *menu, +individual_menu_add_personas (EmpathyIndividualMenu *self, + GtkMenuShell *menu, FolksIndividual *individual, EmpathyIndividualFeatureFlags features) { @@ -127,6 +138,8 @@ individual_menu_add_personas (GtkMenuShell *menu, 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; @@ -160,7 +173,7 @@ individual_menu_add_personas (GtkMenuShell *menu, goto while_finish; contact = empathy_contact_dup_from_tp_contact (tp_contact); - single_individual = empathy_create_individual_from_tp_contact ( + single_individual = empathy_ensure_individual_from_tp_contact ( tp_contact); /* Pretty hacky. Creating single_individual had a side effect to change @@ -190,7 +203,7 @@ individual_menu_add_personas (GtkMenuShell *menu, /* Chat */ if (features & EMPATHY_INDIVIDUAL_FEATURE_CHAT) { - action = empathy_individual_chat_menu_item_new (single_individual); + action = chat_menu_item_new_contact (self, contact); gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action); gtk_widget_show (action); } @@ -198,7 +211,7 @@ individual_menu_add_personas (GtkMenuShell *menu, /* SMS */ if (features & EMPATHY_INDIVIDUAL_FEATURE_SMS) { - action = empathy_individual_sms_menu_item_new (single_individual); + action = sms_menu_item_new_contact (self, contact); gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action); gtk_widget_show (action); } @@ -206,14 +219,12 @@ individual_menu_add_personas (GtkMenuShell *menu, if (features & EMPATHY_INDIVIDUAL_FEATURE_CALL) { /* Audio Call */ - action = empathy_individual_audio_call_menu_item_new ( - 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 ( - 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); } @@ -221,34 +232,32 @@ individual_menu_add_personas (GtkMenuShell *menu, /* 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 ( - 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 ( - 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)) + (item = block_menu_item_new_individual (single_individual)) != NULL) { GtkWidget *sep; @@ -333,11 +342,15 @@ static void 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 @@ -406,6 +419,7 @@ find_phone_type (FolksPhoneFieldDetails *details) { GeeCollection *types; GeeIterator *iter; + const gchar *retval = NULL; types = folks_abstract_field_details_get_parameter_values ( FOLKS_ABSTRACT_FIELD_DETAILS (details), "type"); @@ -416,17 +430,24 @@ find_phone_type (FolksPhoneFieldDetails *details) 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 @@ -447,23 +468,26 @@ add_phone_numbers (EmpathyIndividualMenu *self) { 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); @@ -480,6 +504,8 @@ add_phone_numbers (EmpathyIndividualMenu *self) gtk_menu_shell_append (GTK_MENU_SHELL (self), item); gtk_widget_show (item); + + g_object_unref (details); } g_object_unref (iter); @@ -503,17 +529,20 @@ get_contacts_supporting_blocking (FolksIndividual *individual) 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); @@ -655,7 +684,7 @@ contact_blocked_changed_cb (TpContact *contact, } static GtkWidget * -empathy_individiual_block_menu_item_new (FolksIndividual *individual) +block_menu_item_new_individual (FolksIndividual *individual) { GtkWidget *item; GList *contacts, *l; @@ -895,7 +924,7 @@ remove_activate_cb (GtkMenuItem *menuitem, } static GtkWidget * -empathy_individiual_remove_menu_item_new (EmpathyIndividualMenu *self) +remove_menu_item_new_individual (EmpathyIndividualMenu *self) { GeeSet *personas; GeeIterator *iter; @@ -955,7 +984,7 @@ constructed (GObject *object) /* 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); @@ -966,7 +995,7 @@ constructed (GObject *object) /* Chat */ if (features & EMPATHY_INDIVIDUAL_FEATURE_CHAT) { - item = empathy_individual_chat_menu_item_new (individual); + item = chat_menu_item_new_individual (self, individual); if (item != NULL) { gtk_menu_shell_append (shell, item); @@ -977,7 +1006,7 @@ constructed (GObject *object) /* SMS */ if (features & EMPATHY_INDIVIDUAL_FEATURE_SMS) { - item = empathy_individual_sms_menu_item_new (individual); + item = sms_menu_item_new_individual (self, individual); if (item != NULL) { gtk_menu_shell_append (shell, item); @@ -988,12 +1017,14 @@ constructed (GObject *object) if (features & EMPATHY_INDIVIDUAL_FEATURE_CALL) { /* Audio Call */ - item = empathy_individual_audio_call_menu_item_new (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 (individual); + item = empathy_individual_video_call_menu_item_new_individual (self, + individual); gtk_menu_shell_append (shell, item); gtk_widget_show (item); } @@ -1002,14 +1033,14 @@ constructed (GObject *object) 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 (individual); + item = file_transfer_menu_item_new_individual (self, individual); gtk_menu_shell_append (shell, item); gtk_widget_show (item); } @@ -1017,12 +1048,13 @@ constructed (GObject *object) /* 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 (individual); + item = share_my_desktop_menu_item_new_individual (self, individual); gtk_menu_shell_append (shell, item); gtk_widget_show (item); /* Menu items to target specific contacts */ - individual_menu_add_personas (GTK_MENU_SHELL (object), individual, features); + individual_menu_add_personas (self, GTK_MENU_SHELL (object), + individual, features); /* Separator */ if (features & (EMPATHY_INDIVIDUAL_FEATURE_EDIT | @@ -1037,7 +1069,7 @@ constructed (GObject *object) /* 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); } @@ -1045,7 +1077,7 @@ constructed (GObject *object) /* 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); } @@ -1053,7 +1085,7 @@ constructed (GObject *object) /* 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); } @@ -1061,14 +1093,14 @@ constructed (GObject *object) /* 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 (); @@ -1081,7 +1113,7 @@ constructed (GObject *object) /* 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 (); @@ -1313,6 +1345,16 @@ menu_item_set_first_contact (GtkWidget *item, return item; } +static void +emit_menu_item_activated (GtkMenuItem *item) +{ + EmpathyIndividualMenu *self; + + self = EMPATHY_INDIVIDUAL_MENU (g_object_get_data (G_OBJECT (item), + "individual-menu")); + g_signal_emit (self, signals [MENU_ITEM_ACTIVATED], 0); +} + static void empathy_individual_chat_menu_item_activated (GtkMenuItem *item, EmpathyContact *contact) @@ -1320,23 +1362,38 @@ empathy_individual_chat_menu_item_activated (GtkMenuItem *item, g_return_if_fail (EMPATHY_IS_CONTACT (contact)); empathy_chat_with_contact (contact, empathy_get_current_action_time ()); + + emit_menu_item_activated (item); } static GtkWidget * -empathy_individual_chat_menu_item_new (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_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 * +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); @@ -1344,6 +1401,23 @@ empathy_individual_chat_menu_item_new (FolksIndividual *individual) 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) @@ -1355,23 +1429,38 @@ empathy_individual_sms_menu_item_activated (GtkMenuItem *item, empathy_contact_get_id (contact), empathy_get_current_action_time (), NULL, NULL); + + emit_menu_item_activated (item); } static GtkWidget * -empathy_individual_sms_menu_item_new (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_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 * +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); @@ -1379,6 +1468,24 @@ empathy_individual_sms_menu_item_new (FolksIndividual *individual) 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) @@ -1387,23 +1494,38 @@ empathy_individual_audio_call_menu_item_activated (GtkMenuItem *item, 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 (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); @@ -1411,6 +1533,25 @@ empathy_individual_audio_call_menu_item_new (FolksIndividual *individual) 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) @@ -1419,18 +1560,16 @@ empathy_individual_video_call_menu_item_activated (GtkMenuItem *item, 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 (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, @@ -1438,9 +1577,15 @@ empathy_individual_video_call_menu_item_new (FolksIndividual *individual) gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); gtk_widget_show (image); - menu_item_set_first_contact (item, individual, - G_CALLBACK (empathy_individual_video_call_menu_item_activated), - EMPATHY_ACTION_VIDEO_CALL); + g_object_set_data (G_OBJECT (item), "individual-menu", self); + + 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)) @@ -1451,6 +1596,43 @@ empathy_individual_video_call_menu_item_new (FolksIndividual *individual) 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; } @@ -1466,18 +1648,28 @@ empathy_individual_log_menu_item_activated (GtkMenuItem *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); @@ -1485,6 +1677,22 @@ empathy_individual_log_menu_item_new (FolksIndividual *individual) 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) @@ -1492,22 +1700,37 @@ empathy_individual_file_transfer_menu_item_activated (GtkMenuItem *item, g_return_if_fail (EMPATHY_IS_CONTACT (contact)); empathy_send_file_with_file_chooser (contact); + + emit_menu_item_activated (item); } static GtkWidget * -empathy_individual_file_transfer_menu_item_new (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_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 * +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); @@ -1515,6 +1738,23 @@ empathy_individual_file_transfer_menu_item_new (FolksIndividual *individual) 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) @@ -1522,21 +1762,36 @@ empathy_individual_share_my_desktop_menu_item_activated (GtkMenuItem *item, g_return_if_fail (EMPATHY_IS_CONTACT (contact)); empathy_share_my_desktop_share_with_contact (contact); + + emit_menu_item_activated (item); } static GtkWidget * -empathy_individual_share_my_desktop_menu_item_new (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); @@ -1544,6 +1799,23 @@ empathy_individual_share_my_desktop_menu_item_new (FolksIndividual *individual) 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) @@ -1554,7 +1826,7 @@ favourite_menu_item_toggled_cb (GtkCheckMenuItem *item, } static GtkWidget * -empathy_individual_favourite_menu_item_new (FolksIndividual *individual) +favourite_menu_item_new_individual (FolksIndividual *individual) { GtkWidget *item; @@ -1578,7 +1850,7 @@ individual_info_menu_item_activate_cb (GtkMenuItem *item, } static GtkWidget * -empathy_individual_info_menu_item_new (FolksIndividual *individual) +info_menu_item_new_individual (FolksIndividual *individual) { GtkWidget *item; GtkWidget *image; @@ -1607,7 +1879,7 @@ individual_edit_menu_item_activate_cb (FolksIndividual *individual) } static GtkWidget * -empathy_individual_edit_menu_item_new (FolksIndividual *individual) +edit_menu_item_new_individual (FolksIndividual *individual) { EmpathyIndividualManager *manager; GtkWidget *item; @@ -1776,7 +2048,7 @@ create_room_sub_menu (FolksIndividual *individual, } static GtkWidget * -empathy_individual_invite_menu_item_new (FolksIndividual *individual, +invite_menu_item_new (FolksIndividual *individual, EmpathyContact *contact) { GtkWidget *item; @@ -1918,7 +2190,7 @@ add_menu_item_activated (GtkMenuItem *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);