GNOME.org
 

[nautilus-actions] Remove BaseApplication::initialize_icon_name() virtual method

commit 8177db030e1779cf3c71be0d105036a55ce1155e
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Jan 21 02:09:42 2011 +0100

    Remove BaseApplication::initialize_icon_name() virtual method

 ChangeLog                   |   11 ++-
 src/nact/base-application.c |  163 +++++-------------------------------------
 src/nact/base-application.h |   29 --------
 src/nact/nact-application.c |   12 ---
 4 files changed, 28 insertions(+), 187 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9223cf4..8cac819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,17 @@
 2011-01-20 Pierre Wieser <pwieser trychlos org>
 
 	* src/nact/base-application.c:
+	* src/nact/base-application.h (base_application_get_icon_name):
+	Removed function.
+
+	* src/nact/base-application.c:
 	* src/nact/base-application.h
-	(initialize_i18n, initialize_application_name, get_application_name):
+	(initialize_i18n, initialize_application_name, get_application_name,
+	initialize_default_icon, get_icon_name):
 	Remove virtual methods.
 
-	* src/nact/nact-application.c (appli_get_application_name):
-	Removed function.
+	* src/nact/nact-application.c
+	(appli_get_application_name, appli_get_icon_name): Removed functions.
 
 	* src/nact/nact-application.c (nact_application_new_with_args):
 	Make NactApplication initializes with these new properties.
diff --git a/src/nact/base-application.c b/src/nact/base-application.c
index 34c5479..a6df78f 100644
--- a/src/nact/base-application.c
+++ b/src/nact/base-application.c
@@ -105,6 +105,7 @@ static void           instance_finalize( GObject *application );
 
 static gboolean       appli_initialize_i18n( BaseApplication *application, int *code );
 static gboolean       appli_initialize_application_name( BaseApplication *application, int *code );
+static gboolean       appli_initialize_application_icon( BaseApplication *application, int *code );
 
 static gboolean       v_initialize( BaseApplication *application );
 static gboolean       v_initialize_gtk( BaseApplication *application );
@@ -112,15 +113,7 @@ static gboolean       v_manage_options( const BaseApplication *application, int
 static gboolean       v_initialize_session_manager( BaseApplication *application );
 static gboolean       v_initialize_unique_app( BaseApplication *application );
 static gboolean       v_initialize_ui( BaseApplication *application );
-static gboolean       v_initialize_default_icon( BaseApplication *application );
-#if 0
-static gboolean       v_initialize_application_name( BaseApplication *application );
-static gboolean       v_initialize_application( BaseApplication *application );
-static void           set_initialize_application_error( BaseApplication *application );
-static gboolean       application_do_initialize_application( BaseApplication *application );
-static void           set_initialize_i18n_error( BaseApplication *application );
-static gboolean       application_do_initialize_application_name( BaseApplication *application );
-#endif
+
 static int            application_do_run( BaseApplication *application );
 static gboolean       application_do_initialize( BaseApplication *application );
 static gboolean       application_do_initialize_gtk( BaseApplication *application );
@@ -128,7 +121,6 @@ static gboolean       application_do_manage_options( const BaseApplication *appl
 static gboolean       application_do_initialize_session_manager( BaseApplication *application );
 static gboolean       application_do_initialize_unique_app( BaseApplication *application );
 static gboolean       application_do_initialize_ui( BaseApplication *application );
-static gboolean       application_do_initialize_default_icon( BaseApplication *application );
 
 static gboolean       check_for_unique_app( BaseApplication *application );
 /*static UniqueResponse on_unique_message_received( UniqueApp *app, UniqueCommand command, UniqueMessageData *message, guint time, gpointer user_data );*/
@@ -142,7 +134,6 @@ static void           set_initialize_gtk_error( BaseApplication *application );
 static void           set_initialize_unique_app_error( 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 );
-static void           set_initialize_default_icon_error( BaseApplication *application );
 
 GType
 base_application_get_type( void )
@@ -307,9 +298,7 @@ class_init( BaseApplicationClass *klass )
 	klass->initialize_session_manager = application_do_initialize_session_manager;
 	klass->initialize_unique_app = application_do_initialize_unique_app;
 	klass->initialize_ui = application_do_initialize_ui;
-	klass->initialize_default_icon = application_do_initialize_default_icon;
 	klass->initialize_application = NULL;
-	klass->get_icon_name = NULL;
 	klass->get_unique_app_name = NULL;
 	klass->get_ui_filename = NULL;
 	klass->get_main_window = NULL;
@@ -576,12 +565,12 @@ base_application_run( BaseApplication *application )
 
 		if( appli_initialize_i18n( application, &code ) &&
 			appli_initialize_application_name( application, &code ) &&
+			appli_initialize_application_icon( application, &code ) &&
 				v_initialize( application ) /*
 			appli_initialize_gtk( application, &code ) &&
 			appli_initialize_manage_options( application, &code ) &&
 			appli_initialize_session_manager( application, &code ) &&
 			appli_initialize_unique_app( application, &code ) &&
-			appli_initialize_default_icon( application, &code ) &&
 			appli_initialize_builder( application, &code ) &&
 			appli_initialize_first_window( application, &code )*/){
 
@@ -629,6 +618,22 @@ appli_initialize_application_name( BaseApplication *application, int *code )
 	return( TRUE );
 }
 
+static gboolean
+appli_initialize_application_icon( BaseApplication *application, int *code )
+{
+	static const gchar *thisfn = "base_application_appli_initialize_application_icon";
+
+	g_debug( "%s: application=%p, code=%p (%d)", thisfn, ( void * ) application, ( void * ) code, *code );
+
+	if( application->private->icon_name &&
+		g_utf8_strlen( application->private->icon_name, -1 )){
+
+			gtk_window_set_default_icon_name( application->private->icon_name );
+	}
+
+	return( TRUE );
+}
+
 /**
  * base_application_get_application_name:
  * @application: this #BaseApplication instance.
@@ -674,37 +679,6 @@ base_application_get_builder( BaseApplication *application )
 }
 
 /**
- * base_application_get_icon_name:
- * @application: this #BaseApplication instance.
- *
- * Asks the #BaseApplication-derived class for its default icon name.
- *
- * Defaults to empty.
- *
- * Returns: a newly allocated string to be g_free() by the caller.
- */
-gchar *
-base_application_get_icon_name( BaseApplication *application )
-{
-	/*static const gchar *thisfn = "base_application_get_icon_name";
-	g_debug( "%s: icon=%p", thisfn, application );*/
-	gchar *name = NULL;
-
-	g_return_val_if_fail( BASE_IS_APPLICATION( application ), NULL );
-
-	if( !application->private->dispose_has_run ){
-		if( BASE_APPLICATION_GET_CLASS( application )->get_icon_name ){
-			name = BASE_APPLICATION_GET_CLASS( application )->get_icon_name( application );
-
-		} else {
-			name = g_strdup( "" );
-		}
-	}
-
-	return( name );
-}
-
-/**
  * base_application_get_unique_app_name:
  * @application: this #BaseApplication instance.
  *
@@ -925,74 +899,6 @@ v_initialize_ui( BaseApplication *application )
 	return( BASE_APPLICATION_GET_CLASS( application )->initialize_ui( application ));
 }
 
-static gboolean
-v_initialize_default_icon( BaseApplication *application )
-{
-	static const gchar *thisfn = "base_application_v_initialize_default_icon";
-	gboolean ok;
-
-	g_debug( "%s: application=%p", thisfn, ( void * ) application );
-
-	ok = BASE_APPLICATION_GET_CLASS( application )->initialize_default_icon( application );
-
-	if( !ok ){
-		set_initialize_default_icon_error( application );
-	}
-
-	return( ok );
-}
-
-#if 0
-
-static gboolean
-v_initialize_application_name( BaseApplication *application )
-{
-	static const gchar *thisfn = "base_application_v_initialize_application_name";
-	gboolean ok;
-
-	g_debug( "%s: application=%p", thisfn, ( void * ) application );
-
-	ok = BASE_APPLICATION_GET_CLASS( application )->initialize_application_name( application );
-
-	return( ok );
-}
-
-static gboolean
-v_initialize_application( BaseApplication *application )
-{
-	static const gchar *thisfn = "base_application_v_initialize_application";
-	gboolean ok;
-
-	g_debug( "%s: application=%p", thisfn, ( void * ) application );
-
-	ok = BASE_APPLICATION_GET_CLASS( application )->initialize_application( application );
-
-	if( !ok ){
-		set_initialize_application_error( application );
-	}
-
-	return( ok );
-}
-
-static void
-set_initialize_i18n_error( BaseApplication *application )
-{
-	application->private->exit_code = BASE_APPLICATION_ERROR_I18N;
-
-	application->private->exit_message1 =
-		g_strdup( _( "Unable to initialize the internationalization environment." ));
-}
-
-static void
-set_initialize_application_error( BaseApplication *application )
-{
-	application->private->exit_code = BASE_APPLICATION_ERROR_MAIN_WINDOW;
-
-	application->private->exit_message1 =
-		g_strdup( _( "Unable to get the main window of the application." ));
-}
-#endif
-
 static int
 application_do_run( BaseApplication *application )
 {
@@ -1046,8 +952,7 @@ application_do_initialize( BaseApplication *application )
 			v_manage_options( application, &code ) &&
 			v_initialize_session_manager( application ) &&
 			v_initialize_unique_app( application ) &&
-			v_initialize_ui( application ) &&
-			v_initialize_default_icon( application )
+			v_initialize_ui( application )
 	);
 }
 
@@ -1172,25 +1077,6 @@ application_do_initialize_ui( BaseApplication *application )
 }
 
 static gboolean
-application_do_initialize_default_icon( BaseApplication *application )
-{
-	static const gchar *thisfn = "base_application_do_initialize_default_icon";
-	gchar *name;
-
-	g_debug( "%s: application=%p", thisfn, ( void * ) application );
-
-	name = base_application_get_icon_name( application );
-
-	if( name && strlen( name )){
-		gtk_window_set_default_icon_name( name );
-	}
-
-	g_free( name );
-
-	return( TRUE );
-}
-
-static gboolean
 check_for_unique_app( BaseApplication *application )
 {
 	static const gchar *thisfn = "base_application_check_for_unique_app";
@@ -1383,12 +1269,3 @@ set_initialize_ui_add_xml_error( BaseApplication *application, const gchar *file
 		application->private->exit_message2 = g_strdup( error->message );
 	}
 }
-
-static void
-set_initialize_default_icon_error( BaseApplication *application )
-{
-	application->private->exit_code = BASE_APPLICATION_ERROR_DEFAULT_ICON;
-
-	application->private->exit_message1 =
-		g_strdup( _( "Unable to set the default icon for the application." ));
-}
diff --git a/src/nact/base-application.h b/src/nact/base-application.h
index f229eab..99c939d 100644
--- a/src/nact/base-application.h
+++ b/src/nact/base-application.h
@@ -270,19 +270,6 @@ typedef struct {
 	gboolean  ( *initialize_ui )              ( BaseApplication *appli );
 
 	/**
-	 * initialize_default_icon:
-	 * @appli: this #BaseApplication instance.
-	 *
-	 * Initializes the default icon for the application.
-	 *
-	 * Returns: %TRUE if the default icon has been successfully set for
-	 * the application, %FALSE else.
-	 *
-	 * The base class implementation always returns %TRUE.
-	 */
-	gboolean  ( *initialize_default_icon )    ( BaseApplication *appli );
-
-	/**
 	 * initialize_application:
 	 * @appli: this #BaseApplication instance.
 	 *
@@ -307,21 +294,6 @@ typedef struct {
 	gboolean  ( *initialize_application )     ( BaseApplication *appli );
 
 	/**
-	 * get_icon_name:
-	 * @appli: this #BaseApplication instance.
-	 *
-	 * Asks the derived class for the name of the default icon.
-	 *
-	 * It is typically used as the icon of the main window.
-	 *
-	 * No default is provided by the base class.
-	 *
-	 * Returns: the default icon name for the application, to be
-	 * g_free() by the caller.
-	 */
-	gchar *   ( *get_icon_name )              ( BaseApplication *appli );
-
-	/**
 	 * get_unique_app_name:
 	 * @appli: this #BaseApplication instance.
 	 *
@@ -453,7 +425,6 @@ gchar       *base_application_get_application_name( const BaseApplication *appli
  */
 #define BASE_APPLICATION_PROP_MAIN_WINDOW			"base-application-main-window"
 
-gchar       *base_application_get_icon_name( BaseApplication *application );
 gchar       *base_application_get_unique_app_name( BaseApplication *application );
 gchar       *base_application_get_ui_filename( BaseApplication *application );
 BaseBuilder *base_application_get_builder( BaseApplication *application );
diff --git a/src/nact/nact-application.c b/src/nact/nact-application.c
index e342665..01aee1a 100644
--- a/src/nact/nact-application.c
+++ b/src/nact/nact-application.c
@@ -93,7 +93,6 @@ static GObject *appli_main_window_new( const BaseApplication *application, int *
 
 static gboolean appli_initialize_unique_app( BaseApplication *application );
 static gboolean appli_initialize_application( BaseApplication *application );
-static gchar   *appli_get_icon_name( BaseApplication *application );
 static gchar   *appli_get_unique_app_name( BaseApplication *application );
 static gchar   *appli_get_gtkbuilder_filename( BaseApplication *application );
 static GObject *appli_get_main_window( BaseApplication *application );
@@ -168,7 +167,6 @@ class_init( NactApplicationClass *klass )
 
 	appli_class->initialize_unique_app = appli_initialize_unique_app;
 	appli_class->initialize_application = appli_initialize_application;
-	appli_class->get_icon_name = appli_get_icon_name;
 	appli_class->get_unique_app_name = appli_get_unique_app_name;
 	appli_class->get_ui_filename = appli_get_gtkbuilder_filename;
 	appli_class->get_main_window = appli_get_main_window;
@@ -452,16 +450,6 @@ appli_initialize_application( BaseApplication *application )
 }
 
 static gchar *
-appli_get_icon_name( BaseApplication *application )
-{
-	static const gchar *thisfn = "nact_application_appli_get_icon_name";
-
-	g_debug( "%s: application=%p", thisfn, ( void * ) application );
-
-	return( na_iabout_get_icon_name());
-}
-
-static gchar *
 appli_get_unique_app_name( BaseApplication *application )
 {
 	static const gchar *thisfn = "nact_application_appli_get_unique_app_name";
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]