[nautilus-actions] End of BaseApplication refactoring

[Pierre Wieser <pwieser src gnome org>]

commit b385b5bf600d231c2ddb4a9da76eea6dd624a2cc
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Jan 21 19:35:38 2011 +0100

    End of BaseApplication refactoring
    
    + base_application_message_dlg(), base_application_error_dlg() and base_application_yesno_dlg()
      are moved to BaseWindow class as base_window_display_yesno_dlg() and base_window_display_message_dlg().

 ChangeLog                   |   10 ++
 src/nact/base-application.c |  207 +++----------------------------------------
 src/nact/base-application.h |    4 -
 src/nact/base-window.c      |   68 +++++++++++----
 src/nact/base-window.h      |    5 +-
 5 files changed, 79 insertions(+), 215 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d800415..e49f393 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
 2011-01-21 Pierre Wieser <pwieser trychlos org>
 
 	* src/nact/base-application.c:
+	* src/nact/base-application.h (base_application_message_dlg,
+	base_application_error_dlg, base_application_yesno_dlg):
+	Functions are moved to BaseWindow class.
+
+	* src/nact/base-window.c:
+	* src/nact/base-window.h
+	(base_window_display_yesno_dlg, base_window_display_message_dlg):
+	New functions.
+
+	* src/nact/base-application.c:
 	* src/nact/base-application.h
 	(base_application_get_ui_filename): Removed function.
 	(get_ui_filename): Removed virtual method.
diff --git a/src/nact/base-application.c b/src/nact/base-application.c
index 08baa82..1fe7128 100644
--- a/src/nact/base-application.c
+++ b/src/nact/base-application.c
@@ -33,7 +33,6 @@
 #endif
 
 #include <glib/gi18n.h>
-#include <glib/gprintf.h>
 #include <string.h>
 #include <unique/unique.h>
 
@@ -109,13 +108,6 @@ static void           session_manager_client_quit_cb( EggSMClient *client, BaseA
 static void           session_manager_client_quit_requested_cb( EggSMClient *client, BaseApplication *application );
 static gboolean       appli_initialize_base_application( BaseApplication *application, int *code );
 
-static gint           display_dlg( BaseApplication *application, GtkMessageType type_message, GtkButtonsType type_buttons, const gchar *first, const gchar *second );
-#if 0
-static void           display_error_message( BaseApplication *application );
-static void           set_initialize_ui_get_fname_error( BaseApplication *application );
-static void           set_initialize_ui_add_xml_error( BaseApplication *application, const gchar *filename, GError *error );
-#endif
-
 GType
 base_application_get_type( void )
 {
@@ -373,6 +365,16 @@ instance_dispose( GObject *application )
 			g_object_unref( self->private->builder );
 		}
 
+		if( self->private->sm_client_quit_handler_id &&
+			g_signal_handler_is_connected( self->private->sm_client, self->private->sm_client_quit_handler_id )){
+				g_signal_handler_disconnect( self->private->sm_client, self->private->sm_client_quit_handler_id  );
+		}
+
+		if( self->private->sm_client_quit_requested_handler_id &&
+			g_signal_handler_is_connected( self->private->sm_client, self->private->sm_client_quit_requested_handler_id )){
+				g_signal_handler_disconnect( self->private->sm_client, self->private->sm_client_quit_requested_handler_id  );
+		}
+
 		if( self->private->sm_client ){
 			g_object_unref( self->private->sm_client );
 		}
@@ -466,7 +468,10 @@ base_application_run( BaseApplication *application )
 						unique_app_watch_window( application->private->unique_app_handle, gtk_toplevel );
 					}
 
+					g_debug( "%s: invoking base_window_run", thisfn );
 					code = base_window_run( application->private->main_window );
+				} else {
+					g_debug( "%s: base_window_init has returned FALSE", thisfn );
 				}
 			}
 		}
@@ -739,189 +744,3 @@ base_application_get_builder( const BaseApplication *application )
 
 	return( builder );
 }
-
-/**
- * base_application_message_dlg:
- * @application: this #BaseApplication instance.
- * @message: the message to be displayed.
- *
- * Displays a dialog with only an OK button.
- */
-void
-base_application_message_dlg( BaseApplication *application, GSList *msg )
-{
-	GString *string;
-	GSList *im;
-
-	if( !application->private->dispose_has_run ){
-
-		string = g_string_new( "" );
-		for( im = msg ; im ; im = im->next ){
-			if( g_utf8_strlen( string->str, -1 )){
-				string = g_string_append( string, "\n" );
-			}
-			string = g_string_append( string, ( gchar * ) im->data );
-		}
-		display_dlg( application, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, string->str, NULL );
-
-		g_string_free( string, TRUE );
-	}
-}
-
-/**
- * base_application_error_dlg:
- * @application: this #BaseApplication instance.
- * @type:
- * @primary: a first message.
- * @secondaru: a second message.
- *
- * Displays an error dialog with only an OK button.
- */
-void
-base_application_error_dlg( BaseApplication *application,
-							GtkMessageType type,
-							const gchar *first,
-							const gchar *second )
-{
-	if( !application->private->dispose_has_run ){
-		display_dlg( application, type, GTK_BUTTONS_OK, first, second );
-	}
-}
-
-/**
- * base_application_yesno_dlg:
- * @application: this #BaseApplication instance.
- * @type:
- * @primary: a first message.
- * @secondaru: a second message.
- *
- * Displays a choice dialog, with Yes and No buttons.
- * No button is the default.
- *
- * Returns: %TRUE if user has clicked on Yes button, %FALSE else.
- */
-gboolean
-base_application_yesno_dlg( BaseApplication *application, GtkMessageType type, const gchar *first, const gchar *second )
-{
-	gboolean ret = FALSE;
-	gint result;
-
-	if( !application->private->dispose_has_run ){
-
-		result = display_dlg( application, type, GTK_BUTTONS_YES_NO, first, second );
-		ret = ( result == GTK_RESPONSE_YES );
-	}
-
-	return( ret );
-}
-
-#if 0
-static gboolean
-application_do_initialize_ui( BaseApplication *application )
-{
-	static const gchar *thisfn = "base_application_do_initialize_ui";
-	gboolean ret = TRUE;
-	GError *error = NULL;
-	gchar *name;
-
-	g_debug( "%s: application=%p", thisfn, ( void * ) application );
-
-	name = base_application_get_ui_filename( application );
-
-	if( !name || !strlen( name )){
-		ret = FALSE;
-		set_initialize_ui_get_fname_error( application );
-
-	} else {
-		application->private->builder = base_builder_new();
-		if( !base_builder_add_from_file( application->private->builder, name, &error )){
-			ret = FALSE;
-			set_initialize_ui_add_xml_error( application, name, error );
-			if( error ){
-				g_error_free( error );
-			}
-		}
-	}
-
-	g_free( name );
-	return( ret );
-}
-#endif
-
-static gint
-display_dlg( BaseApplication *application, GtkMessageType type_message, GtkButtonsType type_buttons, const gchar *first, const gchar *second )
-{
-	GtkWidget *dialog;
-	const gchar *name;
-	gint result;
-	GtkWindow *parent;
-
-	g_assert( BASE_IS_APPLICATION( application ));
-
-	parent = NULL;
-	if( application->private->main_window ){
-		parent = base_window_get_toplevel( application->private->main_window );
-	}
-
-	dialog = gtk_message_dialog_new( parent, GTK_DIALOG_MODAL, type_message, type_buttons, "%s", first );
-
-	if( second && g_utf8_strlen( second, -1 )){
-		gtk_message_dialog_format_secondary_text( GTK_MESSAGE_DIALOG( dialog ), "%s", second );
-	}
-
-	name = g_get_application_name();
-
-	g_object_set( G_OBJECT( dialog ) , "title", name, NULL );
-
-	result = gtk_dialog_run( GTK_DIALOG( dialog ));
-
-	gtk_widget_destroy( dialog );
-
-	return( result );
-}
-
-#if 0
-static void
-display_error_message( BaseApplication *application )
-{
-	if( application->private->exit_message1 && g_utf8_strlen( application->private->exit_message1, -1 )){
-
-		if( application->private->is_gtk_initialized ){
-			base_application_error_dlg(
-					application,
-					GTK_MESSAGE_INFO,
-					application->private->exit_message1,
-					application->private->exit_message2 );
-
-		} else {
-			g_printf( "%s\n", application->private->exit_message1 );
-			if( application->private->exit_message2 && g_utf8_strlen( application->private->exit_message2, -1 )){
-				g_printf( "%s\n", application->private->exit_message2 );
-			}
-		}
-	}
-}
-
-static void
-set_initialize_ui_get_fname_error( BaseApplication *application )
-{
-	application->private->exit_code = BASE_APPLICATION_ERROR_UI_FNAME;
-
-	application->private->exit_message1 =
-		g_strdup( _( "No filename provided for the UI XML definition." ));
-}
-
-static void
-set_initialize_ui_add_xml_error( BaseApplication *application, const gchar *filename, GError *error )
-{
-	application->private->exit_code = BASE_APPLICATION_ERROR_UI_LOAD;
-
-	application->private->exit_message1 =
-		/* i18n: Unable to load the XML definition from <filename> */
-		g_strdup_printf( _( "Unable to load the XML definition from %s." ), filename );
-
-	if( error && error->message ){
-		application->private->exit_message2 = g_strdup( error->message );
-	}
-}
-#endif
diff --git a/src/nact/base-application.h b/src/nact/base-application.h
index 2863fa9..387b749 100644
--- a/src/nact/base-application.h
+++ b/src/nact/base-application.h
@@ -179,10 +179,6 @@ int          base_application_run( BaseApplication *application );
 gchar       *base_application_get_application_name( const BaseApplication *application );
 BaseBuilder *base_application_get_builder         ( const BaseApplication *application );
 
-void         base_application_message_dlg( BaseApplication *application, GSList *message );
-void         base_application_error_dlg( BaseApplication *application, GtkMessageType type, const gchar *first, const gchar *second );
-gboolean     base_application_yesno_dlg( BaseApplication *application, GtkMessageType type, const gchar *first, const gchar *second );
-
 G_END_DECLS
 
 #endif /* __BASE_APPLICATION_H__ */
diff --git a/src/nact/base-window.c b/src/nact/base-window.c
index c734bcf..38f2ad6 100644
--- a/src/nact/base-window.c
+++ b/src/nact/base-window.c
@@ -766,6 +766,8 @@ base_window_run( BaseWindow *window )
 
 	if( !window->private->dispose_has_run ){
 
+		run_ok = window->private->initialized;
+
 		if( !window->private->initialized ){
 			run_ok = base_window_init( window );
 		}
@@ -1286,7 +1288,7 @@ load_named_toplevel( const BaseWindow *window, const gchar *name )
 
 	if( !toplevel ){
 		msg = g_strdup_printf( _( "Unable to load %s XML definition." ), name );
-		base_application_error_dlg( window->private->application, GTK_MESSAGE_ERROR, msg, NULL );
+		base_window_display_error_dlg( window, msg, NULL );
 		g_free( msg );
 	}
 
@@ -1354,6 +1356,53 @@ base_window_display_error_dlg( const BaseWindow *parent, const gchar *primary, c
 	display_dlg( parent, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, primary, secondary );
 }
 
+/**
+ * base_window_display_yesno_dlg:
+ * @parent: the #BaseWindow parent, may be %NULL.
+ * @primary: the primary message.
+ * @secondary: the secondary message.
+ *
+ * Display a warning dialog box, with a 'OK' button only.
+ *
+ * if @secondary is not null, then @primary is displayed as a bold title.
+ *
+ * Returns: %TRUE if the user has clicked 'Yes', %FALSE else.
+ */
+gboolean
+base_window_display_yesno_dlg( const BaseWindow *parent, const gchar *primary, const gchar *secondary )
+{
+	gint result;
+
+	result = display_dlg( parent, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, primary, secondary );
+
+	return( result == GTK_RESPONSE_YES );
+}
+
+/**
+ * base_window_display_message_dlg:
+ * @parent: the #BaseWindow parent, may be %NULL.
+ * @message: the message to be displayed.
+ *
+ * Displays an information dialog with only an OK button.
+ */
+void
+base_window_display_message_dlg( const BaseWindow *parent, GSList *msg )
+{
+	GString *string;
+	GSList *im;
+
+	string = g_string_new( "" );
+	for( im = msg ; im ; im = im->next ){
+		if( g_utf8_strlen( string->str, -1 )){
+			string = g_string_append( string, "\n" );
+		}
+		string = g_string_append( string, ( gchar * ) im->data );
+	}
+	display_dlg( parent, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, string->str, NULL );
+
+	g_string_free( string, TRUE );
+}
+
 static gint
 display_dlg( const BaseWindow *parent, GtkMessageType type_message, GtkButtonsType type_buttons, const gchar *primary, const gchar *secondary )
 {
@@ -1384,26 +1433,13 @@ display_dlg( const BaseWindow *parent, GtkMessageType type_message, GtkButtonsTy
 void
 base_window_error_dlg( const BaseWindow *window, GtkMessageType type, const gchar *primary, const gchar *secondary )
 {
-	g_return_if_fail( BASE_IS_WINDOW( window ));
-
-	if( !window->private->dispose_has_run ){
-
-		base_application_error_dlg( window->private->application, type, primary, secondary );
-	}
+	base_window_display_error_dlg( window, primary, secondary );
 }
 
 gboolean
 base_window_yesno_dlg( const BaseWindow *window, GtkMessageType type, const gchar *first, const gchar *second )
 {
-	gboolean yesno = FALSE;
-
-	g_return_val_if_fail( BASE_IS_WINDOW( window ), FALSE );
-
-	if( !window->private->dispose_has_run ){
-		yesno = base_application_yesno_dlg( window->private->application, type, first, second );
-	}
-
-	return( yesno );
+	return( base_window_display_yesno_dlg( window, first, second ));
 }
 
 /**
diff --git a/src/nact/base-window.h b/src/nact/base-window.h
index d30ac1a..dd54c09 100644
--- a/src/nact/base-window.h
+++ b/src/nact/base-window.h
@@ -86,7 +86,10 @@ GtkWidget       *base_window_get_widget( const BaseWindow *window, const gchar *
 GtkWidget       *base_window_peek_widget( GtkWindow *window, const gchar *name );
 gboolean         base_window_is_willing_to_quit( const BaseWindow *window );
 
-void             base_window_display_error_dlg( const BaseWindow *parent, const gchar *primary, const gchar *secondary );
+void             base_window_display_error_dlg  ( const BaseWindow *parent, const gchar *primary, const gchar *secondary );
+gboolean         base_window_display_yesno_dlg  ( const BaseWindow *parent, const gchar *primary, const gchar *secondary );
+void             base_window_display_message_dlg( const BaseWindow *parent, GSList *message );
+
 void             base_window_error_dlg( const BaseWindow *window, GtkMessageType type, const gchar *primary, const gchar *secondary );
 gboolean         base_window_yesno_dlg( const BaseWindow *window, GtkMessageType type, const gchar *first, const gchar *second );