[nautilus-actions] Signal connection functions now return the handler_id

[Pierre Wieser <pwieser src gnome org>]

commit 850aff32e486817e2e21454cfdffdcbcd4caf90e
Author: pierre <pierre vfedora10 virtuals pwi>
Date:   Mon Oct 5 17:20:42 2009 +0200

    Signal connection functions now return the handler_id

 ChangeLog              |    6 +++++-
 src/nact/base-window.c |   24 ++++++++++++++++++------
 src/nact/base-window.h |    6 +++---
 3 files changed, 26 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 29037e2..ba03ba9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
 	Restaure and fix 'Copy of' relabeling of pasted items.
 
 	* src/common/na-object-api.h:
-	* /src/common/na-object-id-fn.h:
+	* src/common/na-object-id-fn.h:
 	* src/common/na-object-id.c
 	(na_object_set_for_copy, na_object_id_set_for_copy):
 	Removed functions.
@@ -11,6 +11,10 @@
 	na_object_id_set_copy_of_label):
 	New functions.
 
+	* src/nact/base-window.c:
+	* src/nact/base-window.h:
+	Signal connection functions now return the handler_id.
+
 	* src/nact/nact-clipboard.c:
 	* /src/nact/nact-clipboard.h:
 	Keep the initial copy mode in the clipboard.
diff --git a/src/nact/base-window.c b/src/nact/base-window.c
index 9cfb4ec..2679723 100644
--- a/src/nact/base-window.c
+++ b/src/nact/base-window.c
@@ -1201,33 +1201,43 @@ base_window_yesno_dlg( BaseWindow *window, GtkMessageType type, const gchar *fir
 /**
  * Records a connected signal, to be disconnected at NactWindow dispose.
  */
-void
+gulong
 base_window_signal_connect( BaseWindow *window, GObject *instance, const gchar *signal, GCallback fn )
 {
+	gulong handler_id = 0;
+
 	g_return_if_fail( BASE_IS_WINDOW( window ));
 
 	if( !window->private->dispose_has_run ){
 
-		gulong handler_id = g_signal_connect( instance, signal, fn, window );
+		handler_id = g_signal_connect( instance, signal, fn, window );
 		record_connected_signal( window, instance, handler_id );
 	}
+
+	return( handler_id );
 }
 
-void
+gulong
 base_window_signal_connect_after( BaseWindow *window, GObject *instance, const gchar *signal, GCallback fn )
 {
+	gulong handler_id = 0;
+
 	g_return_if_fail( BASE_IS_WINDOW( window ));
 
 	if( !window->private->dispose_has_run ){
 
-		gulong handler_id = g_signal_connect_after( instance, signal, fn, window );
+		handler_id = g_signal_connect_after( instance, signal, fn, window );
 		record_connected_signal( window, instance, handler_id );
 	}
+
+	return( handler_id );
 }
 
-void
+gulong
 base_window_signal_connect_by_name( BaseWindow *window, const gchar *name, const gchar *signal, GCallback fn )
 {
+	gulong handler_id = 0;
+
 	g_return_if_fail( BASE_IS_WINDOW( window ));
 
 	if( !window->private->dispose_has_run ){
@@ -1235,9 +1245,11 @@ base_window_signal_connect_by_name( BaseWindow *window, const gchar *name, const
 		GtkWidget *widget = base_window_get_widget( window, name );
 		if( GTK_IS_WIDGET( widget )){
 
-			base_window_signal_connect( window, G_OBJECT( widget ), signal, fn );
+			handler_id = base_window_signal_connect( window, G_OBJECT( widget ), signal, fn );
 		}
 	}
+
+	return( handler_id );
 }
 
 static void
diff --git a/src/nact/base-window.h b/src/nact/base-window.h
index 2f30019..5e10f7d 100644
--- a/src/nact/base-window.h
+++ b/src/nact/base-window.h
@@ -87,9 +87,9 @@ void             base_window_set_save_window_position( BaseWindow *window, gbool
 void             base_window_error_dlg( BaseWindow *window, GtkMessageType type, const gchar *primary, const gchar *secondary );
 gboolean         base_window_yesno_dlg( BaseWindow *window, GtkMessageType type, const gchar *first, const gchar *second );
 
-void             base_window_signal_connect( BaseWindow *window, GObject *instance, const gchar *signal, GCallback fn );
-void             base_window_signal_connect_after( BaseWindow *window, GObject *instance, const gchar *signal, GCallback fn );
-void             base_window_signal_connect_by_name( BaseWindow *window, const gchar *name, const gchar *signal, GCallback fn );
+gulong           base_window_signal_connect( BaseWindow *window, GObject *instance, const gchar *signal, GCallback fn );
+gulong           base_window_signal_connect_after( BaseWindow *window, GObject *instance, const gchar *signal, GCallback fn );
+gulong           base_window_signal_connect_by_name( BaseWindow *window, const gchar *name, const gchar *signal, GCallback fn );
 
 G_END_DECLS