[nautilus-actions/file-manager-actions] Tracker plugin is renamed to fma-tracker-module



commit 55c88d0ef5960a7f4d46552325f1080fb95751a9
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Sep 8 18:54:16 2015 +0200

    Tracker plugin is renamed to fma-tracker-module

 src/plugin-tracker/.gitignore                      |    2 +-
 src/plugin-tracker/Makefile.am                     |   34 +++---
 ...ker-dbus-glib.xml => fma-tracker-dbus-glib.xml} |    2 +-
 ...{na-tracker-gdbus.xml => fma-tracker-gdbus.xml} |    0
 .../{na-tracker-plugin.c => fma-tracker-module.c}  |   14 +-
 .../{na-tracker.c => fma-tracker-plugin.c}         |  150 ++++++++++----------
 .../{na-tracker.h => fma-tracker-plugin.h}         |   50 ++++----
 src/utils/Makefile.am                              |   10 +-
 src/utils/nautilus-actions-run.c                   |    8 +-
 9 files changed, 135 insertions(+), 135 deletions(-)
---
diff --git a/src/plugin-tracker/.gitignore b/src/plugin-tracker/.gitignore
index 27e3d04..26f3d54 100644
--- a/src/plugin-tracker/.gitignore
+++ b/src/plugin-tracker/.gitignore
@@ -1 +1 @@
-na-tracker-dbus-glue.h
+fma-tracker-plugin-dbus-glue.h
diff --git a/src/plugin-tracker/Makefile.am b/src/plugin-tracker/Makefile.am
index 7e68237..f6d7ca8 100644
--- a/src/plugin-tracker/Makefile.am
+++ b/src/plugin-tracker/Makefile.am
@@ -34,50 +34,50 @@ AM_CPPFLAGS += \
 
 nautilus_extensiondir = $(NAUTILUS_EXTENSIONS_DIR)
 
-nautilus_extension_LTLIBRARIES = libnautilus-actions-tracker.la
+nautilus_extension_LTLIBRARIES = libfma-tracker.la
 
 BUILT_SOURCES =
 
 BUILT_SOURCES += \
-       na-tracker-gdbus.c                                                                                    
  \
-       na-tracker-gdbus.h                                                                                    
  \
+       fma-tracker-gdbus.c                                                                                   
  \
+       fma-tracker-gdbus.h                                                                                   
  \
        $(NULL)
 
-na-tracker-gdbus.c na-tracker-gdbus.h: na-tracker-gdbus.xml
+fma-tracker-gdbus.c fma-tracker-gdbus.h: fma-tracker-gdbus.xml
        gdbus-codegen \
                --interface-prefix org.filemanager_actions.DBus.Tracker.        \
-               --generate-c-code na-tracker-gdbus                                              \
-               --c-namespace NA_Tracker                                                                \
-               --c-generate-object-manager                                                             \
-               --generate-docbook na-tracker-gdbus-docs                                \
+               --generate-c-code fma-tracker-gdbus                                                     \
+               --c-namespace FMA_Tracker_GDBus                                                         \
+               --c-generate-object-manager                                                                   
  \
+               --generate-docbook fma-tracker-gdbus-docs                                       \
                $<
 
 DISTCLEANFILES = \
-       na-tracker-gdbus-docs-org.filemanager_actions.DBus.Tracker.Properties1.xml
+       fma-tracker-gdbus-docs-org.filemanager_actions.DBus.Tracker.Properties1.xml
 
-nodist_libnautilus_actions_tracker_la_SOURCES = \
+nodist_libfma_tracker_la_SOURCES = \
        $(BUILT_SOURCES)                                                                                      
  \
        $(NULL)
 
-libnautilus_actions_tracker_la_SOURCES = \
-       na-tracker.c                                                                                          
  \
-       na-tracker.h                                                                                          
  \
-       na-tracker-plugin.c                                                                                   
  \
+libfma_tracker_la_SOURCES = \
+       fma-tracker-module.c                                                                            \
+       fma-tracker-plugin.h                                                                            \
+       fma-tracker-plugin.c                                                                            \
        $(NULL)
 
-libnautilus_actions_tracker_la_LIBADD = \
+libfma_tracker_la_LIBADD = \
        $(top_builddir)/src/core/libfma-core.la                                         \
        $(NAUTILUS_ACTIONS_LIBS)                                                                        \
        $(NULL)
 
-libnautilus_actions_tracker_la_LDFLAGS = \
+libfma_tracker_la_LDFLAGS = \
        -module                                                                                               
          \
        -no-undefined                                                                                         
  \
        -avoid-version                                                                                        
  \
        $(NULL)
 
 EXTRA_DIST = \
-       na-tracker-gdbus.xml                                                                            \
+       fma-tracker-gdbus.xml                                                                           \
        $(NULL)
 
 CLEANFILES = \
diff --git a/src/plugin-tracker/na-tracker-dbus-glib.xml b/src/plugin-tracker/fma-tracker-dbus-glib.xml
similarity index 88%
rename from src/plugin-tracker/na-tracker-dbus-glib.xml
rename to src/plugin-tracker/fma-tracker-dbus-glib.xml
index 7c8acd3..1807d10 100644
--- a/src/plugin-tracker/na-tracker-dbus-glib.xml
+++ b/src/plugin-tracker/fma-tracker-dbus-glib.xml
@@ -3,7 +3,7 @@
   <interface name="org.filemanager_actions.DBus.Tracker.Properties1">
     <method name="GetSelectedPaths">
       <arg type="as" name="paths" direction="out" />
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="na_tracker_get_selected_paths" />
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="fma_tracker_plugin_get_selected_paths" />
     </method>
   </interface>
 </node>
diff --git a/src/plugin-tracker/na-tracker-gdbus.xml b/src/plugin-tracker/fma-tracker-gdbus.xml
similarity index 100%
rename from src/plugin-tracker/na-tracker-gdbus.xml
rename to src/plugin-tracker/fma-tracker-gdbus.xml
diff --git a/src/plugin-tracker/na-tracker-plugin.c b/src/plugin-tracker/fma-tracker-module.c
similarity index 90%
rename from src/plugin-tracker/na-tracker-plugin.c
rename to src/plugin-tracker/fma-tracker-module.c
index 1ea4e54..b1c4571 100644
--- a/src/plugin-tracker/na-tracker-plugin.c
+++ b/src/plugin-tracker/fma-tracker-module.c
@@ -36,7 +36,7 @@
 
 #include <libnautilus-extension/nautilus-extension-types.h>
 
-#include "na-tracker.h"
+#include "fma-tracker-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 );
@@ -58,9 +58,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_tracker_module_nautilus_module_initialize";
 
-       syslog( LOG_USER | LOG_INFO, "[N-A] %s Tracker %s initializing...", PACKAGE_NAME, PACKAGE_VERSION );
+       syslog( LOG_USER | LOG_INFO, "[FMA] %s Tracker %s initializing...", PACKAGE_NAME, PACKAGE_VERSION );
 
        set_log_handler();
 
@@ -68,18 +68,18 @@ nautilus_module_initialize( GTypeModule *module )
 
        g_type_module_set_name( module, PACKAGE_STRING );
 
-       na_tracker_register_type( module );
+       fma_tracker_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_tracker_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] = NA_TYPE_TRACKER;
+       type_list[0] = FMA_TYPE_TRACKER_PLUGIN;
        *types = type_list;
        *num_types = 1;
 }
@@ -87,7 +87,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_tracker_module_nautilus_module_shutdown";
 
        g_debug( "%s", thisfn );
 
diff --git a/src/plugin-tracker/na-tracker.c b/src/plugin-tracker/fma-tracker-plugin.c
similarity index 66%
rename from src/plugin-tracker/na-tracker.c
rename to src/plugin-tracker/fma-tracker-plugin.c
index 528cc59..07ca70e 100644
--- a/src/plugin-tracker/na-tracker.c
+++ b/src/plugin-tracker/fma-tracker-plugin.c
@@ -32,7 +32,6 @@
 #endif
 
 #include <gio/gio.h>
-#include "na-tracker-gdbus.h"
 
 #include <libnautilus-extension/nautilus-extension-types.h>
 #include <libnautilus-extension/nautilus-file-info.h>
@@ -40,17 +39,18 @@
 
 #include <api/fma-dbus.h>
 
-#include "na-tracker.h"
+#include "fma-tracker-plugin.h"
+#include "fma-tracker-gdbus.h"
 
 /* private class data
  */
-struct _NATrackerClassPrivate {
+struct _FMATrackerPluginClassPrivate {
        void *empty;                                            /* so that gcc -pedantic is happy */
 };
 
 /* private instance data
  */
-struct _NATrackerPrivate {
+struct _FMATrackerPluginPrivate {
        gboolean                  dispose_has_run;
        guint                     owner_id;     /* the identifier returns by g_bus_own_name */
        GDBusObjectManagerServer *manager;
@@ -60,44 +60,44 @@ struct _NATrackerPrivate {
 static GObjectClass *st_parent_class = NULL;
 static GType         st_module_type = 0;
 
-static void    class_init( NATrackerClass *klass );
-static void    instance_init( GTypeInstance *instance, gpointer klass );
-static void    initialize_dbus_connection( NATracker *tracker );
-static void    on_bus_acquired( GDBusConnection *connection, const gchar *name, NATracker *tracker );
-static void    on_name_acquired( GDBusConnection *connection, const gchar *name, NATracker *tracker );
-static void    on_name_lost( GDBusConnection *connection, const gchar *name, NATracker *tracker );
-static gboolean on_properties1_get_selected_paths( NATrackerProperties1 *tracker_properties, 
GDBusMethodInvocation *invocation, NATracker *tracker );
-static void    instance_dispose( GObject *object );
-static void    instance_finalize( GObject *object );
+static void     class_init( FMATrackerPluginClass *klass );
+static void     instance_init( GTypeInstance *instance, gpointer klass );
+static void     initialize_dbus_connection( FMATrackerPlugin *tracker );
+static void     on_bus_acquired( GDBusConnection *connection, const gchar *name, FMATrackerPlugin *tracker );
+static void     on_name_acquired( GDBusConnection *connection, const gchar *name, FMATrackerPlugin *tracker 
);
+static void     on_name_lost( GDBusConnection *connection, const gchar *name, FMATrackerPlugin *tracker );
+static gboolean on_properties1_get_selected_paths( FMATrackerGDBusProperties1 *properties, 
GDBusMethodInvocation *invocation, FMATrackerPlugin *tracker );
+static void     instance_dispose( GObject *object );
+static void     instance_finalize( GObject *object );
 
-static void    menu_provider_iface_init( NautilusMenuProviderIface *iface );
-static GList  *menu_provider_get_background_items( NautilusMenuProvider *provider, GtkWidget *window, 
NautilusFileInfo *folder );
-static GList  *menu_provider_get_file_items( NautilusMenuProvider *provider, GtkWidget *window, GList *files 
);
+static void     menu_provider_iface_init( NautilusMenuProviderIface *iface );
+static GList   *menu_provider_get_background_items( NautilusMenuProvider *provider, GtkWidget *window, 
NautilusFileInfo *folder );
+static GList   *menu_provider_get_file_items( NautilusMenuProvider *provider, GtkWidget *window, GList 
*files );
 
-static void    set_uris( NATracker *tracker, GList *files );
-static gchar **get_selected_paths( NATracker *tracker );
-static GList  *free_selected( GList *selected );
+static void     set_uris( FMATrackerPlugin *tracker, GList *files );
+static gchar  **get_selected_paths( FMATrackerPlugin *tracker );
+static GList   *free_selected( GList *selected );
 
 GType
-na_tracker_get_type( void )
+fma_tracker_plugin_get_type( void )
 {
        g_assert( st_module_type );
        return( st_module_type );
 }
 
 void
-na_tracker_register_type( GTypeModule *module )
+fma_tracker_plugin_register_type( GTypeModule *module )
 {
-       static const gchar *thisfn = "na_tracker_register_type";
+       static const gchar *thisfn = "fma_tracker_plugin_register_type";
 
        static const GTypeInfo info = {
-               sizeof( NATrackerClass ),
+               sizeof( FMATrackerPluginClass ),
                ( GBaseInitFunc ) NULL,
                ( GBaseFinalizeFunc ) NULL,
                ( GClassInitFunc ) class_init,
                NULL,
                NULL,
-               sizeof( NATracker ),
+               sizeof( FMATrackerPlugin ),
                0,
                ( GInstanceInitFunc ) instance_init,
        };
@@ -111,15 +111,15 @@ na_tracker_register_type( GTypeModule *module )
        g_debug( "%s: module=%p", thisfn, ( void * ) module );
        g_assert( st_module_type == 0 );
 
-       st_module_type = g_type_module_register_type( module, G_TYPE_OBJECT, "NATracker", &info, 0 );
+       st_module_type = g_type_module_register_type( module, G_TYPE_OBJECT, "FMATrackerPlugin", &info, 0 );
 
        g_type_module_add_interface( module, st_module_type, NAUTILUS_TYPE_MENU_PROVIDER, 
&menu_provider_iface_info );
 }
 
 static void
-class_init( NATrackerClass *klass )
+class_init( FMATrackerPluginClass *klass )
 {
-       static const gchar *thisfn = "na_tracker_class_init";
+       static const gchar *thisfn = "fma_tracker_plugin_class_init";
        GObjectClass *gobject_class;
 
        g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
@@ -130,21 +130,21 @@ class_init( NATrackerClass *klass )
        gobject_class->dispose = instance_dispose;
        gobject_class->finalize = instance_finalize;
 
-       klass->private = g_new0( NATrackerClassPrivate, 1 );
+       klass->private = g_new0( FMATrackerPluginClassPrivate, 1 );
 }
 
 static void
 instance_init( GTypeInstance *instance, gpointer klass )
 {
-       static const gchar *thisfn = "na_tracker_instance_init";
-       NATracker *self;
+       static const gchar *thisfn = "fma_tracker_plugin_instance_init";
+       FMATrackerPlugin *self;
 
        g_debug( "%s: instance=%p, klass=%p", thisfn, ( void * ) instance, ( void * ) klass );
-       g_return_if_fail( NA_IS_TRACKER( instance ));
+       g_return_if_fail( FMA_IS_TRACKER_PLUGIN( instance ));
 
-       self = NA_TRACKER( instance );
+       self = FMA_TRACKER_PLUGIN( instance );
 
-       self->private = g_new0( NATrackerPrivate, 1 );
+       self->private = g_new0( FMATrackerPluginPrivate, 1 );
        self->private->dispose_has_run = FALSE;
 
        initialize_dbus_connection( self );
@@ -155,9 +155,9 @@ instance_init( GTypeInstance *instance, gpointer klass )
  * & instantiate the object which will do effective tracking
  */
 static void
-initialize_dbus_connection( NATracker *tracker )
+initialize_dbus_connection( FMATrackerPlugin *tracker )
 {
-       NATrackerPrivate *priv = tracker->private;
+       FMATrackerPluginPrivate *priv = tracker->private;
 
        priv->owner_id = g_bus_own_name(
                        G_BUS_TYPE_SESSION,
@@ -171,13 +171,13 @@ initialize_dbus_connection( NATracker *tracker )
 }
 
 static void
-on_bus_acquired( GDBusConnection *connection, const gchar *name, NATracker *tracker )
+on_bus_acquired( GDBusConnection *connection, const gchar *name, FMATrackerPlugin *tracker )
 {
-       static const gchar *thisfn = "na_tracker_on_bus_acquired";
-       NATrackerObjectSkeleton *tracker_object;
-       NATrackerProperties1 *tracker_properties1;
+       static const gchar *thisfn = "fma_tracker_plugin_on_bus_acquired";
+       FMATrackerGDBusObjectSkeleton *tracker_object;
+       FMATrackerGDBusProperties1 *tracker_properties1;
 
-       /*NATrackerDBus *tracker_object;*/
+       /*FMATrackerGDBusDBus *tracker_object;*/
 
        g_debug( "%s: connection=%p, name=%s, tracker=%p",
                        thisfn,
@@ -194,14 +194,14 @@ on_bus_acquired( GDBusConnection *connection, const gchar *name, NATracker *trac
         *  /org/filemanager_actions/DBus/Tracker
         *  (which must be same or below than that of object manager server)
         */
-       tracker_object = na_tracker_object_skeleton_new( FILEMANAGER_ACTIONS_DBUS_TRACKER_PATH "/0" );
+       tracker_object = fma_tracker_gdbus_object_skeleton_new( FILEMANAGER_ACTIONS_DBUS_TRACKER_PATH "/0" );
 
        /* make a newly created object export the interface
         *  org.filemanager_actions.DBus.Tracker.Properties1
         *  and attach it to the D-Bus object, which takes its own reference on it
         */
-       tracker_properties1 = na_tracker_properties1_skeleton_new();
-       na_tracker_object_skeleton_set_properties1( tracker_object, tracker_properties1 );
+       tracker_properties1 = fma_tracker_gdbus_properties1_skeleton_new();
+       fma_tracker_gdbus_object_skeleton_set_properties1( tracker_object, tracker_properties1 );
        g_object_unref( tracker_properties1 );
 
        /* handle GetSelectedPaths method invocation on the .Properties1 interface
@@ -225,9 +225,9 @@ on_bus_acquired( GDBusConnection *connection, const gchar *name, NATracker *trac
 }
 
 static void
-on_name_acquired( GDBusConnection *connection, const gchar *name, NATracker *tracker )
+on_name_acquired( GDBusConnection *connection, const gchar *name, FMATrackerPlugin *tracker )
 {
-       static const gchar *thisfn = "na_tracker_on_name_acquired";
+       static const gchar *thisfn = "fma_tracker_plugin_on_name_acquired";
 
        g_debug( "%s: connection=%p, name=%s, tracker=%p",
                        thisfn,
@@ -237,9 +237,9 @@ on_name_acquired( GDBusConnection *connection, const gchar *name, NATracker *tra
 }
 
 static void
-on_name_lost( GDBusConnection *connection, const gchar *name, NATracker *tracker )
+on_name_lost( GDBusConnection *connection, const gchar *name, FMATrackerPlugin *tracker )
 {
-       static const gchar *thisfn = "na_tracker_on_name_lost";
+       static const gchar *thisfn = "fma_tracker_plugin_on_name_lost";
 
        g_debug( "%s: connection=%p, name=%s, tracker=%p",
                        thisfn,
@@ -251,13 +251,13 @@ on_name_lost( GDBusConnection *connection, const gchar *name, NATracker *tracker
 static void
 instance_dispose( GObject *object )
 {
-       static const gchar *thisfn = "na_tracker_instance_dispose";
-       NATrackerPrivate *priv;
+       static const gchar *thisfn = "fma_tracker_plugin_instance_dispose";
+       FMATrackerPluginPrivate *priv;
 
        g_debug( "%s: object=%p", thisfn, ( void * ) object );
-       g_return_if_fail( NA_IS_TRACKER( object ));
+       g_return_if_fail( FMA_IS_TRACKER_PLUGIN( object ));
 
-       priv = NA_TRACKER( object )->private;
+       priv = FMA_TRACKER_PLUGIN( object )->private;
 
        if( !priv->dispose_has_run ){
 
@@ -282,12 +282,12 @@ instance_dispose( GObject *object )
 static void
 instance_finalize( GObject *object )
 {
-       static const gchar *thisfn = "na_tracker_instance_finalize";
-       NATracker *self;
+       static const gchar *thisfn = "fma_tracker_plugin_instance_finalize";
+       FMATrackerPlugin *self;
 
        g_debug( "%s: object=%p", thisfn, ( void * ) object );
-       g_return_if_fail( NA_IS_TRACKER( object ));
-       self = NA_TRACKER( object );
+       g_return_if_fail( FMA_IS_TRACKER_PLUGIN( object ));
+       self = FMA_TRACKER_PLUGIN( object );
 
        g_free( self->private );
 
@@ -300,7 +300,7 @@ instance_finalize( GObject *object )
 static void
 menu_provider_iface_init( NautilusMenuProviderIface *iface )
 {
-       static const gchar *thisfn = "na_tracker_menu_provider_iface_init";
+       static const gchar *thisfn = "fma_tracker_plugin_menu_provider_iface_init";
 
        g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
 
@@ -311,14 +311,14 @@ menu_provider_iface_init( NautilusMenuProviderIface *iface )
 static GList *
 menu_provider_get_background_items( NautilusMenuProvider *provider, GtkWidget *window, NautilusFileInfo 
*folder )
 {
-       static const gchar *thisfn = "na_tracker_menu_provider_get_background_items";
-       NATracker *tracker;
+       static const gchar *thisfn = "fma_tracker_plugin_menu_provider_get_background_items";
+       FMATrackerPlugin *tracker;
        gchar *uri;
        GList *selected;
 
-       g_return_val_if_fail( NA_IS_TRACKER( provider ), NULL );
+       g_return_val_if_fail( FMA_IS_TRACKER_PLUGIN( provider ), NULL );
 
-       tracker = NA_TRACKER( provider );
+       tracker = FMA_TRACKER_PLUGIN( provider );
 
        if( !tracker->private->dispose_has_run ){
 
@@ -347,12 +347,12 @@ 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 = "na_tracker_menu_provider_get_file_items";
-       NATracker *tracker;
+       static const gchar *thisfn = "fma_tracker_plugin_menu_provider_get_file_items";
+       FMATrackerPlugin *tracker;
 
-       g_return_val_if_fail( NA_IS_TRACKER( provider ), NULL );
+       g_return_val_if_fail( FMA_IS_TRACKER_PLUGIN( provider ), NULL );
 
-       tracker = NA_TRACKER( provider );
+       tracker = FMA_TRACKER_PLUGIN( provider );
 
        if( !tracker->private->dispose_has_run ){
 
@@ -370,15 +370,15 @@ menu_provider_get_file_items( NautilusMenuProvider *provider, GtkWidget *window,
 
 /*
  * set_uris:
- * @tracker: this #NATracker instance.
+ * @tracker: this #FMATrackerPlugin instance.
  * @files: the list of currently selected items.
  *
  * Maintains our own list of uris.
  */
 static void
-set_uris( NATracker *tracker, GList *files )
+set_uris( FMATrackerPlugin *tracker, GList *files )
 {
-       NATrackerPrivate *priv;
+       FMATrackerPluginPrivate *priv;
 
        priv = tracker->private;
 
@@ -390,16 +390,16 @@ set_uris( NATracker *tracker, GList *files )
  * Returns: %TRUE if the method has been handled.
  */
 static gboolean
-on_properties1_get_selected_paths( NATrackerProperties1 *tracker_properties, GDBusMethodInvocation 
*invocation, NATracker *tracker )
+on_properties1_get_selected_paths( FMATrackerGDBusProperties1 *properties, GDBusMethodInvocation 
*invocation, FMATrackerPlugin *tracker )
 {
        gchar **paths;
 
-       g_return_val_if_fail( NA_IS_TRACKER( tracker ), FALSE );
+       g_return_val_if_fail( FMA_IS_TRACKER_PLUGIN( tracker ), FALSE );
 
        paths = get_selected_paths( tracker );
 
-       na_tracker_properties1_complete_get_selected_paths(
-                       tracker_properties,
+       fma_tracker_gdbus_properties1_complete_get_selected_paths(
+                       properties,
                        invocation,
                        ( const gchar * const * ) paths );
 
@@ -408,7 +408,7 @@ on_properties1_get_selected_paths( NATrackerProperties1 *tracker_properties, GDB
 
 /*
  * get_selected_paths:
- * @tracker: this #NATracker object.
+ * @tracker: this #FMATrackerPlugin object.
  *
  * Sends on session D-Bus the list of currently selected items, as two
  * strings for each item :
@@ -422,10 +422,10 @@ on_properties1_get_selected_paths( NATrackerProperties1 *tracker_properties, GDB
  * Exported as GetSelectedPaths method on Tracker.Properties1 interface.
  */
 static gchar **
-get_selected_paths( NATracker *tracker )
+get_selected_paths( FMATrackerPlugin *tracker )
 {
-       static const gchar *thisfn = "na_tracker_get_selected_paths";
-       NATrackerPrivate *priv;
+       static const gchar *thisfn = "fma_tracker_plugin_get_selected_paths";
+       FMATrackerPluginPrivate *priv;
        gchar **paths;
        GList *it;
        int count;
diff --git a/src/plugin-tracker/na-tracker.h b/src/plugin-tracker/fma-tracker-plugin.h
similarity index 50%
rename from src/plugin-tracker/na-tracker.h
rename to src/plugin-tracker/fma-tracker-plugin.h
index d9c9fc7..b55f54a 100644
--- a/src/plugin-tracker/na-tracker.h
+++ b/src/plugin-tracker/fma-tracker-plugin.h
@@ -27,23 +27,23 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_TRACKER_H__
-#define __NA_TRACKER_H__
+#ifndef __PLUGIN_TRACKER_FMA_TRACKER_PLUGIN_H__
+#define __PLUGIN_TRACKER_FMA_TRACKER_PLUGIN_H__
 
 /**
- * SECTION: na_tracker
- * @short_description: #NATracker class definition.
- * @include: tracker/na-tracker.h
+ * SECTION: fma_tracker_plugin
+ * @short_description: #FMATrackerPlugin class definition.
+ * @include: tracker/fma-tracker-plugin.h
  *
- * The #NATracker object is instanciated when Nautilus file manager loads
+ * The #FMATrackerPlugin object is instanciated when Nautilus file manager loads
  * this plugin (this is the normal behavior of Nautilus to instanciate one
  * object of each plugin type).
  *
- * There is so only one #NATracker object in the process. As any Nautilus
+ * There is so only one #FMATrackerPlugin object in the process. As any Nautilus
  * extension, it is instantiated when the module is loaded by the file
  * manager, usually at startup time.
  *
- * The #NATracker object instanciates and keeps a new GDBusObjectManagerServer
+ * The #FMATrackerPlugin object instanciates and keeps a new GDBusObjectManagerServer
  * rooted on our D-Bus path.
  * It then allocates an object at this same path, and another object which
  * implements the .Properties1 interface. Last connects to the method signal
@@ -54,34 +54,34 @@
 
 G_BEGIN_DECLS
 
-#define NA_TYPE_TRACKER                ( na_tracker_get_type())
-#define NA_TRACKER( object )           ( G_TYPE_CHECK_INSTANCE_CAST(( object ), NA_TYPE_TRACKER, NATracker ))
-#define NA_TRACKER_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST(( klass ), NA_TYPE_TRACKER, NATrackerClass 
))
-#define NA_IS_TRACKER( object )        ( G_TYPE_CHECK_INSTANCE_TYPE(( object ), NA_TYPE_TRACKER ))
-#define NA_IS_TRACKER_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_TRACKER ))
-#define NA_TRACKER_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_TRACKER, 
NATrackerClass ))
+#define FMA_TYPE_TRACKER_PLUGIN                ( fma_tracker_plugin_get_type())
+#define FMA_TRACKER_PLUGIN( object )           ( G_TYPE_CHECK_INSTANCE_CAST(( object ), 
FMA_TYPE_TRACKER_PLUGIN, FMATrackerPlugin ))
+#define FMA_TRACKER_PLUGIN_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST(( klass ), FMA_TYPE_TRACKER_PLUGIN, 
FMATrackerPluginClass ))
+#define FMA_IS_TRACKER_PLUGIN( object )        ( G_TYPE_CHECK_INSTANCE_TYPE(( object ), 
FMA_TYPE_TRACKER_PLUGIN ))
+#define FMA_IS_TRACKER_PLUGIN_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), FMA_TYPE_TRACKER_PLUGIN 
))
+#define FMA_TRACKER_PLUGIN_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), 
FMA_TYPE_TRACKER_PLUGIN, FMATrackerPluginClass ))
 
-typedef struct _NATrackerPrivate       NATrackerPrivate;
+typedef struct _FMATrackerPluginPrivate        FMATrackerPluginPrivate;
 
 typedef struct {
        /*< private >*/
-       GObject           parent;
-       NATrackerPrivate *private;
+       GObject                  parent;
+       FMATrackerPluginPrivate *private;
 }
-       NATracker;
+       FMATrackerPlugin;
 
-typedef struct _NATrackerClassPrivate  NATrackerClassPrivate;
+typedef struct _FMATrackerPluginClassPrivate   FMATrackerPluginClassPrivate;
 
 typedef struct {
        /*< private >*/
-       GObjectClass           parent;
-       NATrackerClassPrivate *private;
+       GObjectClass                  parent;
+       FMATrackerPluginClassPrivate *private;
 }
-       NATrackerClass;
+       FMATrackerPluginClass;
 
-GType    na_tracker_get_type          ( void );
-void     na_tracker_register_type     ( GTypeModule *module );
+GType    fma_tracker_plugin_get_type          ( void );
+void     fma_tracker_plugin_register_type     ( GTypeModule *module );
 
 G_END_DECLS
 
-#endif /* __NA_TRACKER_H__ */
+#endif /* __PLUGIN_TRACKER_FMA_TRACKER_PLUGIN_H__ */
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 6cee0fd..e48434f 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -72,15 +72,15 @@ nautilus_actions_print_LDADD = \
 BUILT_SOURCES =
 
 BUILT_SOURCES += \
-       nautilus-actions-run-bindings.c                                                         \
-       nautilus-actions-run-bindings.h                                                         \
+       fma-run-bindings.c                                                                                    
  \
+       fma-run-bindings.h                                                                                    
  \
        $(NULL)
 
-nautilus-actions-run-bindings.c nautilus-actions-run-bindings.h: 
$(top_srcdir)/src/plugin-tracker/na-tracker-gdbus.xml
+fma-run-bindings.c fma-run-bindings.h: $(top_srcdir)/src/plugin-tracker/fma-tracker-gdbus.xml
        gdbus-codegen \
                --interface-prefix org.filemanager_actions.DBus.Tracker.        \
-               --generate-c-code nautilus-actions-run-bindings                 \
-               --c-namespace NA_Tracker                                                                \
+               --generate-c-code fma-run-bindings                                              \
+               --c-namespace FMA_Tracker_GDBus                                                 \
                --c-generate-object-manager                                                             \
                $<
 
diff --git a/src/utils/nautilus-actions-run.c b/src/utils/nautilus-actions-run.c
index 3e613cf..66ed65e 100644
--- a/src/utils/nautilus-actions-run.c
+++ b/src/utils/nautilus-actions-run.c
@@ -47,7 +47,7 @@
 #include <core/fma-tokens.h>
 
 #include "console-utils.h"
-#include "nautilus-actions-run-bindings.h"
+#include "fma-run-bindings.h"
 
 static gchar     *id               = "";
 static gchar    **targets_array    = NULL;
@@ -276,7 +276,7 @@ targets_from_selection( void )
        error = NULL;
        paths = NULL;
 
-       manager = na_tracker_object_manager_client_new_for_bus_sync(
+       manager = fma_tracker_gdbus_object_manager_client_new_for_bus_sync(
                        G_BUS_TYPE_SESSION,
                        G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
                        FILEMANAGER_ACTIONS_DBUS_SERVICE,
@@ -312,8 +312,8 @@ targets_from_selection( void )
        /* note that @iface is really a GDBusProxy instance
         * and additionally also a NATrackerProperties1 instance
         */
-       na_tracker_properties1_call_get_selected_paths_sync(
-                       NA_TRACKER_PROPERTIES1( iface ),
+       fma_tracker_gdbus_properties1_call_get_selected_paths_sync(
+                       FMA_TRACKER_GDBUS_PROPERTIES1( iface ),
                        &paths,
                        NULL,
                        &error );


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