empathy-accounts: disable 'Enable' menu entry if not supported

https://bugzilla.gnome.org/show_bug.cgi?id=673141

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index c21db2bc788e9ca7d775ebc71330b60fa15e721e..b776e1640b4cbccc21fee0ce9f6af7e184d0c578 100644 (file)
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -1771,16 +1771,24 @@ accounts_dialog_treeview_button_press_event_cb (GtkTreeView *view,
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item_enable);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item_disable);
 
-  if (tp_account_is_enabled (account))
+  if (account_can_be_enabled (account))
     {
-      tp_g_signal_connect_object (item_disable, "activate",
-          G_CALLBACK (accounts_dialog_treeview_enabled_cb), account, 0);
-      gtk_widget_set_sensitive (item_enable, FALSE);
+      if (tp_account_is_enabled (account))
+        {
+          tp_g_signal_connect_object (item_disable, "activate",
+              G_CALLBACK (accounts_dialog_treeview_enabled_cb), account, 0);
+          gtk_widget_set_sensitive (item_enable, FALSE);
+        }
+      else
+        {
+          tp_g_signal_connect_object (item_enable, "activate",
+              G_CALLBACK (accounts_dialog_treeview_enabled_cb), account, 0);
+          gtk_widget_set_sensitive (item_disable, FALSE);
+        }
     }
   else
     {
-      tp_g_signal_connect_object (item_enable, "activate",
-          G_CALLBACK (accounts_dialog_treeview_enabled_cb), account, 0);
+      gtk_widget_set_sensitive (item_enable, FALSE);
       gtk_widget_set_sensitive (item_disable, FALSE);
     }