ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/indicator-appmenu/more-hashing-fun into lp:indicator-appmenu.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~ted/indicator-appmenu/more-hashing-fun/+merge/48969

Removing the destroy signal that is no longer useful.
-- 
https://code.launchpad.net/~ted/indicator-appmenu/more-hashing-fun/+merge/48969
Your team ayatana-commits is subscribed to branch lp:indicator-appmenu.

=== modified file 'src/indicator-appmenu.c'
--- src/indicator-appmenu.c	2011-02-07 17:02:50 +0000
+++ src/indicator-appmenu.c	2011-02-08 19:39:09 +0000
@@ -1244,8 +1244,6 @@
 		WindowMenus * wm = window_menus_new(windowid, sender, objectpath);
 		g_return_val_if_fail(wm != NULL, FALSE);
 
-		g_signal_connect(G_OBJECT(wm), WINDOW_MENUS_SIGNAL_DESTROY, G_CALLBACK(menus_destroyed), iapp);
-
 		g_hash_table_insert(iapp->apps, GUINT_TO_POINTER(windowid), wm);
 
 		emit_signal(iapp, "WindowRegistered",

=== modified file 'src/window-menus.c'
--- src/window-menus.c	2011-02-03 19:23:01 +0000
+++ src/window-menus.c	2011-02-08 19:39:09 +0000
@@ -64,7 +64,6 @@
 enum {
 	ENTRY_ADDED,
 	ENTRY_REMOVED,
-	DESTROY,
 	ERROR_STATE,
 	SHOW_MENU,
 	LAST_SIGNAL
@@ -114,13 +113,6 @@
 	                                      NULL, NULL,
 	                                      g_cclosure_marshal_VOID__POINTER,
 	                                      G_TYPE_NONE, 1, G_TYPE_POINTER);
-	signals[DESTROY] =       g_signal_new(WINDOW_MENUS_SIGNAL_DESTROY,
-	                                      G_TYPE_FROM_CLASS(klass),
-	                                      G_SIGNAL_RUN_LAST,
-	                                      G_STRUCT_OFFSET (WindowMenusClass, destroy),
-	                                      NULL, NULL,
-	                                      g_cclosure_marshal_VOID__VOID,
-	                                      G_TYPE_NONE, 0, G_TYPE_NONE);
 	signals[ERROR_STATE] =   g_signal_new(WINDOW_MENUS_SIGNAL_ERROR_STATE,
 	                                      G_TYPE_FROM_CLASS(klass),
 	                                      G_SIGNAL_RUN_LAST,
@@ -160,8 +152,6 @@
 static void
 window_menus_dispose (GObject *object)
 {
-	g_signal_emit(object, signals[DESTROY], 0, TRUE);
-
 	WindowMenusPrivate * priv = WINDOW_MENUS_GET_PRIVATE(object);
 
 	if (priv->root != NULL) {

=== modified file 'src/window-menus.h'
--- src/window-menus.h	2010-09-17 20:37:42 +0000
+++ src/window-menus.h	2011-02-08 19:39:09 +0000
@@ -37,7 +37,6 @@
 
 #define WINDOW_MENUS_SIGNAL_ENTRY_ADDED    "entry-added"
 #define WINDOW_MENUS_SIGNAL_ENTRY_REMOVED  "entry-removed"
-#define WINDOW_MENUS_SIGNAL_DESTROY        "destroy"
 #define WINDOW_MENUS_SIGNAL_ERROR_STATE    "error-state"
 #define WINDOW_MENUS_SIGNAL_SHOW_MENU      "show-menu"
 
@@ -51,7 +50,6 @@
 	void (*entry_added)   (WindowMenus * wm, IndicatorObjectEntry * entry, gpointer user_data);
 	void (*entry_removed) (WindowMenus * wm, IndicatorObjectEntry * entry, gpointer user_data);
 
-	void (*destroy)       (WindowMenus * wm, gpointer user_data);
 	void (*error_state)   (WindowMenus * wm, gboolean state, gpointer user_data);
 
 	void (*show_menu)     (WindowMenus * wm, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data);