Merge commit 'jtellier/video-call-button-sensitivity'

diff --combined libempathy-gtk/empathy-contact-menu.c
index b4d694b6ad10511749707e21f7891e42df6c3b23,0f98bbdce62398e5c3dd3a927718202dd0350af5..0de7c1ca6afdd78c4ab7847db97c4aa6d7db8c23
--- 1/libempathy-gtk/empathy-contact-menu.c
--- 2/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@@ -28,11 -28,9 +28,11 @@@
  
  #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"
@@@ -57,13 -55,6 +57,13 @@@ empathy_contact_menu_new (EmpathyContac
        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);
@@@ -125,77 -116,6 +125,77 @@@
        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)
@@@ -203,6 -123,7 +203,6 @@@
    empathy_dispatcher_chat_with_contact (contact, NULL, NULL);
  }
  
 -
  GtkWidget *
  empathy_contact_chat_menu_item_new (EmpathyContact *contact)
  {
@@@ -246,7 -167,7 +246,7 @@@ empathy_contact_audio_call_menu_item_ne
        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 (item, "activate",
@@@ -278,7 -199,7 +278,7 @@@ empathy_contact_video_call_menu_item_ne
        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 (contact));
+       gtk_widget_set_sensitive (item, empathy_contact_can_voip_video (contact));
        gtk_widget_show (image);
  
        g_signal_connect (item, "activate",
@@@ -385,36 -306,17 +385,36 @@@ contact_edit_menu_item_activate_cb (Emp
  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);