GNOME.org
 

[nautilus-actions/file-manager-actions] NA_MAINTAINER_MODE m4 macro is renamed to FMA_MAINTAINER_MODE

commit 6c94f8f2c9ba448cd7a175f4d97ee9fce46e00f2
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Sep 9 18:44:37 2015 +0200

    NA_MAINTAINER_MODE m4 macro is renamed to FMA_MAINTAINER_MODE

 configure.ac                               |    4 ++--
 m4/{na-maintainer.m4 => fma-maintainer.m4} |   16 ++++++++--------
 src/core/fma-gtk-utils.c                   |    2 +-
 src/core/fma-gtk-utils.h                   |    2 +-
 src/core/fma-settings.c                    |    4 ++--
 src/plugin-menu/fma-menu-module.c          |    2 +-
 src/plugin-menu/fma-menu-plugin.c          |    2 +-
 src/plugin-tracker/fma-tracker-module.c    |    2 +-
 src/test/Makefile.am                       |    6 +++---
 src/ui/base-window.c                       |    4 ++--
 src/ui/base-window.h                       |    2 +-
 src/ui/fma-match-list.c                    |    2 +-
 src/ui/main.c                              |    4 ++--
 src/utils/console-utils.c                  |    2 +-
 14 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 91605c8..4d84e59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ AC_PROG_MAKE_SET
 
 # Gnome stuff
 GNOME_COMMON_INIT
-NA_MAINTAINER_CHECK_MODE
+FMA_MAINTAINER_CHECK_MODE
 
 # libtool
 AM_PROG_LIBTOOL
@@ -155,7 +155,7 @@ AC_CONFIG_FILES([
 ])
 
 # Enable deprecated functions ?
-NA_MAINTAINER_CHECK_FOR_DEPRECATED
+FMA_MAINTAINER_CHECK_FOR_DEPRECATED
 
 # check for gtk-doc
 # - starting with gtk-doc 1.16, is able to handle srcdir != builddir
diff --git a/m4/na-maintainer.m4 b/m4/fma-maintainer.m4
similarity index 82%
rename from m4/na-maintainer.m4
rename to m4/fma-maintainer.m4
index af47f8b..aa23578 100644
--- a/m4/na-maintainer.m4
+++ b/m4/fma-maintainer.m4
@@ -25,17 +25,17 @@
 #   Pierre Wieser <pwieser trychlos org>
 #   ... and many others (see AUTHORS)
 
-# serial 4 rename macro to NA_MAINTAINER_CHECK_MODE
-#                          NA_MAINTAINER_CHECK_FOR_DEPRECATED
+# serial 5 rename macro to FMA_MAINTAINER_CHECK_MODE
+#                          FMA_MAINTAINER_CHECK_FOR_DEPRECATED
 
-dnl define NA_MAINTAINER_CHECK_MODE
+dnl define FMA_MAINTAINER_CHECK_MODE
 dnl
 dnl Don''t agree with maintainer mode use
 dnl See http://www.gnu.org/software/automake/manual/automake.html#maintainer_002dmode
 dnl but gnome-autogen.sh forces its usage and gnome_common_init requires it
 dnl is nonetheless explicitely required by gnome_maintainer_mode_defines macro
 
-AC_DEFUN([NA_MAINTAINER_CHECK_MODE],[
+AC_DEFUN([FMA_MAINTAINER_CHECK_MODE],[
        AC_REQUIRE([GNOME_MAINTAINER_MODE_DEFINES])
 
        msg_maintainer_mode="disabled"
@@ -43,16 +43,16 @@ AC_DEFUN([NA_MAINTAINER_CHECK_MODE],[
        AC_MSG_RESULT([${USE_MAINTAINER_MODE}])
 
        if test "${USE_MAINTAINER_MODE}" = "yes"; then
-               AC_DEFINE([NA_MAINTAINER_MODE],[1],[Define to 1 if we are in maintainer mode])
+               AC_DEFINE([FMA_MAINTAINER_MODE],[1],[Define to 1 if we are in maintainer mode])
                AC_SUBST([AM_CPPFLAGS],["${AM_CPPFLAGS} ${DISABLE_DEPRECATED} -DGSEAL_ENABLED"])
                AC_SUBST([AM_CFLAGS],["${AM_CFLAGS} -Werror"])
                msg_maintainer_mode="enabled"
        fi
 
-       AM_CONDITIONAL([NA_MAINTAINER_MODE], [test "${USE_MAINTAINER_MODE}" = "yes"])
+       AM_CONDITIONAL([FMA_MAINTAINER_MODE], [test "${USE_MAINTAINER_MODE}" = "yes"])
 ])
 
-AC_DEFUN([NA_MAINTAINER_CHECK_FOR_DEPRECATED],[
+AC_DEFUN([FMA_MAINTAINER_CHECK_FOR_DEPRECATED],[
        AC_ARG_ENABLE(
                [deprecated],
                AC_HELP_STRING(
@@ -65,7 +65,7 @@ AC_DEFUN([NA_MAINTAINER_CHECK_FOR_DEPRECATED],[
        AC_MSG_RESULT([${enable_deprecated}])
 
        if test "${enable_deprecated}" = "yes"; then
-               AC_DEFINE([NA_ENABLE_DEPRECATED],[1],[Define to 1 if deprecated symbols should be enabled])
+               AC_DEFINE([FMA_ENABLE_DEPRECATED],[1],[Define to 1 if deprecated symbols should be enabled])
        else
                if test "${na_request_for_deprecated}" = "yes"; then
                        AC_MSG_WARN([API documentation will be incomplete as deprecated symbols are disabled])
diff --git a/src/core/fma-gtk-utils.c b/src/core/fma-gtk-utils.c
index 1a46583..0a473bb 100644
--- a/src/core/fma-gtk-utils.c
+++ b/src/core/fma-gtk-utils.c
@@ -76,7 +76,7 @@ fma_gtk_utils_find_widget_by_name( GtkContainer *container, const gchar *name )
        return( found );
 }
 
-#ifdef NA_MAINTAINER_MODE
+#ifdef FMA_MAINTAINER_MODE
 static void
 dump_children( const gchar *thisfn, GtkContainer *container, int level )
 {
diff --git a/src/core/fma-gtk-utils.h b/src/core/fma-gtk-utils.h
index 7b64cc4..a03dc99 100644
--- a/src/core/fma-gtk-utils.h
+++ b/src/core/fma-gtk-utils.h
@@ -49,7 +49,7 @@ void       fma_gtk_utils_connect_widget_by_name( GtkContainer *container,
                                                                                                        
GCallback cb,
                                                                                                        void 
*user_data );
 
-#ifdef NA_MAINTAINER_MODE
+#ifdef FMA_MAINTAINER_MODE
 void       fma_gtk_utils_dump_children          ( GtkContainer *container );
 #endif
 
diff --git a/src/core/fma-settings.c b/src/core/fma-settings.c
index 9123646..a6c4ee6 100644
--- a/src/core/fma-settings.c
+++ b/src/core/fma-settings.c
@@ -1176,7 +1176,7 @@ on_keyfile_changed_timeout( void )
        const KeyValue *changed;
        const Consumer *consumer;
        gchar *group_prefix, *key;
-#ifdef NA_MAINTAINER_MODE
+#ifdef FMA_MAINTAINER_MODE
        gchar *value;
 #endif
 
@@ -1187,7 +1187,7 @@ on_keyfile_changed_timeout( void )
        new_content = content_load_keys( new_content, st_settings->private->user );
        modifs = content_diff( st_settings->private->content, new_content );
 
-#ifdef NA_MAINTAINER_MODE
+#ifdef FMA_MAINTAINER_MODE
        g_debug( "%s: %d found update(s)", thisfn, g_list_length( modifs ));
        for( im = modifs ; im ; im = im->next ){
                changed = ( const KeyValue * ) im->data;
diff --git a/src/plugin-menu/fma-menu-module.c b/src/plugin-menu/fma-menu-module.c
index d218d99..5fadfb2 100644
--- a/src/plugin-menu/fma-menu-module.c
+++ b/src/plugin-menu/fma-menu-module.c
@@ -139,7 +139,7 @@ set_log_handler( void )
 {
        gboolean is_log_enabled;
 
-#ifdef NA_MAINTAINER_MODE
+#ifdef FMA_MAINTAINER_MODE
        is_log_enabled = TRUE;
 #else
        is_log_enabled =
diff --git a/src/plugin-menu/fma-menu-plugin.c b/src/plugin-menu/fma-menu-plugin.c
index 81996e4..2d055b6 100644
--- a/src/plugin-menu/fma-menu-plugin.c
+++ b/src/plugin-menu/fma-menu-plugin.c
@@ -402,7 +402,7 @@ menu_provider_get_file_items( FileManagerMenuProvider *provider, GtkWidget *wind
                                        ( void * ) window,
                                        ( void * ) files, g_list_length( files ));
 
-#ifdef NA_MAINTAINER_MODE
+#ifdef FMA_MAINTAINER_MODE
                        GList *im;
                        for( im = files ; im ; im = im->next ){
                                gchar *uri = file_manager_file_info_get_uri( FILE_MANAGER_FILE_INFO( im->data 
));
diff --git a/src/plugin-tracker/fma-tracker-module.c b/src/plugin-tracker/fma-tracker-module.c
index 2f377ee..ee7ffbb 100644
--- a/src/plugin-tracker/fma-tracker-module.c
+++ b/src/plugin-tracker/fma-tracker-module.c
@@ -144,7 +144,7 @@ log_handler( const gchar *log_domain, GLogLevelFlags log_level, const gchar *mes
                tmp = g_strdup_printf( "[%s] ", log_domain );
        }
 
-#ifdef NA_MAINTAINER_MODE
+#ifdef FMA_MAINTAINER_MODE
        /*( *st_default_log_func )( log_domain, log_level, message, user_data );*/
        syslog( LOG_USER | LOG_DEBUG, "%s%s", tmp, message );
 #else
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 36c4393..68ac2d6 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -28,7 +28,7 @@
 # Test programs are only relevant for the maintainer and his own tests
 # Do not build them in a release
 
-if NA_MAINTAINER_MODE
+if FMA_MAINTAINER_MODE
 
 noinst_PROGRAMS = \
        test-reader                                                                                     \
@@ -79,7 +79,7 @@ test_iface2_LDADD = \
        $(NAUTILUS_ACTIONS_LIBS)                                                        \
        $(NULL)
 
-if NA_MAINTAINER_MODE
+if FMA_MAINTAINER_MODE
 noinst_PROGRAMS += test-module
 pkglib_LTLIBRARIES = libtest_module_plugin.la
 
@@ -132,4 +132,4 @@ test_virtuals_without_test_LDADD = \
        $(NULL)
 
 endif
-#if NA_MAINTAINER_MODE
+#if FMA_MAINTAINER_MODE
diff --git a/src/ui/base-window.c b/src/ui/base-window.c
index 13d6527..a3f769f 100644
--- a/src/ui/base-window.c
+++ b/src/ui/base-window.c
@@ -784,7 +784,7 @@ on_initialize_gtk_toplevel_class_handler( BaseWindow *window, GtkWindow *topleve
                        BASE_WINDOW_GET_CLASS( window )->initialize_gtk_toplevel( window, toplevel );
                }
        }
-#ifdef NA_MAINTAINER_MODE
+#ifdef FMA_MAINTAINER_MODE
        base_window_dump_children( window );
 #endif
 }
@@ -948,7 +948,7 @@ base_window_run( BaseWindow *window )
        return( code );
 }
 
-#ifdef NA_MAINTAINER_MODE
+#ifdef FMA_MAINTAINER_MODE
 /*
  * base_window_dump_children:
  * @window: this #BaseWindow instance.
diff --git a/src/ui/base-window.h b/src/ui/base-window.h
index e3a2a76..abfdaf8 100644
--- a/src/ui/base-window.h
+++ b/src/ui/base-window.h
@@ -215,7 +215,7 @@ GType                 base_window_get_type                ( void );
 gboolean              base_window_init                    ( BaseWindow *window );
 int                   base_window_run                     ( BaseWindow *window );
 
-#ifdef NA_MAINTAINER_MODE
+#ifdef FMA_MAINTAINER_MODE
 void                  base_window_dump_children           ( const BaseWindow *window );
 #endif
 
diff --git a/src/ui/fma-match-list.c b/src/ui/fma-match-list.c
index 4d1c186..857c144 100644
--- a/src/ui/fma-match-list.c
+++ b/src/ui/fma-match-list.c
@@ -772,7 +772,7 @@ delete_row_at_path( GtkTreeView *treeview, GtkTreeModel *model, GtkTreePath *pat
 static void
 dump_current_rows( MatchListData *data )
 {
-#ifdef NA_MAINTAINER_MODE
+#ifdef FMA_MAINTAINER_MODE
        GtkTreeModel *model;
        GSList *filters;
 
diff --git a/src/ui/main.c b/src/ui/main.c
index 5ebc09f..8551836 100644
--- a/src/ui/main.c
+++ b/src/ui/main.c
@@ -36,7 +36,7 @@
 #include "fma-application.h"
 
 /*
- * The 'configure' script may define a NA_MAINTAINER_MODE variable when
+ * The 'configure' script may define a FMA_MAINTAINER_MODE variable when
  * the application is compiled for/in a development environment. When
  * this variable is defined, debug messages are printed on stdout.
  *
@@ -82,7 +82,7 @@ set_log_handler( void )
 static void
 log_handler( const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data )
 {
-#ifdef NA_MAINTAINER_MODE
+#ifdef FMA_MAINTAINER_MODE
        ( *st_default_log_func )( log_domain, log_level, message, user_data );
 #else
        if( g_getenv( NAUTILUS_ACTIONS_DEBUG )){
diff --git a/src/utils/console-utils.c b/src/utils/console-utils.c
index b65793c..1bff39e 100644
--- a/src/utils/console-utils.c
+++ b/src/utils/console-utils.c
@@ -69,7 +69,7 @@ console_init_log_handler( void )
 static void
 log_handler( const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data )
 {
-#ifdef NA_MAINTAINER_MODE
+#ifdef FMA_MAINTAINER_MODE
        ( *st_default_log_func )( log_domain, log_level, message, user_data );
 #else
        if( g_getenv( NAUTILUS_ACTIONS_DEBUG )){
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]