Merge remote-tracking branch 'glassrose/add-All-service-selection-in-debug-window'

[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 cc1d88d4739a895b9a0d312ad0bdb2af63876df2..7b8da52d1e83a99195a214c8fbd78f98fdbe4fbd 100644 (file)
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -51,7 +51,6 @@
 #include "empathy-individual-edit-dialog.h"
 #include "empathy-ui-utils.h"
 #include "empathy-share-my-desktop.h"
-#include "empathy-linking-dialog.h"
 #include "empathy-call-utils.h"
 #include "empathy-individual-store-channel.h"
 
@@ -72,13 +71,6 @@ enum {
   PROP_STORE,
 };
 
-enum {
-  SIGNAL_LINK_CONTACTS_ACTIVATED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
 G_DEFINE_TYPE (EmpathyIndividualMenu, empathy_individual_menu, GTK_TYPE_MENU);
 
 static GtkWidget * empathy_individual_chat_menu_item_new (
@@ -933,12 +925,6 @@ empathy_individual_menu_class_init (EmpathyIndividualMenuClass *klass)
           EMPATHY_TYPE_INDIVIDUAL_STORE,
           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 
-  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_generic,
-          G_TYPE_NONE, 1, EMPATHY_TYPE_LINKING_DIALOG);
-
   g_type_class_add_private (object_class, sizeof (EmpathyIndividualMenuPriv));
 }
 
@@ -1325,6 +1311,8 @@ start_gnome_contacts (FolksIndividual *individual,
   GdkAppLaunchContext *context = NULL;
   GdkDisplay *display;
 
+  g_return_if_fail (FOLKS_IS_INDIVIDUAL (individual));
+
   /* Start gnome-contacts */
   display = gdk_display_get_default ();
   context = gdk_display_get_app_launch_context (display);
@@ -1373,7 +1361,8 @@ start_gnome_contacts (FolksIndividual *individual,
 }
 
 static void
-individual_info_menu_item_activate_cb (FolksIndividual *individual)
+individual_info_menu_item_activate_cb (GtkMenuItem *item,
+    FolksIndividual *individual)
 {
   start_gnome_contacts (individual, TRUE);
 }