[tracker/new-app-miner: 2/3] libtracker-common: Rename tracker_miner_meego* functions to tracker_meego*

[Martyn James Russell <mr src gnome org>]

commit 56faf321d13f345fdbbcbd644f1b9d06974d1db6
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Mar 27 17:12:02 2014 +0000

    libtracker-common: Rename tracker_miner_meego* functions to tracker_meego*

 src/libtracker-common/tracker-miner-meego.cpp |   10 +++++-----
 src/libtracker-common/tracker-miner-meego.h   |   18 +++++++++---------
 src/miners/apps/tracker-miner-applications.c  |    6 +++---
 src/miners/fs/tracker-miner-userguides.c      |    6 +++---
 4 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/src/libtracker-common/tracker-miner-meego.cpp b/src/libtracker-common/tracker-miner-meego.cpp
index 548f424..2d840aa 100644
--- a/src/libtracker-common/tracker-miner-meego.cpp
+++ b/src/libtracker-common/tracker-miner-meego.cpp
@@ -31,7 +31,7 @@ static QCoreApplication *app = NULL;
  * MeeGo application functions...
  */
 void
-tracker_miner_applications_meego_init (void)
+tracker_meego_init (void)
 {
        char *argv[] = { "dummy", NULL };
        int argc = 1;
@@ -41,7 +41,7 @@ tracker_miner_applications_meego_init (void)
 }
 
 void
-tracker_miner_applications_meego_shutdown (void)
+tracker_meego_shutdown (void)
 {
        delete app;
 }
@@ -56,8 +56,8 @@ tracker_miner_applications_meego_shutdown (void)
  * layers here.
  */
 gchar *
-tracker_miner_applications_meego_translate (const gchar  *catalogue,
-                                            const gchar  *id)
+tracker_meego_translate (const gchar *catalogue,
+                         const gchar *id)
 {
        /* Get the system default locale */
        MLocale locale;
@@ -85,7 +85,7 @@ tracker_miner_applications_meego_translate (const gchar  *catalogue,
  * MeeGo general functions...
  */
 gchar *
-tracker_miner_meego_get_locale (void)
+tracker_meego_get_locale (void)
 {
        /* Get the system default locale */
        MLocale locale;
diff --git a/src/libtracker-common/tracker-miner-meego.h b/src/libtracker-common/tracker-miner-meego.h
index a678c96..d9724b6 100644
--- a/src/libtracker-common/tracker-miner-meego.h
+++ b/src/libtracker-common/tracker-miner-meego.h
@@ -17,21 +17,21 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKER_MINER_FS_MEEGO_H__
-#define __TRACKER_MINER_FS_MEEGO_H__
+#ifndef __LIBTRACKER_COMMON_MEEGO_H__
+#define __LIBTRACKER_COMMON_MEEGO_H__
 
 G_BEGIN_DECLS
 
+void   tracker_meego_init       (void);
+void   tracker_meego_shutdown   (void);
+
 /* MeeGo general functions */
-gchar *tracker_miner_meego_get_locale (void);
+gchar *tracker_meego_get_locale (void);
 
 /* MeeGo application functions */
-gchar *tracker_miner_applications_meego_translate (const gchar  *catalogue,
-                                                   const gchar  *id);
-
-void   tracker_miner_applications_meego_init       (void);
-void   tracker_miner_applications_meego_shutdown   (void);
+gchar *tracker_meego_translate  (const gchar *catalogue,
+                                 const gchar *id);
 
 G_END_DECLS
 
-#endif /* __TRACKER_MINER_FS_MEEGO_H__ */
+#endif /* __LIBTRACKER_COMMON_MEEGO_H__ */
diff --git a/src/miners/apps/tracker-miner-applications.c b/src/miners/apps/tracker-miner-applications.c
index ced615a..4ea4434 100644
--- a/src/miners/apps/tracker-miner-applications.c
+++ b/src/miners/apps/tracker-miner-applications.c
@@ -239,7 +239,7 @@ miner_applications_initable_init (GInitable     *initable,
        miner_applications_add_directories (fs);
 
 #ifdef HAVE_MEEGOTOUCH
-       tracker_miner_applications_meego_init ();
+       tracker_meego_init ();
 #endif /* HAVE_MEEGOTOUCH */
 
        app->locale_notification_id = tracker_locale_notify_add (TRACKER_LOCALE_LANGUAGE,
@@ -260,7 +260,7 @@ miner_applications_finalize (GObject *object)
        tracker_locale_notify_remove (app->locale_notification_id);
 
 #ifdef HAVE_MEEGOTOUCH
-       tracker_miner_applications_meego_shutdown ();
+       tracker_meego_shutdown ();
 #endif /* HAVE_MEEGOTOUCH */
 
        G_OBJECT_CLASS (tracker_miner_applications_parent_class)->finalize (object);
@@ -429,7 +429,7 @@ process_desktop_file (ProcessApplicationData  *data,
        translation_catalog = g_key_file_get_string (key_file, GROUP_DESKTOP_ENTRY, 
"X-MeeGo-Translation-Catalog", NULL);
 
        if (logical_id && translation_catalog) {
-               name = tracker_miner_applications_meego_translate (translation_catalog, logical_id);
+               name = tracker_meego_translate (translation_catalog, logical_id);
        }
 
        g_free (logical_id);
diff --git a/src/miners/fs/tracker-miner-userguides.c b/src/miners/fs/tracker-miner-userguides.c
index c674c45..c30de76 100644
--- a/src/miners/fs/tracker-miner-userguides.c
+++ b/src/miners/fs/tracker-miner-userguides.c
@@ -148,7 +148,7 @@ miner_userguides_basedir_add (TrackerMinerFS *fs,
 #ifdef HAVE_MEEGOTOUCH
        gchar *locale;
 
-       locale = tracker_miner_meego_get_locale ();
+       locale = tracker_meego_get_locale ();
 
        /* Order of which we try here:
         * 1, make sure locale is set, otherwise default to 'en'
@@ -282,7 +282,7 @@ miner_userguides_initable_init (GInitable     *initable,
        miner_userguides_add_directories (fs);
 
 #ifdef HAVE_MEEGOTOUCH
-       tracker_miner_applications_meego_init ();
+       tracker_meego_init ();
 #endif /* HAVE_MEEGOTOUCH */
 
        app->locale_notification_id = tracker_locale_notify_add (TRACKER_LOCALE_LANGUAGE,
@@ -303,7 +303,7 @@ miner_userguides_finalize (GObject *object)
        tracker_locale_notify_remove (app->locale_notification_id);
 
 #ifdef HAVE_MEEGOTOUCH
-       tracker_miner_applications_meego_shutdown ();
+       tracker_meego_shutdown ();
 #endif /* HAVE_MEEGOTOUCH */
 
        G_OBJECT_CLASS (tracker_miner_userguides_parent_class)->finalize (object);