GNOME.org
 

[nautilus-actions/file-manager-actions] Menu plugin is renamed to fma-menu-module

commit 1b8592746c1a660aff8c8e983aff65f45afba573
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Sep 8 18:14:28 2015 +0200

    Menu plugin is renamed to fma-menu-module

 src/plugin-menu/Makefile.am                        |   14 +-
 src/plugin-menu/README                             |    4 +-
 .../{nautilus-module.c => fma-menu-module.c}       |   20 ++--
 .../{nautilus-actions.c => fma-menu-plugin.c}      |  148 ++++++++++----------
 .../{nautilus-actions.h => fma-menu-plugin.h}      |   44 +++---
 5 files changed, 115 insertions(+), 115 deletions(-)
---
diff --git a/src/plugin-menu/Makefile.am b/src/plugin-menu/Makefile.am
index 80afc58..f6d7122 100644
--- a/src/plugin-menu/Makefile.am
+++ b/src/plugin-menu/Makefile.am
@@ -34,20 +34,20 @@ AM_CPPFLAGS += \
 
 nautilus_extensiondir = $(NAUTILUS_EXTENSIONS_DIR)
 
-nautilus_extension_LTLIBRARIES = libnautilus-actions-menu.la
+nautilus_extension_LTLIBRARIES = libfma-menu.la
 
-libnautilus_actions_menu_la_SOURCES = \
-       nautilus-module.c                                                                                     
  \
-       nautilus-actions.c                                                                                    
  \
-       nautilus-actions.h                                                                                    
  \
+libfma_menu_la_SOURCES = \
+       fma-menu-module.c                                                                                     
  \
+       fma-menu-plugin.c                                                                                     
  \
+       fma-menu-plugin.h                                                                                     
  \
        $(NULL)
 
-libnautilus_actions_menu_la_LIBADD = \
+libfma_menu_la_LIBADD = \
        $(top_builddir)/src/core/libfma-core.la                                         \
        $(NAUTILUS_ACTIONS_LIBS)                                                                        \
        $(NULL)
 
-libnautilus_actions_menu_la_LDFLAGS = \
+libfma_menu_la_LDFLAGS = \
        -module                                                                                               
          \
        -no-undefined                                                                                         
  \
        -avoid-version                                                                                        
  \
diff --git a/src/plugin-menu/README b/src/plugin-menu/README
index 0147e4e..777ccb8 100644
--- a/src/plugin-menu/README
+++ b/src/plugin-menu/README
@@ -2,10 +2,10 @@ src/plugin-menu
 ---------------
 This is the FileManager-Actions plugin.
 
-The plugin is dynamically loaded by the Nautilus file manager.
+The plugin is intended to be dynamically loaded by the file manager.
 
 Please put only here code relevant to the plugin, and to itself only.
 I.e., code shared by the plugin with some other part of the package
-should go to runtime convenience library.
+should go to core/ runtime convenience library.
 
 P. Wieser, last updated on sept. 2015
diff --git a/src/plugin-menu/nautilus-module.c b/src/plugin-menu/fma-menu-module.c
similarity index 89%
rename from src/plugin-menu/nautilus-module.c
rename to src/plugin-menu/fma-menu-module.c
index 6209301..89db6af 100644
--- a/src/plugin-menu/nautilus-module.c
+++ b/src/plugin-menu/fma-menu-module.c
@@ -40,7 +40,7 @@
 #include <core/fma-gconf-migration.h>
 #include <core/fma-settings.h>
 
-#include "nautilus-actions.h"
+#include "fma-menu-plugin.h"
 
 static void set_log_handler( void );
 static void log_handler( const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer 
user_data );
@@ -50,9 +50,9 @@ static GLogFunc st_default_log_func = NULL;
 /*
  * A nautilus extension must implement three functions :
  *
- * - nautilus_module_initialize
- * - nautilus_module_list_types
- * - nautilus_module_shutdown
+ * - fma_menu_module_initialize
+ * - fma_menu_module_list_types
+ * - fma_menu_module_shutdown
  *
  * The first two functions are called at nautilus startup.
  *
@@ -62,9 +62,9 @@ static GLogFunc st_default_log_func = NULL;
 void
 nautilus_module_initialize( GTypeModule *module )
 {
-       static const gchar *thisfn = "nautilus_module_initialize";
+       static const gchar *thisfn = "fma_menu_module_nautilus_module_initialize";
 
-       syslog( LOG_USER | LOG_INFO, "[N-A] %s Menu Extender %s initializing...", PACKAGE_NAME, 
PACKAGE_VERSION );
+       syslog( LOG_USER | LOG_INFO, "[FMA] %s Menu Extender %s initializing...", PACKAGE_NAME, 
PACKAGE_VERSION );
 
        set_log_handler();
 
@@ -78,18 +78,18 @@ nautilus_module_initialize( GTypeModule *module )
         */
        fma_gconf_migration_run();
 
-       nautilus_actions_register_type( module );
+       fma_menu_plugin_register_type( module );
 }
 
 void
 nautilus_module_list_types( const GType **types, int *num_types )
 {
-       static const gchar *thisfn = "nautilus_module_list_types";
+       static const gchar *thisfn = "fma_menu_module_nautilus_module_list_types";
        static GType type_list[1];
 
        g_debug( "%s: types=%p, num_types=%p", thisfn, ( void * ) types, ( void * ) num_types );
 
-       type_list[0] = NAUTILUS_ACTIONS_TYPE;
+       type_list[0] = FMA_MENU_PLUGIN_TYPE;
        *types = type_list;
        *num_types = 1;
 
@@ -100,7 +100,7 @@ nautilus_module_list_types( const GType **types, int *num_types )
 void
 nautilus_module_shutdown( void )
 {
-       static const gchar *thisfn = "nautilus_module_shutdown";
+       static const gchar *thisfn = "fma_menu_module_nautilus_module_shutdown";
 
        g_debug( "%s", thisfn );
 
diff --git a/src/plugin-menu/nautilus-actions.c b/src/plugin-menu/fma-menu-plugin.c
similarity index 87%
rename from src/plugin-menu/nautilus-actions.c
rename to src/plugin-menu/fma-menu-plugin.c
index d6670a3..308a8cb 100644
--- a/src/plugin-menu/nautilus-actions.c
+++ b/src/plugin-menu/fma-menu-plugin.c
@@ -48,17 +48,17 @@
 #include <core/fma-selected-info.h>
 #include <core/fma-tokens.h>
 
-#include "nautilus-actions.h"
+#include "fma-menu-plugin.h"
 
 /* private class data
  */
-struct _NautilusActionsClassPrivate {
+struct _FMAMenuPluginClassPrivate {
        void *empty;                                            /* so that gcc -pedantic is happy */
 };
 
 /* private instance data
  */
-struct _NautilusActionsPrivate {
+struct _FMAMenuPluginPrivate {
        gboolean  dispose_has_run;
        FMAPivot  *pivot;
        gulong    items_changed_handler;
@@ -70,7 +70,7 @@ static GObjectClass *st_parent_class  = NULL;
 static GType         st_actions_type  = 0;
 static gint          st_burst_timeout = 100;           /* burst timeout in msec */
 
-static void              class_init( NautilusActionsClass *klass );
+static void              class_init( FMAMenuPluginClass *klass );
 static void              instance_init( GTypeInstance *instance, gpointer klass );
 static void              instance_constructed( GObject *object );
 static void              instance_dispose( GObject *object );
@@ -84,11 +84,11 @@ static GList            *menu_provider_get_file_items( NautilusMenuProvider *pro
 static GList            *menu_provider_get_toolbar_items( NautilusMenuProvider *provider, GtkWidget *window, 
NautilusFileInfo *current_folder );
 #endif
 
-static GList            *build_nautilus_menu( NautilusActions *plugin, guint target, GList *selection );
+static GList            *build_nautilus_menu( FMAMenuPlugin *plugin, guint target, GList *selection );
 static GList            *build_nautilus_menu_rec( GList *tree, guint target, GList *selection, FMATokens 
*tokens );
-static FMAObjectItem     *expand_tokens_item( const FMAObjectItem *item, FMATokens *tokens );
+static FMAObjectItem    *expand_tokens_item( const FMAObjectItem *item, FMATokens *tokens );
 static void              expand_tokens_context( FMAIContext *context, FMATokens *tokens );
-static FMAObjectProfile  *get_candidate_profile( FMAObjectAction *action, guint target, GList *files );
+static FMAObjectProfile *get_candidate_profile( FMAObjectAction *action, guint target, GList *files );
 static NautilusMenuItem *create_item_from_profile( FMAObjectProfile *profile, guint target, GList *files, 
FMATokens *tokens );
 static NautilusMenuItem *create_item_from_menu( FMAObjectMenu *menu, GList *subitems, guint target );
 static NautilusMenuItem *create_menu_item( const FMAObjectItem *item, guint target );
@@ -98,34 +98,34 @@ static void              weak_notify_profile( FMAObjectProfile *profile, Nautilu
 
 static void              execute_action( NautilusMenuItem *item, FMAObjectProfile *profile );
 
-static GList            *create_root_menu( NautilusActions *plugin, GList *nautilus_menu );
-static GList            *add_about_item( NautilusActions *plugin, GList *nautilus_menu );
-static void              execute_about( NautilusMenuItem *item, NautilusActions *plugin );
+static GList            *create_root_menu( FMAMenuPlugin *plugin, GList *nautilus_menu );
+static GList            *add_about_item( FMAMenuPlugin *plugin, GList *nautilus_menu );
+static void              execute_about( NautilusMenuItem *item, FMAMenuPlugin *plugin );
 
-static void              on_pivot_items_changed_handler( FMAPivot *pivot, NautilusActions *plugin );
-static void              on_settings_key_changed_handler( const gchar *group, const gchar *key, 
gconstpointer new_value, gboolean mandatory, NautilusActions *plugin );
-static void              on_change_event_timeout( NautilusActions *plugin );
+static void              on_pivot_items_changed_handler( FMAPivot *pivot, FMAMenuPlugin *plugin );
+static void              on_settings_key_changed_handler( const gchar *group, const gchar *key, 
gconstpointer new_value, gboolean mandatory, FMAMenuPlugin *plugin );
+static void              on_change_event_timeout( FMAMenuPlugin *plugin );
 
 GType
-nautilus_actions_get_type( void )
+fma_menu_plugin_get_type( void )
 {
        g_assert( st_actions_type );
        return( st_actions_type );
 }
 
 void
-nautilus_actions_register_type( GTypeModule *module )
+fma_menu_plugin_register_type( GTypeModule *module )
 {
-       static const gchar *thisfn = "nautilus_actions_register_type";
+       static const gchar *thisfn = "fma_menu_plugin_register_type";
 
        static const GTypeInfo info = {
-               sizeof( NautilusActionsClass ),
+               sizeof( FMAMenuPluginClass ),
                ( GBaseInitFunc ) NULL,
                ( GBaseFinalizeFunc ) NULL,
                ( GClassInitFunc ) class_init,
                NULL,
                NULL,
-               sizeof( NautilusActions ),
+               sizeof( FMAMenuPlugin ),
                0,
                ( GInstanceInitFunc ) instance_init,
        };
@@ -140,15 +140,15 @@ nautilus_actions_register_type( GTypeModule *module )
 
        g_debug( "%s: module=%p", thisfn, ( void * ) module );
 
-       st_actions_type = g_type_module_register_type( module, G_TYPE_OBJECT, "NautilusActions", &info, 0 );
+       st_actions_type = g_type_module_register_type( module, G_TYPE_OBJECT, "FMAMenuPlugin", &info, 0 );
 
        g_type_module_add_interface( module, st_actions_type, NAUTILUS_TYPE_MENU_PROVIDER, 
&menu_provider_iface_info );
 }
 
 static void
-class_init( NautilusActionsClass *klass )
+class_init( FMAMenuPluginClass *klass )
 {
-       static const gchar *thisfn = "nautilus_actions_class_init";
+       static const gchar *thisfn = "fma_menu_plugin_class_init";
        GObjectClass *gobject_class;
 
        g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
@@ -160,23 +160,23 @@ class_init( NautilusActionsClass *klass )
        gobject_class->dispose = instance_dispose;
        gobject_class->finalize = instance_finalize;
 
-       klass->private = g_new0( NautilusActionsClassPrivate, 1 );
+       klass->private = g_new0( FMAMenuPluginClassPrivate, 1 );
 }
 
 static void
 instance_init( GTypeInstance *instance, gpointer klass )
 {
-       static const gchar *thisfn = "nautilus_actions_instance_init";
-       NautilusActions *self;
+       static const gchar *thisfn = "fma_menu_plugin_instance_init";
+       FMAMenuPlugin *self;
 
-       g_return_if_fail( NAUTILUS_IS_ACTIONS( instance ));
+       g_return_if_fail( FMA_IS_MENU_PLUGIN( instance ));
 
        g_debug( "%s: instance=%p (%s), klass=%p",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
 
-       self = NAUTILUS_ACTIONS( instance );
+       self = FMA_MENU_PLUGIN( instance );
 
-       self->private = g_new0( NautilusActionsPrivate, 1 );
+       self->private = g_new0( FMAMenuPluginPrivate, 1 );
 
        self->private->dispose_has_run = FALSE;
        self->private->change_timeout.timeout = st_burst_timeout;
@@ -199,12 +199,12 @@ instance_init( GTypeInstance *instance, gpointer klass )
 static void
 instance_constructed( GObject *object )
 {
-       static const gchar *thisfn = "nautilus_actions_instance_constructed";
-       NautilusActionsPrivate *priv;
+       static const gchar *thisfn = "fma_menu_plugin_instance_constructed";
+       FMAMenuPluginPrivate *priv;
 
-       g_return_if_fail( NAUTILUS_IS_ACTIONS( object ));
+       g_return_if_fail( FMA_IS_MENU_PLUGIN( object ));
 
-       priv = NAUTILUS_ACTIONS( object )->private;
+       priv = FMA_MENU_PLUGIN( object )->private;
 
        if( !priv->dispose_has_run ){
 
@@ -265,12 +265,12 @@ instance_constructed( GObject *object )
 static void
 instance_dispose( GObject *object )
 {
-       static const gchar *thisfn = "nautilus_actions_instance_dispose";
-       NautilusActions *self;
+       static const gchar *thisfn = "fma_menu_plugin_instance_dispose";
+       FMAMenuPlugin *self;
 
        g_debug( "%s: object=%p", thisfn, ( void * ) object );
-       g_return_if_fail( NAUTILUS_IS_ACTIONS( object ));
-       self = NAUTILUS_ACTIONS( object );
+       g_return_if_fail( FMA_IS_MENU_PLUGIN( object ));
+       self = FMA_MENU_PLUGIN( object );
 
        if( !self->private->dispose_has_run ){
 
@@ -291,12 +291,12 @@ instance_dispose( GObject *object )
 static void
 instance_finalize( GObject *object )
 {
-       static const gchar *thisfn = "nautilus_actions_instance_finalize";
-       NautilusActions *self;
+       static const gchar *thisfn = "fma_menu_plugin_instance_finalize";
+       FMAMenuPlugin *self;
 
        g_debug( "%s: object=%p", thisfn, ( void * ) object );
-       g_return_if_fail( NAUTILUS_IS_ACTIONS( object ));
-       self = NAUTILUS_ACTIONS( object );
+       g_return_if_fail( FMA_IS_MENU_PLUGIN( object ));
+       self = FMA_MENU_PLUGIN( object );
 
        g_free( self->private );
 
@@ -309,7 +309,7 @@ instance_finalize( GObject *object )
 static void
 menu_provider_iface_init( NautilusMenuProviderIface *iface )
 {
-       static const gchar *thisfn = "nautilus_actions_menu_provider_iface_init";
+       static const gchar *thisfn = "fma_menu_plugin_menu_provider_iface_init";
 
        g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
 
@@ -341,14 +341,14 @@ menu_provider_iface_init( NautilusMenuProviderIface *iface )
 static GList *
 menu_provider_get_background_items( NautilusMenuProvider *provider, GtkWidget *window, NautilusFileInfo 
*current_folder )
 {
-       static const gchar *thisfn = "nautilus_actions_menu_provider_get_background_items";
+       static const gchar *thisfn = "fma_menu_plugin_menu_provider_get_background_items";
        GList *nautilus_menus_list = NULL;
        gchar *uri;
        GList *selected;
 
-       g_return_val_if_fail( NAUTILUS_IS_ACTIONS( provider ), NULL );
+       g_return_val_if_fail( FMA_IS_MENU_PLUGIN( provider ), NULL );
 
-       if( !NAUTILUS_ACTIONS( provider )->private->dispose_has_run ){
+       if( !FMA_MENU_PLUGIN( provider )->private->dispose_has_run ){
 
                selected = fma_selected_info_get_list_from_item( current_folder );
 
@@ -362,7 +362,7 @@ menu_provider_get_background_items( NautilusMenuProvider *provider, GtkWidget *w
                        g_free( uri );
 
                        nautilus_menus_list = build_nautilus_menu(
-                                       NAUTILUS_ACTIONS( provider ),
+                                       FMA_MENU_PLUGIN( provider ),
                                        ITEM_TARGET_LOCATION,
                                        selected );
 
@@ -382,13 +382,13 @@ menu_provider_get_background_items( NautilusMenuProvider *provider, GtkWidget *w
 static GList *
 menu_provider_get_file_items( NautilusMenuProvider *provider, GtkWidget *window, GList *files )
 {
-       static const gchar *thisfn = "nautilus_actions_menu_provider_get_file_items";
+       static const gchar *thisfn = "fma_menu_plugin_menu_provider_get_file_items";
        GList *nautilus_menus_list = NULL;
        GList *selected;
 
-       g_return_val_if_fail( NAUTILUS_IS_ACTIONS( provider ), NULL );
+       g_return_val_if_fail( FMA_IS_MENU_PLUGIN( provider ), NULL );
 
-       if( !NAUTILUS_ACTIONS( provider )->private->dispose_has_run ){
+       if( !FMA_MENU_PLUGIN( provider )->private->dispose_has_run ){
 
                /* no need to go further if there is no files in the list */
                if( !g_list_length( files )){
@@ -416,7 +416,7 @@ menu_provider_get_file_items( NautilusMenuProvider *provider, GtkWidget *window,
 #endif
 
                        nautilus_menus_list = build_nautilus_menu(
-                                       NAUTILUS_ACTIONS( provider ),
+                                       FMA_MENU_PLUGIN( provider ),
                                        ITEM_TARGET_SELECTION,
                                        selected );
 
@@ -438,14 +438,14 @@ menu_provider_get_file_items( NautilusMenuProvider *provider, GtkWidget *window,
 static GList *
 menu_provider_get_toolbar_items( NautilusMenuProvider *provider, GtkWidget *window, NautilusFileInfo 
*current_folder )
 {
-       static const gchar *thisfn = "nautilus_actions_menu_provider_get_toolbar_items";
+       static const gchar *thisfn = "fma_menu_plugin_menu_provider_get_toolbar_items";
        GList *nautilus_menus_list = NULL;
        gchar *uri;
        GList *selected;
 
-       g_return_val_if_fail( NAUTILUS_IS_ACTIONS( provider ), NULL );
+       g_return_val_if_fail( FMA_IS_MENU_PLUGIN( provider ), NULL );
 
-       if( !NAUTILUS_ACTIONS( provider )->private->dispose_has_run ){
+       if( !FMA_MENU_PLUGIN( provider )->private->dispose_has_run ){
 
                selected = fma_selected_info_get_list_from_item( current_folder );
 
@@ -459,7 +459,7 @@ menu_provider_get_toolbar_items( NautilusMenuProvider *provider, GtkWidget *wind
                        g_free( uri );
 
                        nautilus_menus_list = build_nautilus_menu(
-                                       NAUTILUS_ACTIONS( provider ),
+                                       FMA_MENU_PLUGIN( provider ),
                                        ITEM_TARGET_TOOLBAR,
                                        selected );
 
@@ -486,9 +486,9 @@ menu_provider_get_toolbar_items( NautilusMenuProvider *provider, GtkWidget *wind
  * Returns: the Nautilus menu
  */
 static GList *
-build_nautilus_menu( NautilusActions *plugin, guint target, GList *selection )
+build_nautilus_menu( FMAMenuPlugin *plugin, guint target, GList *selection )
 {
-       static const gchar *thisfn = "nautilus_actions_build_nautilus_menu";
+       static const gchar *thisfn = "fma_menu_plugin_build_nautilus_menu";
        GList *nautilus_menu;
        FMATokens *tokens;
        GList *tree;
@@ -529,7 +529,7 @@ build_nautilus_menu( NautilusActions *plugin, guint target, GList *selection )
 static GList *
 build_nautilus_menu_rec( GList *tree, guint target, GList *selection, FMATokens *tokens )
 {
-       static const gchar *thisfn = "nautilus_actions_build_nautilus_menu_rec";
+       static const gchar *thisfn = "fma_menu_plugin_build_nautilus_menu_rec";
        GList *nautilus_menu;
        GList *it;
        GList *subitems;
@@ -749,7 +749,7 @@ expand_tokens_context( FMAIContext *context, FMATokens *tokens )
 static FMAObjectProfile *
 get_candidate_profile( FMAObjectAction *action, guint target, GList *files )
 {
-       static const gchar *thisfn = "nautilus_actions_get_candidate_profile";
+       static const gchar *thisfn = "fma_menu_plugin_get_candidate_profile";
        FMAObjectProfile *candidate = NULL;
        gchar *action_label;
        gchar *profile_label;
@@ -811,7 +811,7 @@ create_item_from_profile( FMAObjectProfile *profile, guint target, GList *files,
 static void
 weak_notify_profile( FMAObjectProfile *profile, NautilusMenuItem *item )
 {
-       g_debug( "nautilus_actions_weak_notify_profile: profile=%p (ref_count=%d)",
+       g_debug( "fma_menu_plugin_weak_notify_profile: profile=%p (ref_count=%d)",
                        ( void * ) profile, G_OBJECT( profile )->ref_count );
 
        g_object_unref( profile );
@@ -825,7 +825,7 @@ weak_notify_profile( FMAObjectProfile *profile, NautilusMenuItem *item )
 static NautilusMenuItem *
 create_item_from_menu( FMAObjectMenu *menu, GList *subitems, guint target )
 {
-       /*static const gchar *thisfn = "nautilus_actions_create_item_from_menu";*/
+       /*static const gchar *thisfn = "fma_menu_plugin_create_item_from_menu";*/
        NautilusMenuItem *item;
 
        item = create_menu_item( FMA_OBJECT_ITEM( menu ), target );
@@ -875,7 +875,7 @@ create_menu_item( const FMAObjectItem *item, guint target )
 static void
 weak_notify_menu_item( void *user_data /* =NULL */, NautilusMenuItem *item )
 {
-       g_debug( "nautilus_actions_weak_notify_menu_item: item=%p", ( void * ) item );
+       g_debug( "fma_menu_plugin_weak_notify_menu_item: item=%p", ( void * ) item );
 }
 
 static void
@@ -903,7 +903,7 @@ attach_submenu_to_item( NautilusMenuItem *item, GList *subitems )
 static void
 execute_action( NautilusMenuItem *item, FMAObjectProfile *profile )
 {
-       static const gchar *thisfn = "nautilus_actions_execute_action";
+       static const gchar *thisfn = "fma_menu_plugin_execute_action";
        FMATokens *tokens;
 
        g_debug( "%s: item=%p, profile=%p", thisfn, ( void * ) item, ( void * ) profile );
@@ -916,9 +916,9 @@ execute_action( NautilusMenuItem *item, FMAObjectProfile *profile )
  * create a root submenu
  */
 static GList *
-create_root_menu( NautilusActions *plugin, GList *menu )
+create_root_menu( FMAMenuPlugin *plugin, GList *menu )
 {
-       static const gchar *thisfn = "nautilus_actions_create_root_menu";
+       static const gchar *thisfn = "fma_menu_plugin_create_root_menu";
        GList *nautilus_menu;
        NautilusMenuItem *root_item;
 
@@ -930,7 +930,7 @@ create_root_menu( NautilusActions *plugin, GList *menu )
        }
 
        root_item = nautilus_menu_item_new(
-                       "NautilusActionsExtensions",
+                       "FMAMenuPluginExtensions",
                        /* i18n: label of an automagic root submenu */
                        _( "FileManager-Actions actions" ),
                        /* i18n: tooltip of an automagic root submenu */
@@ -947,9 +947,9 @@ create_root_menu( NautilusActions *plugin, GList *menu )
  * then add the about item to the end of the first level of this menu
  */
 static GList *
-add_about_item( NautilusActions *plugin, GList *menu )
+add_about_item( FMAMenuPlugin *plugin, GList *menu )
 {
-       static const gchar *thisfn = "nautilus_actions_add_about_item";
+       static const gchar *thisfn = "fma_menu_plugin_add_about_item";
        GList *nautilus_menu;
        gboolean have_root_menu;
        NautilusMenuItem *root_item;
@@ -977,7 +977,7 @@ add_about_item( NautilusActions *plugin, GList *menu )
 
        if( have_root_menu ){
                about_item = nautilus_menu_item_new(
-                               "AboutNautilusActions",
+                               "AboutFMAMenuPlugin",
                                _( "About FileManager-Actions" ),
                                _( "Display some information about FileManager-Actions" ),
                                fma_about_get_icon_name());
@@ -997,9 +997,9 @@ add_about_item( NautilusActions *plugin, GList *menu )
 }
 
 static void
-execute_about( NautilusMenuItem *item, NautilusActions *plugin )
+execute_about( NautilusMenuItem *item, FMAMenuPlugin *plugin )
 {
-       g_return_if_fail( NAUTILUS_IS_ACTIONS( plugin ));
+       g_return_if_fail( FMA_IS_MENU_PLUGIN( plugin ));
 
        fma_about_display( NULL );
 }
@@ -1019,10 +1019,10 @@ execute_about( NautilusMenuItem *item, NautilusActions *plugin )
  * from i/o providers
  */
 static void
-on_pivot_items_changed_handler( FMAPivot *pivot, NautilusActions *plugin )
+on_pivot_items_changed_handler( FMAPivot *pivot, FMAMenuPlugin *plugin )
 {
        g_return_if_fail( FMA_IS_PIVOT( pivot ));
-       g_return_if_fail( NAUTILUS_IS_ACTIONS( plugin ));
+       g_return_if_fail( FMA_IS_MENU_PLUGIN( plugin ));
 
        if( !plugin->private->dispose_has_run ){
 
@@ -1035,9 +1035,9 @@ on_pivot_items_changed_handler( FMAPivot *pivot, NautilusActions *plugin )
  * its context menus
  */
 static void
-on_settings_key_changed_handler( const gchar *group, const gchar *key, gconstpointer new_value, gboolean 
mandatory, NautilusActions *plugin )
+on_settings_key_changed_handler( const gchar *group, const gchar *key, gconstpointer new_value, gboolean 
mandatory, FMAMenuPlugin *plugin )
 {
-       g_return_if_fail( NAUTILUS_IS_ACTIONS( plugin ));
+       g_return_if_fail( FMA_IS_MENU_PLUGIN( plugin ));
 
        if( !plugin->private->dispose_has_run ){
 
@@ -1049,9 +1049,9 @@ on_settings_key_changed_handler( const gchar *group, const gchar *key, gconstpoi
  * automatically reloads the items, then signal the file manager.
  */
 static void
-on_change_event_timeout( NautilusActions *plugin )
+on_change_event_timeout( FMAMenuPlugin *plugin )
 {
-       static const gchar *thisfn = "nautilus_actions_on_change_event_timeout";
+       static const gchar *thisfn = "fma_menu_plugin_on_change_event_timeout";
        g_debug( "%s: timeout expired", thisfn );
 
        fma_pivot_load_items( plugin->private->pivot );
diff --git a/src/plugin-menu/nautilus-actions.h b/src/plugin-menu/fma-menu-plugin.h
similarity index 50%
rename from src/plugin-menu/nautilus-actions.h
rename to src/plugin-menu/fma-menu-plugin.h
index a53ac89..d039a31 100644
--- a/src/plugin-menu/nautilus-actions.h
+++ b/src/plugin-menu/fma-menu-plugin.h
@@ -27,14 +27,14 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __PLUGIN_MENU_NAUTILUS_ACTIONS_H__
-#define __PLUGIN_MENU_NAUTILUS_ACTIONS_H__
+#ifndef __PLUGIN_MENU_FMA_MENU_PLUGIN_H__
+#define __PLUGIN_MENU_FMA_MENU_PLUGIN_H__
 
 /**
  * SECTION: filemanager-actions
- * @title: NautilusActions
- * @short_description: The NautilusActions plugin class definition
- * @include: plugin-menu/filemanager-actions.h
+ * @title: FMAMenuPlugin
+ * @short_description: The FMAMenuPlugin plugin class definition
+ * @include: plugin-menu/fma-menu-plugin.h
  *
  * This is the class which handles the file manager menu plugin.
  */
@@ -43,34 +43,34 @@
 
 G_BEGIN_DECLS
 
-#define NAUTILUS_ACTIONS_TYPE                ( nautilus_actions_get_type())
-#define NAUTILUS_ACTIONS( object )           ( G_TYPE_CHECK_INSTANCE_CAST(( object ), NAUTILUS_ACTIONS_TYPE, 
NautilusActions ))
-#define NAUTILUS_ACTIONS_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST(( klass ), NAUTILUS_ACTIONS_TYPE, 
NautilusActionsClass ))
-#define NAUTILUS_IS_ACTIONS( object )        ( G_TYPE_CHECK_INSTANCE_TYPE(( object ), NAUTILUS_ACTIONS_TYPE 
))
-#define NAUTILUS_IS_ACTIONS_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NAUTILUS_ACTIONS_TYPE ))
-#define NAUTILUS_ACTIONS_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NAUTILUS_ACTIONS_TYPE, 
NautilusActionsClass ))
+#define FMA_MENU_PLUGIN_TYPE                ( fma_menu_plugin_get_type())
+#define FMA_MENU_PLUGIN( object )           ( G_TYPE_CHECK_INSTANCE_CAST(( object ), FMA_MENU_PLUGIN_TYPE, 
FMAMenuPlugin ))
+#define FMA_MENU_PLUGIN_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST(( klass ), FMA_MENU_PLUGIN_TYPE, 
FMAMenuPluginClass ))
+#define FMA_IS_MENU_PLUGIN( object )        ( G_TYPE_CHECK_INSTANCE_TYPE(( object ), FMA_MENU_PLUGIN_TYPE ))
+#define FMA_IS_MENU_PLUGIN_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), FMA_MENU_PLUGIN_TYPE ))
+#define FMA_MENU_PLUGIN_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), FMA_MENU_PLUGIN_TYPE, 
FMAMenuPluginClass ))
 
-typedef struct _NautilusActionsPrivate       NautilusActionsPrivate;
+typedef struct _FMAMenuPluginPrivate        FMAMenuPluginPrivate;
 
 typedef struct {
        /*< private >*/
-       GObject                 parent;
-       NautilusActionsPrivate *private;
+       GObject               parent;
+       FMAMenuPluginPrivate *private;
 }
-       NautilusActions;
+       FMAMenuPlugin;
 
-typedef struct _NautilusActionsClassPrivate  NautilusActionsClassPrivate;
+typedef struct _FMAMenuPluginClassPrivate   FMAMenuPluginClassPrivate;
 
 typedef struct {
        /*< private >*/
-       GObjectClass                 parent;
-       NautilusActionsClassPrivate *private;
+       GObjectClass               parent;
+       FMAMenuPluginClassPrivate *private;
 }
-       NautilusActionsClass;
+       FMAMenuPluginClass;
 
-GType    nautilus_actions_get_type     ( void );
-void     nautilus_actions_register_type( GTypeModule *module );
+GType    fma_menu_plugin_get_type     ( void );
+void     fma_menu_plugin_register_type( GTypeModule *module );
 
 G_END_DECLS
 
-#endif /* __PLUGIN_MENU_NAUTILUS_ACTIONS_H__ */
+#endif /* __PLUGIN_MENU_FMA_MENU_PLUGIN_H__ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]