aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-02-08 21:48:33 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-02-08 22:13:34 +0800
commit4bd4dca988dcd4680c9a381ebe7aed881006c556 (patch)
treeb10b10a6d1d059d6cdbcf158888efa5bef8889d3 /libempathy-gtk
parentf0ca8ccc9e04507a25812e7d7e4a80500daf9569 (diff)
downloadgsoc2013-empathy-4bd4dca988dcd4680c9a381ebe7aed881006c556.tar
gsoc2013-empathy-4bd4dca988dcd4680c9a381ebe7aed881006c556.tar.gz
gsoc2013-empathy-4bd4dca988dcd4680c9a381ebe7aed881006c556.tar.bz2
gsoc2013-empathy-4bd4dca988dcd4680c9a381ebe7aed881006c556.tar.lz
gsoc2013-empathy-4bd4dca988dcd4680c9a381ebe7aed881006c556.tar.xz
gsoc2013-empathy-4bd4dca988dcd4680c9a381ebe7aed881006c556.tar.zst
gsoc2013-empathy-4bd4dca988dcd4680c9a381ebe7aed881006c556.zip
individual-menu: remove link-contacts-activated signal
https://bugzilla.gnome.org/show_bug.cgi?id=669482
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-individual-menu.c14
-rw-r--r--libempathy-gtk/empathy-individual-view.c20
2 files changed, 0 insertions, 34 deletions
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index cc1d88d47..322e4e1ff 100644
--- 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));
}
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 90618997d..34ca7c09f 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -49,7 +49,6 @@
#include "empathy-individual-edit-dialog.h"
#include "empathy-individual-dialogs.h"
#include "empathy-images.h"
-#include "empathy-linking-dialog.h"
#include "empathy-cell-renderer-expander.h"
#include "empathy-cell-renderer-text.h"
#include "empathy-cell-renderer-activatable.h"
@@ -2537,19 +2536,6 @@ individual_view_remove_activate_cb (GtkMenuItem *menuitem,
}
}
-static void
-individual_menu_link_contacts_activated_cb (EmpathyIndividualMenu *menu,
- EmpathyLinkingDialog *linking_dialog,
- EmpathyIndividualView *self)
-{
- EmpathyIndividualViewPriv *priv = GET_PRIV (self);
- EmpathyIndividualLinker *linker;
-
- linker = empathy_linking_dialog_get_individual_linker (linking_dialog);
- empathy_individual_linker_set_search_text (linker,
- empathy_live_search_get_text (EMPATHY_LIVE_SEARCH (priv->search_widget)));
-}
-
GtkWidget *
empathy_individual_view_get_individual_menu (EmpathyIndividualView *view)
{
@@ -2624,12 +2610,6 @@ empathy_individual_view_get_individual_menu (EmpathyIndividualView *view)
G_CALLBACK (individual_view_remove_activate_cb), view);
}
- /* Connect to EmpathyIndividualMenu::link-contacts-activated so that we can
- * set the live search text on the new linking dialogue to be the same as
- * our own. */
- g_signal_connect (menu, "link-contacts-activated",
- (GCallback) individual_menu_link_contacts_activated_cb, view);
-
out:
g_object_unref (individual);