[nautilus-actions] src/nact/nact-main.c is renamed as main.c



commit a66de01d92243b67f199a433d80affceb93566d9
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Jan 20 23:09:16 2011 +0100

    src/nact/nact-main.c is renamed as main.c
    
    + src/nact/Makefile.am: updated accordingly.

 ChangeLog            |    4 ++++
 src/nact/Makefile.am |    2 +-
 src/nact/main.c      |   20 ++++++++++++++------
 3 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b68cbf1..9770e51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-01-20 Pierre Wieser <pwieser trychlos org>
 
+	* src/nact/nact-main.c: Renamed as main.c
+
+	* src/nact/Makefile.am: Updated accordingly.
+
 	* tools/Makefile.am: Generate the check-header.c source if it is missing.
 
 	* src/plugin-tracker/na-tracker-dbus.c:
diff --git a/src/nact/Makefile.am b/src/nact/Makefile.am
index 6cb8a4a..29d2789 100644
--- a/src/nact/Makefile.am
+++ b/src/nact/Makefile.am
@@ -71,6 +71,7 @@ nautilus_actions_config_tool_SOURCES = \
 	egg-sm-client-xsmp.c								\
 	egg-tree-multi-dnd.c								\
 	egg-tree-multi-dnd.h								\
+	main.c												\
 	nact-add-capability-dialog.c						\
 	nact-add-capability-dialog.h						\
 	nact-add-scheme-dialog.c							\
@@ -118,7 +119,6 @@ nautilus_actions_config_tool_SOURCES = \
 	nact-iproperties-tab.h								\
 	nact-ischemes-tab.c									\
 	nact-ischemes-tab.h									\
-	nact-main.c											\
 	nact-main-menubar.c									\
 	nact-main-menubar.h									\
 	nact-main-menubar-edit.c							\
diff --git a/src/nact/main.c b/src/nact/main.c
index 51d0637..4362197 100644
--- a/src/nact/main.c
+++ b/src/nact/main.c
@@ -36,6 +36,16 @@
 
 #include "nact-application.h"
 
+/*
+ * The 'configure' script may define a NA_MAINTAINER_MODE variable when
+ * the application is compiled for/in a development environment. When
+ * this variable is defined, debug messages are printed on stdout.
+ *
+ * The NAUTILUS_ACTIONS_DEBUG environment variable may be defined at
+ * execution time to display debug messages. Else, debug messages are only
+ * displayed when in maintainer mode.
+ */
+
 static void set_log_handler( void );
 static void log_handler( const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data );
 
@@ -44,7 +54,7 @@ static GLogFunc st_default_log_func = NULL;
 int
 main( int argc, char *argv[] )
 {
-	NactApplication *app;
+	NactApplication *appli;
 	int ret;
 
 	set_log_handler();
@@ -55,11 +65,9 @@ main( int argc, char *argv[] )
 	 */
 	na_gconf_migration_run();
 
-	app = nact_application_new_with_args( argc, argv );
-
-	ret = base_application_run( BASE_APPLICATION( app ));
-
-	g_object_unref( app );
+	appli = nact_application_new_with_args( argc, argv );
+	ret = base_application_run( BASE_APPLICATION( appli ));
+	g_object_unref( appli );
 
 	return( ret );
 }



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