[gnome-software/wip/rancell/ubuntu-ratings-3-18] Rename to ubuntu-ratings so doesn't conflict with reviews branch



commit fb94dcdd58582fea3947266eaf142490ea37ed9e
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed Jan 13 19:44:33 2016 +1300

    Rename to ubuntu-ratings so doesn't conflict with reviews branch

 configure.ac                                       |    1 -
 src/plugins/Makefile.am                            |   11 +++++------
 ...ubuntu-reviews.c => gs-plugin-ubuntu-ratings.c} |   14 +++++++-------
 3 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 13c0ac4..6324f62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,6 @@ PKG_CHECK_MODULES(GSETTINGS_DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.11.5
 PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= 3.17.92)
 PKG_CHECK_MODULES(POLKIT, polkit-gobject-1)
 PKG_CHECK_MODULES(JSON_GLIB, json-glib-1.0 >= 0.12)
-PKG_CHECK_MODULES(OAUTH, oauth)
 AC_PATH_PROG(APPSTREAM_UTIL, [appstream-util], [unfound])
 AC_ARG_ENABLE(man,
               [AS_HELP_STRING([--enable-man],
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index aef1e58..dc1c819 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -9,7 +9,6 @@ AM_CPPFLAGS =                                           \
        $(PACKAGEKIT_CFLAGS)                            \
        $(SOUP_CFLAGS)                                  \
        $(SQLITE_CFLAGS)                                \
-       $(OAUTH_CFLAGS)                                 \
        $(FWUPD_CFLAGS)                                 \
        $(LIMBA_CFLAGS)                                 \
        $(JSON_GLIB_CFLAGS)                             \
@@ -36,7 +35,7 @@ plugin_LTLIBRARIES =                                  \
        libgs_plugin_menu-spec-categories.la            \
        libgs_plugin_menu-spec-refine.la                \
        libgs_plugin_local-ratings.la                   \
-       libgs_plugin_ubuntu-reviews.la                  \
+       libgs_plugin_ubuntu-ratings.la                  \
        libgs_plugin_fedora_tagger_ratings.la           \
        libgs_plugin_fedora_tagger_usage.la             \
        libgs_plugin_epiphany.la                        \
@@ -133,10 +132,10 @@ libgs_plugin_local_ratings_la_LIBADD = $(GS_PLUGIN_LIBS) $(SQLITE_LIBS)
 libgs_plugin_local_ratings_la_LDFLAGS = -module -avoid-version
 libgs_plugin_local_ratings_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
-libgs_plugin_ubuntu_reviews_la_SOURCES = gs-plugin-ubuntu-reviews.c
-libgs_plugin_ubuntu_reviews_la_LIBADD = $(GS_PLUGIN_LIBS) $(SOUP_LIBS) $(SQLITE_LIBS) $(JSON_GLIB_LIBS) 
$(OAUTH_LIBS)
-libgs_plugin_ubuntu_reviews_la_LDFLAGS = -module -avoid-version
-libgs_plugin_ubuntu_reviews_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_ubuntu_ratings_la_SOURCES = gs-plugin-ubuntu-ratings.c
+libgs_plugin_ubuntu_ratings_la_LIBADD = $(GS_PLUGIN_LIBS) $(SOUP_LIBS) $(SQLITE_LIBS) $(JSON_GLIB_LIBS)
+libgs_plugin_ubuntu_ratings_la_LDFLAGS = -module -avoid-version
+libgs_plugin_ubuntu_ratings_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
 
 libgs_plugin_packagekit_la_SOURCES =                   \
        gs-plugin-packagekit.c                          \
diff --git a/src/plugins/gs-plugin-ubuntu-reviews.c b/src/plugins/gs-plugin-ubuntu-ratings.c
similarity index 98%
rename from src/plugins/gs-plugin-ubuntu-reviews.c
rename to src/plugins/gs-plugin-ubuntu-ratings.c
index c63d3e8..773588f 100644
--- a/src/plugins/gs-plugin-ubuntu-reviews.c
+++ b/src/plugins/gs-plugin-ubuntu-ratings.c
@@ -48,7 +48,7 @@ typedef struct {
 const gchar *
 gs_plugin_get_name (void)
 {
-       return "ubuntu-reviews";
+       return "ubuntu-ratings";
 }
 
 #define UBUNTU_REVIEWS_SERVER          "https://reviews.ubuntu.com/reviews";
@@ -64,7 +64,7 @@ gs_plugin_initialize (GsPlugin *plugin)
 
        plugin->priv->db_path = g_build_filename (g_get_user_data_dir (),
                                                  "gnome-software",
-                                                 "ubuntu-reviews.db",
+                                                 "ubuntu-review-stats.db",
                                                  NULL);
 
        /* check that we are running on Ubuntu */
@@ -484,7 +484,7 @@ load_database (GsPlugin *plugin, GError **error)
                g_set_error (error,
                             GS_PLUGIN_ERROR,
                             GS_PLUGIN_ERROR_FAILED,
-                            "Can't open ubuntu-reviews database: %s",
+                            "Can't open Ubuntu review statistics database: %s",
                             sqlite3_errmsg (plugin->priv->db));
                return FALSE;
        }
@@ -535,20 +535,20 @@ load_database (GsPlugin *plugin, GError **error)
        /* Download data if we have none or it is out of date */
        now = g_get_real_time () / G_USEC_PER_SEC;
        if (mtime == 0 || rebuild_ratings) {
-               g_debug ("No ubuntu-reviews data");
+               g_debug ("No Ubuntu review statistics");
                if (!download_review_stats (plugin, &error_local)) {
-                       g_warning ("Failed to get ubuntu-reviews data: %s",
+                       g_warning ("Failed to get Ubuntu review statistics: %s",
                                   error_local->message);
                        return TRUE;
                }
        } else if (now - mtime > GS_PLUGIN_UBUNTU_REVIEWS_AGE_MAX) {
-               g_debug ("ubuntu-reviews data was %" G_GINT64_FORMAT
+               g_debug ("ubuntu review statistics was %" G_GINT64_FORMAT
                         " days old, so regetting",
                         (now - mtime) / ( 60 * 60 * 24));
                if (!download_review_stats (plugin, error))
                        return FALSE;
        } else {
-               g_debug ("ubuntu-reviews data %" G_GINT64_FORMAT
+               g_debug ("ubuntu review statistics %" G_GINT64_FORMAT
                         " days old, so no need to redownload",
                         (now - mtime) / ( 60 * 60 * 24));
        }


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