/pidgin/main: 32f10ebb5c9b: Remove unnecessary GtkStatusIcon 'de...

Elliott Sales de Andrade qulogic at pidgin.im
Mon Nov 5 18:15:57 EST 2012


Changeset: 32f10ebb5c9b5f9a9e7d6326daca540f3e9bd1e0
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2012-09-09 22:45 -0400
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/32f10ebb5c9b

Description:

Remove unnecessary GtkStatusIcon 'destroy' callback.

There is no such signal, actually.

diffstat:

 pidgin/gtkdocklet.c |  23 -----------------------
 1 files changed, 0 insertions(+), 23 deletions(-)

diffs (54 lines):

diff --git a/pidgin/gtkdocklet.c b/pidgin/gtkdocklet.c
--- a/pidgin/gtkdocklet.c
+++ b/pidgin/gtkdocklet.c
@@ -827,14 +827,6 @@ pidgin_docklet_remove(void)
 	}
 }
 
-static gboolean
-docklet_gtk_recreate_cb(gpointer data)
-{
-	docklet_gtk_status_create(TRUE);
-
-	return FALSE;
-}
-
 #ifndef _WIN32
 static gboolean
 docklet_gtk_embed_timeout_cb(gpointer data)
@@ -896,19 +888,6 @@ docklet_gtk_embedded_cb(GtkWidget *widge
 #endif
 
 static void
-docklet_gtk_destroyed_cb(GtkWidget *widget, gpointer data)
-{
-	purple_debug_info("docklet", "destroyed\n");
-
-	pidgin_docklet_remove();
-
-	g_object_unref(G_OBJECT(docklet));
-	docklet = NULL;
-
-	g_idle_add(docklet_gtk_recreate_cb, NULL);
-}
-
-static void
 docklet_gtk_status_activated_cb(GtkStatusIcon *status_icon, gpointer user_data)
 {
 	pidgin_docklet_clicked(1);
@@ -939,7 +918,6 @@ docklet_gtk_status_destroy(void)
 	}
 
 	gtk_status_icon_set_visible(docklet, FALSE);
-	g_signal_handlers_disconnect_by_func(G_OBJECT(docklet), G_CALLBACK(docklet_gtk_destroyed_cb), NULL);
 	g_object_unref(G_OBJECT(docklet));
 	docklet = NULL;
 
@@ -965,7 +943,6 @@ docklet_gtk_status_create(gboolean recre
 #if GTK_CHECK_VERSION(2,12,0)
 	g_signal_connect(G_OBJECT(docklet), "notify::embedded", G_CALLBACK(docklet_gtk_embedded_cb), NULL);
 #endif
-	g_signal_connect(G_OBJECT(docklet), "destroy", G_CALLBACK(docklet_gtk_destroyed_cb), NULL);
 
 	gtk_status_icon_set_visible(docklet, TRUE);
 



More information about the Commits mailing list