[nautilus-actions/file-manager-actions] Fix FMAApplication header
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions/file-manager-actions] Fix FMAApplication header
- Date: Tue, 8 Sep 2015 18:59:16 +0000 (UTC)
commit c58ba156293ae1a2054e4cf8bba6fe57deb4cc0e
Author: Pierre Wieser <pwieser trychlos org>
Date: Tue Sep 8 19:23:08 2015 +0200
Fix FMAApplication header
src/ui/base-assistant.c | 6 +++---
src/ui/base-dialog.c | 4 ++--
src/ui/base-window.c | 12 ++++++------
src/ui/fma-application.c | 6 +++---
src/ui/fma-application.h | 34 +++++++++++++++++-----------------
5 files changed, 31 insertions(+), 31 deletions(-)
---
diff --git a/src/ui/base-assistant.c b/src/ui/base-assistant.c
index 0d159fc..ea47cba 100644
--- a/src/ui/base-assistant.c
+++ b/src/ui/base-assistant.c
@@ -368,9 +368,9 @@ do_run( BaseWindow *window )
static const gchar *thisfn = "base_assistant_do_run";
int code;
- g_return_val_if_fail( BASE_IS_ASSISTANT( window ), NACT_EXIT_CODE_PROGRAM );
+ g_return_val_if_fail( BASE_IS_ASSISTANT( window ), FMA_EXIT_CODE_PROGRAM );
- code = NACT_EXIT_CODE_WINDOW;
+ code = FMA_EXIT_CODE_WINDOW;
if( !BASE_ASSISTANT( window )->private->dispose_has_run ){
@@ -380,7 +380,7 @@ do_run( BaseWindow *window )
gtk_main();
- code = NACT_EXIT_CODE_OK;
+ code = FMA_EXIT_CODE_OK;
}
return( code );
diff --git a/src/ui/base-dialog.c b/src/ui/base-dialog.c
index bd62174..ba3298b 100644
--- a/src/ui/base-dialog.c
+++ b/src/ui/base-dialog.c
@@ -188,9 +188,9 @@ do_run( BaseWindow *window )
int code;
GtkWindow *toplevel;
- g_return_val_if_fail( BASE_IS_DIALOG( window ), NACT_EXIT_CODE_PROGRAM );
+ g_return_val_if_fail( BASE_IS_DIALOG( window ), FMA_EXIT_CODE_PROGRAM );
- code = NACT_EXIT_CODE_WINDOW;
+ code = FMA_EXIT_CODE_WINDOW;
if( !BASE_DIALOG( window )->private->dispose_has_run ){
diff --git a/src/ui/base-window.c b/src/ui/base-window.c
index 51c15f1..d2dc811 100644
--- a/src/ui/base-window.c
+++ b/src/ui/base-window.c
@@ -915,15 +915,15 @@ do_show_widgets( BaseWindow *window )
* implement the run() virtual method.
*
* Returns: the exit code as set by the derived class, or:
- * - %NACT_EXIT_CODE_PROGRAM if the window has already been disposed,
- * - %NACT_EXIT_CODE_WINDOW if the window was not and cannot be
+ * - %FMA_EXIT_CODE_PROGRAM if the window has already been disposed,
+ * - %FMA_EXIT_CODE_WINDOW if the window was not and cannot be
* loaded and initialized.
*/
int
base_window_run( BaseWindow *window )
{
static const gchar *thisfn = "base_window_run";
- int code = NACT_EXIT_CODE_PROGRAM;
+ int code = FMA_EXIT_CODE_PROGRAM;
g_return_val_if_fail( BASE_IS_WINDOW( window ), code );
@@ -931,13 +931,13 @@ base_window_run( BaseWindow *window )
if( !base_window_init( window )){
g_debug( "%s: base_window_init() returns False", thisfn );
- code = NACT_EXIT_CODE_WINDOW;
+ code = FMA_EXIT_CODE_WINDOW;
} else {
- g_return_val_if_fail( GTK_IS_WINDOW( window->private->gtk_toplevel ),
NACT_EXIT_CODE_PROGRAM );
+ g_return_val_if_fail( GTK_IS_WINDOW( window->private->gtk_toplevel ),
FMA_EXIT_CODE_PROGRAM );
g_debug( "%s: window=%p (%s)", thisfn, ( void * ) window, G_OBJECT_TYPE_NAME( window
));
- code = NACT_EXIT_CODE_OK;
+ code = FMA_EXIT_CODE_OK;
if( BASE_WINDOW_GET_CLASS( window )->run ){
code = BASE_WINDOW_GET_CLASS( window )->run( window );
diff --git a/src/ui/fma-application.c b/src/ui/fma-application.c
index f6de1cc..bd1a2af 100644
--- a/src/ui/fma-application.c
+++ b/src/ui/fma-application.c
@@ -262,7 +262,7 @@ fma_application_run_with_args( FMAApplication *application, int argc, GStrv argv
( void * ) application, G_OBJECT_TYPE_NAME( application ),
argc );
- g_return_val_if_fail( application && FMA_IS_APPLICATION( application ), NACT_EXIT_CODE_PROGRAM );
+ g_return_val_if_fail( application && FMA_IS_APPLICATION( application ), FMA_EXIT_CODE_PROGRAM );
priv = application->private;
@@ -270,7 +270,7 @@ fma_application_run_with_args( FMAApplication *application, int argc, GStrv argv
priv->argc = argc;
priv->argv = g_strdupv( argv );
- priv->code = NACT_EXIT_CODE_OK;
+ priv->code = FMA_EXIT_CODE_OK;
init_i18n( application );
g_set_application_name( priv->application_name );
@@ -344,7 +344,7 @@ init_gtk_args( FMAApplication *application )
g_warning( "%s: %s", thisfn, error->message );
g_error_free( error );
ret = FALSE;
- priv->code = NACT_EXIT_CODE_ARGS;
+ priv->code = FMA_EXIT_CODE_ARGS;
}
g_free( parameter_string );
diff --git a/src/ui/fma-application.h b/src/ui/fma-application.h
index d6104d0..397ac85 100644
--- a/src/ui/fma-application.h
+++ b/src/ui/fma-application.h
@@ -64,48 +64,48 @@ typedef struct _FMAApplicationPrivate FMAApplicationPrivate;
typedef struct {
/*< private >*/
- GtkApplicationClass parent;
+ GtkApplicationClass parent;
}
FMAApplicationClass;
typedef struct {
/*< private >*/
- GtkApplication parent;
+ GtkApplication parent;
FMAApplicationPrivate *private;
}
FMAApplication;
/**
- * NactExitCode:
+ * FMAExitCode:
*
* The code returned by the application.
*
- * @NACT_EXIT_CODE_PROGRAM = -1: this is a program error code.
- * @NACT_EXIT_CODE_OK = 0: the program has successfully run, and returns zero.
- * @NACT_EXIT_CODE_ARGS = 1: unable to interpret command-line options
- * @NACT_EXIT_CODE_WINDOW = 2: unable to create a window
+ * @FMA_EXIT_CODE_PROGRAM = -1: this is a program error code.
+ * @FMA_EXIT_CODE_OK = 0: the program has successfully run, and returns zero.
+ * @FMA_EXIT_CODE_ARGS = 1: unable to interpret command-line options
+ * @FMA_EXIT_CODE_WINDOW = 2: unable to create a window
*/
typedef enum {
- NACT_EXIT_CODE_PROGRAM = -1,
- NACT_EXIT_CODE_OK = 0,
- NACT_EXIT_CODE_ARGS,
- NACT_EXIT_CODE_WINDOW,
+ FMA_EXIT_CODE_PROGRAM = -1,
+ FMA_EXIT_CODE_OK = 0,
+ FMA_EXIT_CODE_ARGS,
+ FMA_EXIT_CODE_WINDOW,
}
- NactExitCode;
+ FMAExitCode;
-GType fma_application_get_type ( void );
+GType fma_application_get_type ( void );
FMAApplication *fma_application_new ( void );
-int fma_application_run_with_args ( FMAApplication *application,
+int fma_application_run_with_args ( FMAApplication *application,
int argc,
GStrv argv );
-gchar *fma_application_get_application_name( const FMAApplication *application );
+gchar *fma_application_get_application_name( const FMAApplication *application );
-FMAUpdater *fma_application_get_updater ( const FMAApplication *application );
+FMAUpdater *fma_application_get_updater ( const FMAApplication *application );
-gboolean fma_application_is_willing_to_quit ( const FMAApplication *application );
+gboolean fma_application_is_willing_to_quit ( const FMAApplication *application );
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]