[nautilus-actions] Refactoring: update Base class headers

[Pierre Wieser <pwieser src gnome org>]

commit 4fa1a0f9ba6c98c40601b52856e955b35ff529bf
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Feb 17 10:59:59 2010 +0100

    Refactoring: update Base class headers

 ChangeLog                                          |    9 ++
 src/nact/Makefile.am                               |   10 ++-
 src/nact/base-application-class.h                  |    2 +-
 src/nact/base-assistant.h                          |    2 +-
 src/nact/base-builder.h                            |    2 +-
 src/nact/base-dialog.h                             |    2 +-
 src/nact/base-iprefs.c                             |   78 +-------------------
 src/nact/base-window-class.h                       |    2 +-
 ...ct-assistant-import-ask.c => nact-import-ask.c} |    0
 ...ct-assistant-import-ask.h => nact-import-ask.h} |    0
 10 files changed, 21 insertions(+), 86 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 677ffa7..eb1e56a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2009-02-17 Pierre Wieser <pwieser trychlos org>
 
+	* src/nact/Makefile.am:
+	* src/nact/base-application-class.h:
+	* src/nact/base-assistant.h:
+	* src/nact/base-assistant.h:
+	* src/nact/base-builder.h:
+	* src/nact/base-dialog.h:
+	* src/nact/base-iprefs.c:
+	* src/nact/base-window-class.h:	Update typo in Base class headers.
+
 	* src/core/na-importer.c:
 	* src/core/na-importer.h: New files.
 
diff --git a/src/nact/Makefile.am b/src/nact/Makefile.am
index 6009aa2..e61eecc 100644
--- a/src/nact/Makefile.am
+++ b/src/nact/Makefile.am
@@ -73,16 +73,16 @@ nautilus_actions_config_tool_SOURCES = \
 	nact-application.h									\
 	nact-assistant-export.c								\
 	nact-assistant-export.h								\
-	nact-assistant-export-ask.c							\
-	nact-assistant-export-ask.h							\
 	nact-assistant-import.c								\
 	nact-assistant-import.h								\
-	nact-assistant-import-ask.c							\
-	nact-assistant-import-ask.h							\
 	nact-clipboard.c									\
 	nact-clipboard.h									\
 	nact-confirm-logout.c								\
 	nact-confirm-logout.h								\
+	nact-export-ask.c									\
+	nact-export-ask.h									\
+	nact-export-format.c								\
+	nact-export-format.h								\
 	nact-gtk-utils.c									\
 	nact-gtk-utils.h									\
 	nact-iactions-list.c								\
@@ -100,6 +100,8 @@ nautilus_actions_config_tool_SOURCES = \
 	nact-icommand-tab.h									\
 	nact-iconditions-tab.c								\
 	nact-iconditions-tab.h								\
+	nact-import-ask.c									\
+	nact-import-ask.h									\
 	nact-iprefs.c										\
 	nact-iprefs.h										\
 	nact-main.c											\
diff --git a/src/nact/base-application-class.h b/src/nact/base-application-class.h
index f3660d1..8fbbf11 100644
--- a/src/nact/base-application-class.h
+++ b/src/nact/base-application-class.h
@@ -50,7 +50,7 @@ G_BEGIN_DECLS
 #define BASE_IS_APPLICATION_CLASS( klass )		( G_TYPE_CHECK_CLASS_TYPE(( klass ), BASE_APPLICATION_TYPE ))
 #define BASE_APPLICATION_GET_CLASS( object )	( G_TYPE_INSTANCE_GET_CLASS(( object ), BASE_APPLICATION_TYPE, BaseApplicationClass ))
 
-typedef struct BaseApplicationPrivate BaseApplicationPrivate;
+typedef struct BaseApplicationPrivate      BaseApplicationPrivate;
 
 typedef struct {
 	GObject                 parent;
diff --git a/src/nact/base-assistant.h b/src/nact/base-assistant.h
index 5ff25bf..0401fab 100644
--- a/src/nact/base-assistant.h
+++ b/src/nact/base-assistant.h
@@ -58,7 +58,7 @@ G_BEGIN_DECLS
 #define BASE_IS_ASSISTANT_CLASS( klass )	( G_TYPE_CHECK_CLASS_TYPE(( klass ), BASE_ASSISTANT_TYPE ))
 #define BASE_ASSISTANT_GET_CLASS( object )	( G_TYPE_INSTANCE_GET_CLASS(( object ), BASE_ASSISTANT_TYPE, BaseAssistantClass ))
 
-typedef struct BaseAssistantPrivate BaseAssistantPrivate;
+typedef struct BaseAssistantPrivate      BaseAssistantPrivate;
 
 typedef struct {
 	BaseWindow            parent;
diff --git a/src/nact/base-builder.h b/src/nact/base-builder.h
index b1a59da..377f5bf 100644
--- a/src/nact/base-builder.h
+++ b/src/nact/base-builder.h
@@ -54,7 +54,7 @@ G_BEGIN_DECLS
 #define BASE_IS_BUILDER_CLASS( klass )		( G_TYPE_CHECK_CLASS_TYPE(( klass ), BASE_BUILDER_TYPE ))
 #define BASE_BUILDER_GET_CLASS( object )	( G_TYPE_INSTANCE_GET_CLASS(( object ), BASE_BUILDER_TYPE, BaseBuilderClass ))
 
-typedef struct BaseBuilderPrivate BaseBuilderPrivate;
+typedef struct BaseBuilderPrivate      BaseBuilderPrivate;
 
 typedef struct {
 	GtkBuilder          parent;
diff --git a/src/nact/base-dialog.h b/src/nact/base-dialog.h
index 57ccc1b..8875936 100644
--- a/src/nact/base-dialog.h
+++ b/src/nact/base-dialog.h
@@ -51,7 +51,7 @@ G_BEGIN_DECLS
 #define BASE_IS_DIALOG_CLASS( klass )	( G_TYPE_CHECK_CLASS_TYPE(( klass ), BASE_DIALOG_TYPE ))
 #define BASE_DIALOG_GET_CLASS( object )	( G_TYPE_INSTANCE_GET_CLASS(( object ), BASE_DIALOG_TYPE, BaseDialogClass ))
 
-typedef struct BaseDialogPrivate BaseDialogPrivate;
+typedef struct BaseDialogPrivate      BaseDialogPrivate;
 
 typedef struct {
 	BaseWindow         parent;
diff --git a/src/nact/base-iprefs.c b/src/nact/base-iprefs.c
index 5e94ff1..1ed7f26 100644
--- a/src/nact/base-iprefs.c
+++ b/src/nact/base-iprefs.c
@@ -54,9 +54,7 @@ static void    interface_base_finalize( BaseIPrefsInterface *klass );
 
 static gchar  *v_iprefs_get_window_id( const BaseWindow *window );
 
-/*static gint    read_int( const BaseWindow *window, const gchar *name );*/
 static GSList *read_int_list( const BaseWindow *window, const gchar *key );
-/*static void    write_int( const BaseWindow *window, const gchar *name, gint value )*/
 static void    write_int_list( const BaseWindow *window, const gchar *key, GSList *list );
 static void    int_list_to_position( const BaseWindow *window, GSList *list, gint *x, gint *y, gint *width, gint *height );
 static GSList *position_to_int_list( const BaseWindow *window, gint x, gint y, gint width, gint height );
@@ -124,7 +122,7 @@ interface_base_finalize( BaseIPrefsInterface *klass )
 {
 	static const gchar *thisfn = "base_iprefs_interface_base_finalize";
 
-	if( !st_finalized ){
+	if( st_initialized && !st_finalized ){
 
 		g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
 
@@ -280,45 +278,6 @@ v_iprefs_get_window_id( const BaseWindow *window )
 	return( NULL );
 }
 
-#if 0
-/*
- * base_iprefs_read_int:
- * @window: this #BaseWindow-derived window.
- * @name: the entry to be readen.
- *
- * Returns: the named integer.
- */
-static gint
-read_int( const BaseWindow *window, const gchar *name )
-{
-	static const gchar *thisfn = "base_iprefs_read_int";
-	GError *error = NULL;
-	gchar *path;
-	gint value;
-
-	g_return_val_if_fail( BASE_IS_WINDOW( window ), 0 );
-	g_return_val_if_fail( BASE_IS_IPREFS( window ), 0 );
-
-	value = 0;
-
-	if( st_initialized && !st_finalized ){
-
-		path = gconf_concat_dir_and_key( IPREFS_GCONF_PREFS_PATH, name );
-
-		value = gconf_client_get_int( BASE_IPREFS_GET_INTERFACE( window )->private->client, path, &error );
-
-		if( error ){
-			g_warning( "%s: name=%s, %s", thisfn, name, error->message );
-			g_error_free( error );
-		}
-
-		g_free( path );
-	}
-
-	return( value );
-}
-#endif
-
 /*
  * returns a list of int
  */
@@ -345,41 +304,6 @@ read_int_list( const BaseWindow *window, const gchar *key )
 	return( list );
 }
 
-#if 0
-/**
- * base_iprefs_write_int:
- * @window: this #BaseWindow-derived window.
- * @name: the entry to be written.
- * @value: the integer to be set.
- *
- * Writes an integer in the GConf system.
- */
-static void
-write_int( const BaseWindow *window, const gchar *name, gint value )
-{
-	static const gchar *thisfn = "base_iprefs_write_int";
-	GError *error = NULL;
-	gchar *path;
-
-	g_return_if_fail( BASE_IS_WINDOW( window ));
-	g_return_if_fail( BASE_IS_IPREFS( window ));
-
-	if( st_initialized && !st_finalized ){
-
-		path = gconf_concat_dir_and_key( IPREFS_GCONF_PREFS_PATH, name );
-
-		gconf_client_set_int( BASE_IPREFS_GET_INTERFACE( window )->private->client, path, value, &error );
-
-		if( error ){
-			g_warning( "%s: name=%s, %s", thisfn, name, error->message );
-			g_error_free( error );
-		}
-
-		g_free( path );
-	}
-}
-#endif
-
 static void
 write_int_list( const BaseWindow *window, const gchar *key, GSList *list )
 {
diff --git a/src/nact/base-window-class.h b/src/nact/base-window-class.h
index d9cc2e9..c480923 100644
--- a/src/nact/base-window-class.h
+++ b/src/nact/base-window-class.h
@@ -82,7 +82,7 @@ G_BEGIN_DECLS
 #define BASE_IS_WINDOW_CLASS( klass )	( G_TYPE_CHECK_CLASS_TYPE(( klass ), BASE_WINDOW_TYPE ))
 #define BASE_WINDOW_GET_CLASS( object )	( G_TYPE_INSTANCE_GET_CLASS(( object ), BASE_WINDOW_TYPE, BaseWindowClass ))
 
-typedef struct BaseWindowPrivate BaseWindowPrivate;
+typedef struct BaseWindowPrivate      BaseWindowPrivate;
 
 typedef struct {
 	GObject            parent;
diff --git a/src/nact/nact-assistant-import-ask.c b/src/nact/nact-import-ask.c
similarity index 100%
rename from src/nact/nact-assistant-import-ask.c
rename to src/nact/nact-import-ask.c
diff --git a/src/nact/nact-assistant-import-ask.h b/src/nact/nact-import-ask.h
similarity index 100%
rename from src/nact/nact-assistant-import-ask.h
rename to src/nact/nact-import-ask.h