Merge remote-tracking branch 'pochu/error-dialog'

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

diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 1a3dbb7e1e8be7750ad86b5680bd9510e42a861c..2209e1538915861cf476bdda6c256f5782b72d6b 100644 (file)
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -664,7 +664,7 @@ empathy_individual_menu_class_init (EmpathyIndividualMenuClass *klass)
   signals[SIGNAL_LINK_CONTACTS_ACTIVATED] =
       g_signal_new ("link-contacts-activated", G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-          g_cclosure_marshal_VOID__OBJECT,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, 1, EMPATHY_TYPE_LINKING_DIALOG);
 
   g_type_class_add_private (object_class, sizeof (EmpathyIndividualMenuPriv));
@@ -1132,8 +1132,9 @@ empathy_individual_edit_menu_item_new (FolksIndividual *individual)
       manager = empathy_individual_manager_dup_singleton ();
       connection = empathy_contact_get_connection (contact);
 
-      enable = (empathy_connection_can_alias_personas (connection) &&
-                empathy_connection_can_group_personas (connection));
+      enable = (empathy_connection_can_alias_personas (connection,
+                                                      individual) &&
+                empathy_connection_can_group_personas (connection, individual));
 
       g_object_unref (manager);
     }