]> git.0d.be Git - empathy.git/blobdiff - libempathy-gtk/empathy-contact-menu.c
Merge commit 'jtellier/video-call-button-sensitivity'
[empathy.git] / libempathy-gtk / empathy-contact-menu.c
index 91138e293b6a8074bca2d1abfd69454f487694e4..0de7c1ca6afdd78c4ab7847db97c4aa6d7db8c23 100644 (file)
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
+#include <libempathy/empathy-call-factory.h>
 #include <libempathy/empathy-log-manager.h>
+#include <libempathy/empathy-contact-manager.h>
 #include <libempathy/empathy-dispatcher.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-chatroom-manager.h>
+#include <libempathy/empathy-contact-manager.h>
 
 #include "empathy-contact-menu.h"
 #include "empathy-images.h"
@@ -54,6 +57,13 @@ empathy_contact_menu_new (EmpathyContact             *contact,
        menu = gtk_menu_new ();
        shell = GTK_MENU_SHELL (menu);
 
+       /* Add Contact */
+       item = empathy_contact_add_menu_item_new (contact);
+       if (item) {
+               gtk_menu_shell_append (shell, item);
+               gtk_widget_show (item);
+       }
+
        /* Chat */
        if (features & EMPATHY_CONTACT_FEATURE_CHAT) {
                item = empathy_contact_chat_menu_item_new (contact);
@@ -61,9 +71,14 @@ empathy_contact_menu_new (EmpathyContact             *contact,
                gtk_widget_show (item);
        }
 
-       /* Call */
        if (features & EMPATHY_CONTACT_FEATURE_CALL) {
-               item = empathy_contact_call_menu_item_new (contact);
+               /* Audio Call */
+               item = empathy_contact_audio_call_menu_item_new (contact);
+               gtk_menu_shell_append (shell, item);
+               gtk_widget_show (item);
+
+               /* Video Call */
+               item = empathy_contact_video_call_menu_item_new (contact);
                gtk_menu_shell_append (shell, item);
                gtk_widget_show (item);
        }
@@ -110,6 +125,84 @@ empathy_contact_menu_new (EmpathyContact             *contact,
        return menu;
 }
 
+static void
+empathy_contact_add_menu_item_activated (GtkMenuItem *item,
+       EmpathyContact *contact)
+{
+       GtkWidget *toplevel;
+
+       toplevel = gtk_widget_get_toplevel (GTK_WIDGET (item));
+       if (!GTK_WIDGET_TOPLEVEL (toplevel) || !GTK_IS_WINDOW (toplevel)) {
+               toplevel = NULL;
+       }
+
+       empathy_new_contact_dialog_show_with_contact (GTK_WINDOW (toplevel),
+                                                     contact);
+}
+
+GtkWidget *
+empathy_contact_add_menu_item_new (EmpathyContact *contact)
+{
+       GtkWidget *item;
+       GtkWidget *image;
+       EmpathyContactManager *manager;
+       TpConnection *connection;
+       GList *l, *members;
+       gboolean found = FALSE;
+       EmpathyContactListFlags flags;
+
+       g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+
+       if (!empathy_contact_manager_initialized ()) {
+               return NULL;
+       }
+
+       manager = empathy_contact_manager_dup_singleton ();
+       connection = empathy_contact_get_connection (contact);
+
+       flags = empathy_contact_manager_get_flags_for_connection (manager,
+                       connection);
+
+       if (!(flags & EMPATHY_CONTACT_LIST_CAN_ADD)) {
+               return NULL;
+       }
+
+       members = empathy_contact_list_get_members (EMPATHY_CONTACT_LIST (manager));
+       for (l = members; l; l = l->next) {
+               if (!found && empathy_contact_equal (l->data, contact)) {
+                       found = TRUE;
+                       /* we keep iterating so that we don't leak contact
+                        * refs */
+               }
+
+               g_object_unref (l->data);
+       }
+       g_list_free (members);
+       g_object_unref (manager);
+
+       if (found) {
+               return NULL;
+       }
+
+       item = gtk_image_menu_item_new_with_mnemonic (_("_Add Contact..."));
+       image = gtk_image_new_from_icon_name (GTK_STOCK_ADD,
+                                             GTK_ICON_SIZE_MENU);
+       gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+
+       g_signal_connect (item, "activate",
+                       G_CALLBACK (empathy_contact_add_menu_item_activated),
+                       contact);
+
+       return item;
+}
+
+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,32 +217,74 @@ 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_audio_call_menu_item_activated (GtkMenuItem *item,
+       EmpathyContact *contact)
+{
+       EmpathyCallFactory *factory;
+
+       factory = empathy_call_factory_get ();
+       empathy_call_factory_new_call_with_streams (factory, contact, TRUE, FALSE);
+}
+
 GtkWidget *
-empathy_contact_call_menu_item_new (EmpathyContact *contact)
+empathy_contact_audio_call_menu_item_new (EmpathyContact *contact)
 {
        GtkWidget *item;
        GtkWidget *image;
 
        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", "_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_set_sensitive (item, empathy_contact_can_voip (contact));
+       gtk_widget_set_sensitive (item, empathy_contact_can_voip_audio (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_audio_call_menu_item_activated),
+                                 contact);
+
+       return item;
+}
+
+static void
+empathy_contact_video_call_menu_item_activated (GtkMenuItem *item,
+       EmpathyContact *contact)
+{
+       EmpathyCallFactory *factory;
+
+       factory = empathy_call_factory_get ();
+       empathy_call_factory_new_call_with_streams (factory, contact, TRUE, TRUE);
+}
+
+GtkWidget *
+empathy_contact_video_call_menu_item_new (EmpathyContact *contact)
+{
+       GtkWidget *item;
+       GtkWidget *image;
+
+       g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), 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_ICON_SIZE_MENU);
+       gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+       gtk_widget_set_sensitive (item, empathy_contact_can_voip_video (contact));
+       gtk_widget_show (image);
+
+       g_signal_connect (item, "activate",
+                                 G_CALLBACK (empathy_contact_video_call_menu_item_activated),
                                  contact);
-       
+
        return item;
 }
 
@@ -188,7 +323,7 @@ empathy_contact_log_menu_item_new (EmpathyContact *contact)
        g_signal_connect_swapped (item, "activate",
                                  G_CALLBACK (contact_log_menu_item_activate_cb),
                                  contact);
-       
+
        return item;
 }
 
@@ -217,7 +352,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 *
@@ -237,34 +372,53 @@ empathy_contact_info_menu_item_new (EmpathyContact *contact)
        g_signal_connect_swapped (item, "activate",
                                  G_CALLBACK (contact_info_menu_item_activate_cb),
                                  contact);
-       
+
        return item;
 }
 
 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 *
 empathy_contact_edit_menu_item_new (EmpathyContact *contact)
 {
+       EmpathyContactManager *manager;
        GtkWidget *item;
        GtkWidget *image;
+       gboolean enable = FALSE;
 
        g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
+       if (empathy_contact_manager_initialized ()) {
+               TpConnection *connection;
+               EmpathyContactListFlags flags;
+
+               manager = empathy_contact_manager_dup_singleton ();
+               connection = empathy_contact_get_connection (contact);
+               flags = empathy_contact_manager_get_flags_for_connection (
+                               manager, connection);
+
+               enable = (flags & EMPATHY_CONTACT_LIST_CAN_ALIAS ||
+                         flags & EMPATHY_CONTACT_LIST_CAN_GROUP);
+
+               g_object_unref (manager);
+       }
+
        item = gtk_image_menu_item_new_with_mnemonic (_("_Edit"));
        image = gtk_image_new_from_icon_name (GTK_STOCK_EDIT,
                                              GTK_ICON_SIZE_MENU);
        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
        gtk_widget_show (image);
 
+       gtk_widget_set_sensitive (item, enable);
+
        g_signal_connect_swapped (item, "activate",
                                  G_CALLBACK (contact_edit_menu_item_activate_cb),
                                  contact);
-       
+
        return item;
 }
 
@@ -282,7 +436,6 @@ room_sub_menu_data_new (EmpathyContact *contact,
        data = g_slice_new (RoomSubMenuData);
        data->contact = g_object_ref (contact);
        data->chatroom = g_object_ref (chatroom);
-
        return data;
 }
 
@@ -301,20 +454,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 +494,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);
 
@@ -356,31 +507,23 @@ empathy_contact_invite_menu_item_new (EmpathyContact *contact)
        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);