- Split info/edit/personal dialogs into different functions.

[empathy.git] / libempathy-gtk / empathy-contact-menu.c

diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index cf8580d23615760d13a86d53a476d23f3ab4b24f..a3cf1da26f71aeedf5874d1e26c48d96f6cec19c 100644 (file)
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -26,6 +26,7 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
+#include <libempathy/empathy-call-factory.h>
 #include <libempathy/empathy-log-manager.h>
 #include <libempathy/empathy-dispatcher.h>
 #include <libempathy/empathy-utils.h>
@@ -110,6 +111,14 @@ empathy_contact_menu_new (EmpathyContact             *contact,
        return menu;
 }
 
+static void
+empathy_contact_chat_menu_item_activated (GtkMenuItem *item,
+       EmpathyContact *contact)
+{
+  empathy_dispatcher_chat_with_contact (contact, NULL, NULL);
+}
+
+
 GtkWidget *
 empathy_contact_chat_menu_item_new (EmpathyContact *contact)
 {
@@ -124,13 +133,23 @@ empathy_contact_chat_menu_item_new (EmpathyContact *contact)
        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
        gtk_widget_show (image);
 
-       g_signal_connect_swapped (item, "activate",
-                                 G_CALLBACK (empathy_dispatcher_chat_with_contact),
+       g_signal_connect (item, "activate",
+                                 G_CALLBACK (empathy_contact_chat_menu_item_activated),
                                  contact);
        
        return item;
 }
 
+static void
+empathy_contact_call_menu_item_activated (GtkMenuItem *item,
+       EmpathyContact *contact)
+{
+       EmpathyCallFactory *factory;
+
+       factory = empathy_call_factory_get ();
+       empathy_call_factory_new_call (factory, contact);
+}
+
 GtkWidget *
 empathy_contact_call_menu_item_new (EmpathyContact *contact)
 {
@@ -139,15 +158,15 @@ empathy_contact_call_menu_item_new (EmpathyContact *contact)
 
        g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
-       item = gtk_image_menu_item_new_with_mnemonic (_("_Call"));
+       item = gtk_image_menu_item_new_with_mnemonic (C_("menu item", "_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_set_sensitive (item, empathy_contact_can_voip (contact));
        gtk_widget_show (image);
 
-       g_signal_connect_swapped (item, "activate",
-                                 G_CALLBACK (empathy_start_call_with_contact),
+       g_signal_connect (item, "activate",
+                                 G_CALLBACK (empathy_contact_call_menu_item_activated),
                                  contact);
        
        return item;
@@ -217,7 +236,7 @@ empathy_contact_file_transfer_menu_item_new (EmpathyContact *contact)
 static void
 contact_info_menu_item_activate_cb (EmpathyContact *contact)
 {
-       empathy_contact_information_dialog_show (contact, NULL, FALSE, FALSE);
+       empathy_contact_information_dialog_show (contact, NULL);
 }
 
 GtkWidget *
@@ -244,7 +263,7 @@ empathy_contact_info_menu_item_new (EmpathyContact *contact)
 static void
 contact_edit_menu_item_activate_cb (EmpathyContact *contact)
 {
-       empathy_contact_information_dialog_show (contact, NULL, TRUE, FALSE);
+       empathy_contact_edit_dialog_show (contact, NULL);
 }
 
 GtkWidget *
@@ -301,20 +320,20 @@ room_sub_menu_activate_cb (GtkWidget *item,
 {
        TpHandle handle;
        GArray handles = {(gchar *) &handle, 1};
+       EmpathyTpChat *chat;
        TpChannel *channel;
 
-       g_object_get (data->chatroom, "tp-channel", &channel, NULL);
-       if (channel == NULL) {
+       chat = empathy_chatroom_get_tp_chat (data->chatroom);
+       if (chat == NULL) {
                /* channel was invalidated. Ignoring */
                return;
        }
 
        /* send invitation */
        handle = empathy_contact_get_handle (data->contact);
+       channel = empathy_tp_chat_get_channel (chat);
        tp_cli_channel_interface_group_call_add_members (channel, -1, &handles,
                _("Inviting to this room"), NULL, NULL, NULL, NULL);
-
-       g_object_unref (channel);
 }
 
 static GtkWidget *
@@ -341,9 +360,7 @@ empathy_contact_invite_menu_item_new (EmpathyContact *contact)
        GtkWidget *room_item;
        EmpathyChatroomManager *mgr;
        GList *rooms, *l;
-       GtkWidget *submenu;
-       GtkMenuShell *submenu_shell;
-       gboolean have_rooms = FALSE;
+       GtkWidget *submenu = NULL;
 
        g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
@@ -352,35 +369,27 @@ empathy_contact_invite_menu_item_new (EmpathyContact *contact)
                                              GTK_ICON_SIZE_MENU);
        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
 
-       mgr = empathy_chatroom_manager_new (NULL);
+       mgr = empathy_chatroom_manager_dup_singleton (NULL);
        rooms = empathy_chatroom_manager_get_chatrooms (mgr,
                empathy_contact_get_account (contact));
 
-       /* create rooms sub menu */
-       submenu = gtk_menu_new ();
-       submenu_shell = GTK_MENU_SHELL (submenu);
-
        for (l = rooms; l != NULL; l = g_list_next (l)) {
                EmpathyChatroom *chatroom = l->data;
-               TpChannel *channel;
 
-               g_object_get (chatroom, "tp-channel", &channel, NULL);
-               if (channel != NULL) {
-                       have_rooms = TRUE;
+               if (empathy_chatroom_get_tp_chat (chatroom) != NULL) {
+                       if (G_UNLIKELY (submenu == NULL))
+                               submenu = gtk_menu_new ();
 
                        room_item = create_room_sub_menu (contact, chatroom);
-                       gtk_menu_shell_append (submenu_shell, room_item);
+                       gtk_menu_shell_append ((GtkMenuShell*)submenu, room_item);
                        gtk_widget_show (room_item);
-
-                       g_object_unref (channel);
                }
        }
 
-       if (have_rooms) {
+       if (submenu) {
                gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu);
        } else {
                gtk_widget_set_sensitive (item, FALSE);
-               gtk_widget_destroy (submenu);
        }
 
        gtk_widget_show (image);