[nautilus-actions] base_window_init(): returns TRUE if Gtk toplevel was already initialized



commit fc311eae4e34de825d721ecf9d46755cc6adc263
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Jan 16 07:21:49 2012 +0100

    base_window_init(): returns TRUE if Gtk toplevel was already initialized

 ChangeLog              |    3 +++
 src/nact/base-window.c |    4 +++-
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4d7cbbb..1e1364c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* docs/nact/C/nact-conditions.xml: Embeds literal values between
 	<literal>..</literal> tags.
 
+	* src/nact/base-window.c (init_gtk_toplevel):
+	Also returns TRUE if Gtk toplevel was already initialized.
+
 	* src/core/na-factory-object.c (na_factory_object_copy):
 	Removes target copyable data before copying source copyable data.
 
diff --git a/src/nact/base-window.c b/src/nact/base-window.c
index c720cb4..34ed57e 100644
--- a/src/nact/base-window.c
+++ b/src/nact/base-window.c
@@ -743,8 +743,9 @@ init_gtk_toplevel( BaseWindow *window )
 						priv->gtk_toplevel );
 
 				data->initialized = TRUE;
-				ret = TRUE;
 			}
+
+			ret = TRUE;
 		}
 	}
 
@@ -907,6 +908,7 @@ base_window_run( BaseWindow *window )
 	if( !window->private->dispose_has_run ){
 
 		if( !base_window_init( window )){
+			g_debug( "%s: base_window_init() returns False", thisfn );
 			code = BASE_EXIT_CODE_INIT_WINDOW;
 
 		} else {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]