X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=libempathy-gtk%2Fempathy-individual-menu.c;h=1165397f074d6ba942178f29c50246f076a9d16a;hp=907c678b363a676d53a75dc66d5b7d0724fa73da;hb=8ac7209da2305762f9ef2c711c555afb19e85b62;hpb=15460fa9ae4e6a19e8b6e971014deb50746d90ee diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index 907c678b..1165397f 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -21,27 +21,28 @@ */ #include "config.h" +#include "empathy-individual-menu.h" #include - -#include "empathy-camera-monitor.h" -#include "empathy-request-util.h" -#include "empathy-individual-manager.h" -#include "empathy-chatroom-manager.h" -#include "empathy-utils.h" +#include +#include #include "empathy-account-selector-dialog.h" +#include "empathy-call-utils.h" +#include "empathy-chatroom-manager.h" +#include "empathy-gtk-enum-types.h" #include "empathy-images.h" -#include "empathy-log-window.h" #include "empathy-individual-dialogs.h" -#include "empathy-gtk-enum-types.h" #include "empathy-individual-dialogs.h" #include "empathy-individual-edit-dialog.h" -#include "empathy-ui-utils.h" -#include "empathy-share-my-desktop.h" -#include "empathy-call-utils.h" -#include "empathy-individual-store-channel.h" #include "empathy-individual-information-dialog.h" +#include "empathy-individual-manager.h" +#include "empathy-individual-store-channel.h" +#include "empathy-log-window.h" +#include "empathy-request-util.h" +#include "empathy-share-my-desktop.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT #include "empathy-debug.h" @@ -49,48 +50,67 @@ #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualMenu) typedef struct { + gchar *active_group; /* may be NULL */ FolksIndividual *individual; /* owned */ EmpathyIndividualFeatureFlags features; EmpathyIndividualStore *store; /* may be NULL */ } EmpathyIndividualMenuPriv; enum { - PROP_INDIVIDUAL = 1, + PROP_ACTIVE_GROUP = 1, + PROP_INDIVIDUAL, PROP_FEATURES, PROP_STORE, }; +enum { + MENU_ITEM_ACTIVATED, + LAST_SIGNAL +}; + +static guint signals [LAST_SIGNAL] = { 0 }; + G_DEFINE_TYPE (EmpathyIndividualMenu, empathy_individual_menu, GTK_TYPE_MENU); -static GtkWidget * empathy_individual_chat_menu_item_new ( - 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 ( +static GtkWidget * chat_menu_item_new_individual (EmpathyIndividualMenu *self, 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 ( - FolksIndividual *individual); -static GtkWidget * empathy_individual_share_my_desktop_menu_item_new ( +static GtkWidget * sms_menu_item_new_individual (EmpathyIndividualMenu *self, FolksIndividual *individual); -static GtkWidget * empathy_individual_favourite_menu_item_new ( - FolksIndividual *individual); -static GtkWidget * empathy_individual_add_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_individiual_block_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_remove_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 * 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) { @@ -118,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; @@ -140,8 +162,6 @@ individual_menu_add_personas (GtkMenuShell *menu, 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; @@ -151,13 +171,6 @@ 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 ( - 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); @@ -181,7 +194,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); } @@ -189,7 +202,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); } @@ -197,14 +210,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); } @@ -212,51 +223,34 @@ 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)) - != 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); @@ -294,7 +288,7 @@ find_phone_accounts (void) TP_CONNECTION_STATUS_CONNECTED) continue; - if (!empathy_account_has_uri_scheme_tel (account)) + if (!tp_account_associated_with_uri_scheme (account, "tel")) continue; found = g_list_prepend (found, g_object_ref (account)); @@ -324,11 +318,15 @@ static void call_phone_number (FolksPhoneFieldDetails *details, TpAccount *account) { - DEBUG ("Try to call %s", folks_phone_field_details_get_normalised (details)); + gchar *number; + + 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 ()); - empathy_call_new_with_streams ( - folks_phone_field_details_get_normalised (details), - account, TRUE, FALSE, empathy_get_current_action_time ()); + g_free (number); } static void @@ -397,6 +395,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"); @@ -407,17 +406,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 @@ -438,23 +444,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); @@ -471,6 +480,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); @@ -494,17 +505,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); @@ -646,7 +660,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; @@ -685,13 +699,16 @@ enum REMOVE_DIALOG_RESPONSE_CANCEL = 0, REMOVE_DIALOG_RESPONSE_DELETE, REMOVE_DIALOG_RESPONSE_DELETE_AND_BLOCK, + REMOVE_DIALOG_RESPONSE_REMOVE_FROM_GROUP }; static int remove_dialog_show (const gchar *message, const gchar *secondary_text, + gboolean show_remove_from_group, gboolean block_button, - GdkPixbuf *avatar) + GdkPixbuf *avatar, + const gchar *active_group) { GtkWidget *dialog; gboolean res; @@ -706,6 +723,23 @@ remove_dialog_show (const gchar *message, gtk_widget_show (image); } + if (show_remove_from_group) + { + GtkWidget *button; + gchar *button_text = g_strdup_printf (_("Remove from _Group \'%s\'"), + active_group); + + /* gtk_dialog_add_button() doesn't allow us to pass a string with a + * mnemonic so we have to create the button manually. */ + button = gtk_button_new_with_mnemonic (button_text); + g_free (button_text); + + gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, + REMOVE_DIALOG_RESPONSE_REMOVE_FROM_GROUP); + + gtk_widget_show (button); + } + if (block_button) { GtkWidget *button; @@ -735,12 +769,32 @@ remove_dialog_show (const gchar *message, return res; } +static void +individual_removed_from_group_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) +{ + GError *error = NULL; + FolksIndividual *individual = FOLKS_INDIVIDUAL (source_object); + + folks_group_details_change_group_finish ( + FOLKS_GROUP_DETAILS (individual), res, &error); + if (error != NULL) + { + DEBUG ("Individual could not be removed from group: %s", + error->message); + g_error_free (error); + } +} + static void remove_got_avatar (GObject *source_object, GAsyncResult *result, gpointer user_data) { FolksIndividual *individual = FOLKS_INDIVIDUAL (source_object); + EmpathyIndividualMenu *self = EMPATHY_INDIVIDUAL_MENU (user_data); + EmpathyIndividualMenuPriv *priv = GET_PRIV (self); GdkPixbuf *avatar; EmpathyIndividualManager *manager; gchar *text; @@ -749,6 +803,8 @@ remove_got_avatar (GObject *source_object, gboolean can_block; GError *error = NULL; gint res; + gboolean show_remove_from_group; + GeeSet *groups; avatar = empathy_pixbuf_avatar_from_individual_scaled_finish (individual, result, &error); @@ -762,6 +818,10 @@ remove_got_avatar (GObject *source_object, /* We couldn't retrieve the avatar, but that isn't a fatal error, * so we still display the remove dialog. */ + groups = folks_group_details_get_groups (FOLKS_GROUP_DETAILS (individual)); + show_remove_from_group = + gee_collection_get_size (GEE_COLLECTION (groups)) > 1; + personas = folks_individual_get_personas (individual); persona_count = gee_collection_get_size (GEE_COLLECTION (personas)); @@ -795,7 +855,15 @@ remove_got_avatar (GObject *source_object, manager = empathy_individual_manager_dup_singleton (); can_block = empathy_individual_manager_supports_blocking (manager, individual); - res = remove_dialog_show (_("Removing contact"), text, can_block, avatar); + res = remove_dialog_show (_("Removing contact"), text, + show_remove_from_group, can_block, avatar, priv->active_group); + + if (res == REMOVE_DIALOG_RESPONSE_REMOVE_FROM_GROUP) + { + folks_group_details_change_group (FOLKS_GROUP_DETAILS (individual), + priv->active_group, false, individual_removed_from_group_cb, NULL); + goto finally; + } if (res == REMOVE_DIALOG_RESPONSE_DELETE || res == REMOVE_DIALOG_RESPONSE_DELETE_AND_BLOCK) @@ -818,29 +886,33 @@ remove_got_avatar (GObject *source_object, finally: g_free (text); g_object_unref (manager); + g_object_unref (self); } static void remove_activate_cb (GtkMenuItem *menuitem, - FolksIndividual *individual) + EmpathyIndividualMenu *self) { - empathy_pixbuf_avatar_from_individual_scaled_async (individual, - 48, 48, NULL, remove_got_avatar, NULL); + EmpathyIndividualMenuPriv *priv = GET_PRIV (self); + + empathy_pixbuf_avatar_from_individual_scaled_async (priv->individual, + 48, 48, NULL, remove_got_avatar, g_object_ref (self)); } static GtkWidget * -empathy_individiual_remove_menu_item_new (FolksIndividual *individual) +remove_menu_item_new_individual (EmpathyIndividualMenu *self) { GeeSet *personas; GeeIterator *iter; gboolean can_remove = FALSE; GtkWidget *item, *image; + EmpathyIndividualMenuPriv *priv = GET_PRIV (self); /* If any of the Individual's personas can be removed, add an option to * remove. This will act as a best-effort option. If any Personas cannot be * removed from the server, then this option will just be inactive upon * subsequent menu openings */ - personas = folks_individual_get_personas (individual); + personas = folks_individual_get_personas (priv->individual); iter = gee_iterable_iterator (GEE_ITERABLE (personas)); while (!can_remove && gee_iterator_next (iter)) { @@ -865,7 +937,7 @@ empathy_individiual_remove_menu_item_new (FolksIndividual *individual) gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); g_signal_connect (item, "activate", - G_CALLBACK (remove_activate_cb), individual); + G_CALLBACK (remove_activate_cb), self); return item; } @@ -873,7 +945,7 @@ empathy_individiual_remove_menu_item_new (FolksIndividual *individual) static void constructed (GObject *object) { - EmpathyIndividualMenu *self = (EmpathyIndividualMenu *) object; + EmpathyIndividualMenu *self = EMPATHY_INDIVIDUAL_MENU (object); EmpathyIndividualMenuPriv *priv = GET_PRIV (object); GtkMenuShell *shell; GtkWidget *item; @@ -888,7 +960,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); @@ -899,7 +971,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); @@ -910,7 +982,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); @@ -921,12 +993,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); } @@ -935,14 +1009,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); } @@ -950,12 +1024,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 | @@ -970,7 +1045,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); } @@ -978,7 +1053,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); } @@ -986,7 +1061,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); } @@ -994,14 +1069,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 (); @@ -1014,7 +1089,7 @@ constructed (GObject *object) /* Separator & Remove */ if (features & EMPATHY_INDIVIDUAL_FEATURE_REMOVE && - (item = empathy_individiual_remove_menu_item_new (individual)) != NULL) { + (item = remove_menu_item_new_individual (self)) != NULL) { GtkWidget *sep; sep = gtk_separator_menu_item_new (); @@ -1038,6 +1113,9 @@ get_property (GObject *object, switch (param_id) { + case PROP_ACTIVE_GROUP: + g_value_set_string (value, priv->active_group); + break; case PROP_INDIVIDUAL: g_value_set_object (value, priv->individual); break; @@ -1065,6 +1143,10 @@ set_property (GObject *object, switch (param_id) { + case PROP_ACTIVE_GROUP: + g_assert (priv->active_group == NULL); /* construct only */ + priv->active_group = g_value_dup_string (value); + break; case PROP_INDIVIDUAL: priv->individual = g_value_dup_object (value); break; @@ -1091,6 +1173,16 @@ dispose (GObject *object) G_OBJECT_CLASS (empathy_individual_menu_parent_class)->dispose (object); } +static void +finalize (GObject *object) +{ + EmpathyIndividualMenuPriv *priv = GET_PRIV (object); + + g_free (priv->active_group); + + G_OBJECT_CLASS (empathy_individual_menu_parent_class)->finalize (object); +} + static void empathy_individual_menu_class_init (EmpathyIndividualMenuClass *klass) { @@ -1100,6 +1192,19 @@ empathy_individual_menu_class_init (EmpathyIndividualMenuClass *klass) object_class->get_property = get_property; object_class->set_property = set_property; object_class->dispose = dispose; + object_class->finalize = finalize; + + /** + * gchar *:active-group: + * + * The group the selected roster-contact widget belongs, or NULL. + */ + g_object_class_install_property (object_class, PROP_ACTIVE_GROUP, + g_param_spec_string ("active-group", + "Active group", + "The group the selected roster-contact widget belongs, or NULL", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); /** * EmpathyIndividualMenu:individual: @@ -1133,11 +1238,22 @@ empathy_individual_menu_class_init (EmpathyIndividualMenuClass *klass) EMPATHY_TYPE_INDIVIDUAL_STORE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); + signals[MENU_ITEM_ACTIVATED] = + g_signal_new ("menu-item-activated", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_generic, + G_TYPE_NONE, + 0); + g_type_class_add_private (object_class, sizeof (EmpathyIndividualMenuPriv)); } GtkWidget * empathy_individual_menu_new (FolksIndividual *individual, + const gchar *active_group, EmpathyIndividualFeatureFlags features, EmpathyIndividualStore *store) { @@ -1147,6 +1263,7 @@ empathy_individual_menu_new (FolksIndividual *individual, g_return_val_if_fail (features != EMPATHY_INDIVIDUAL_FEATURE_NONE, NULL); return g_object_new (EMPATHY_TYPE_INDIVIDUAL_MENU, + "active-group", active_group, "individual", individual, "features", features, "store", store, @@ -1204,6 +1321,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) @@ -1211,23 +1338,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); @@ -1235,6 +1377,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) @@ -1246,23 +1405,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); @@ -1270,6 +1444,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) @@ -1278,23 +1470,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); @@ -1302,6 +1509,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) @@ -1310,18 +1536,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; - EmpathyCameraMonitor *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, @@ -1329,19 +1553,62 @@ 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)) { - monitor = empathy_camera_monitor_dup_singleton (); + monitor = tpaw_camera_monitor_dup_singleton (); g_object_set_data_full (G_OBJECT (item), "monitor", monitor, g_object_unref); 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; } @@ -1357,18 +1624,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); @@ -1376,6 +1653,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) @@ -1383,22 +1676,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); @@ -1406,6 +1714,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) @@ -1413,21 +1738,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); @@ -1435,6 +1775,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) @@ -1445,7 +1802,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; @@ -1469,7 +1826,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; @@ -1498,7 +1855,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; @@ -1667,7 +2024,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; @@ -1809,7 +2166,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);