[gnome-software/wip/rancell/reviews] Rename GsAppReview to GsReview
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/rancell/reviews] Rename GsAppReview to GsReview
- Date: Mon, 8 Feb 2016 21:34:32 +0000 (UTC)
commit 61b2e1ebd8e3bb1d3f6b70a961849f2585fe067f
Author: Robert Ancell <robert ancell canonical com>
Date: Tue Feb 9 09:12:53 2016 +1300
Rename GsAppReview to GsReview
po/POTFILES.in | 8 +-
src/Makefile.am | 16 +-
src/gnome-software.gresource.xml | 4 +-
src/gs-app-review.h | 64 ---------
src/gs-app.c | 10 +-
src/gs-app.h | 8 +-
src/{gs-app-review-dialog.c => gs-review-dialog.c} | 32 +++---
src/{gs-app-review-dialog.h => gs-review-dialog.h} | 22 ++--
...gs-app-review-dialog.ui => gs-review-dialog.ui} | 2 +-
src/{gs-app-review-row.c => gs-review-row.c} | 72 +++++-----
src/{gs-app-review-row.h => gs-review-row.h} | 14 +-
src/{gs-app-review-row.ui => gs-review-row.ui} | 2 +-
src/{gs-app-review.c => gs-review.c} | 138 ++++++++++----------
src/gs-review.h | 63 +++++++++
src/gs-shell-details.c | 26 ++--
src/plugins/gs-plugin-ubuntu-reviews.c | 36 +++---
16 files changed, 258 insertions(+), 259 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e5b8fb7..9597b68 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,10 +7,6 @@ src/gnome-software-local-file.desktop.in
src/gs-app-folder-dialog.c
src/gs-application.c
src/gs-app-addon-row.c
-src/gs-app-review-dialog.c
-[type: gettext/glade]src/gs-app-review-dialog.ui
-src/gs-app-review-row.c
-[type: gettext/glade]src/gs-app-review-row.ui
src/gs-app.c
src/gs-app-row.c
[type: gettext/glade]src/gs-app-row.ui
@@ -26,6 +22,10 @@ src/gs-main.c
src/gs-page.c
src/gs-plugin-loader.c
src/gs-popular-tile.c
+src/gs-review-dialog.c
+[type: gettext/glade]src/gs-review-dialog.ui
+src/gs-review-row.c
+[type: gettext/glade]src/gs-review-row.ui
src/gs-screenshot-image.c
src/gs-shell.c
src/gs-shell-extras.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 67db7e8..ee053e4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,10 +35,10 @@ UI_FILES = \
gnome-software.ui \
gs-app-addon-row.ui \
gs-app-row.ui \
- gs-app-review-dialog.ui \
- gs-app-review-row.ui \
gs-first-run-dialog.ui \
gs-history-dialog.ui \
+ gs-review-dialog.ui \
+ gs-review-row.ui \
gs-shell-category.ui \
gs-shell-extras.ui \
gs-shell-details.ui \
@@ -119,12 +119,6 @@ gnome_software_SOURCES = \
gs-feature-tile.h \
gs-category-tile.c \
gs-category-tile.h \
- gs-app-review.c \
- gs-app-review.h \
- gs-app-review-dialog.c \
- gs-app-review-dialog.h \
- gs-app-review-row.c \
- gs-app-review-row.h \
gs-app-tile.c \
gs-app-tile.h \
gs-app-folder-dialog.c \
@@ -147,6 +141,12 @@ gnome_software_SOURCES = \
gs-plugin.h \
gs-progress-button.c \
gs-progress-button.h \
+ gs-review.c \
+ gs-review.h \
+ gs-review-dialog.c \
+ gs-review-dialog.h \
+ gs-review-row.c \
+ gs-review-row.h \
gs-screenshot-image.c \
gs-screenshot-image.h \
gs-shell.c \
diff --git a/src/gnome-software.gresource.xml b/src/gnome-software.gresource.xml
index 710d8da..9cc13b1 100644
--- a/src/gnome-software.gresource.xml
+++ b/src/gnome-software.gresource.xml
@@ -10,11 +10,11 @@
<file preprocess="xml-stripblanks">app-folder-dialog.ui</file>
<file preprocess="xml-stripblanks">screenshot-image.ui</file>
<file preprocess="xml-stripblanks">gs-app-addon-row.ui</file>
- <file preprocess="xml-stripblanks">gs-app-review-dialog.ui</file>
- <file preprocess="xml-stripblanks">gs-app-review-row.ui</file>
<file preprocess="xml-stripblanks">gs-app-row.ui</file>
<file preprocess="xml-stripblanks">gs-first-run-dialog.ui</file>
<file preprocess="xml-stripblanks">gs-history-dialog.ui</file>
+ <file preprocess="xml-stripblanks">gs-review-dialog.ui</file>
+ <file preprocess="xml-stripblanks">gs-review-row.ui</file>
<file preprocess="xml-stripblanks">gs-shell-category.ui</file>
<file preprocess="xml-stripblanks">gs-shell-extras.ui</file>
<file preprocess="xml-stripblanks">gs-shell-details.ui</file>
diff --git a/src/gs-app.c b/src/gs-app.c
index be74ea6..812d393 100644
--- a/src/gs-app.c
+++ b/src/gs-app.c
@@ -83,8 +83,8 @@ struct _GsApp
AsUrgencyKind update_urgency;
gchar *management_plugin;
gint rating;
- GsAppReview *self_review;
- GPtrArray *reviews; /* of GsAppReview */
+ GsReview *self_review;
+ GPtrArray *reviews; /* of GsReview */
guint64 size;
GsAppKind kind;
AsIdKind id_kind;
@@ -1645,7 +1645,7 @@ gs_app_set_rating (GsApp *app, gint rating)
/**
* gs_app_get_self_review:
*/
-GsAppReview *
+GsReview *
gs_app_get_self_review (GsApp *app)
{
g_return_val_if_fail (GS_IS_APP (app), NULL);
@@ -1656,7 +1656,7 @@ gs_app_get_self_review (GsApp *app)
* gs_app_set_self_review:
*/
void
-gs_app_set_self_review (GsApp *app, GsAppReview *review)
+gs_app_set_self_review (GsApp *app, GsReview *review)
{
g_return_if_fail (GS_IS_APP (app));
@@ -1679,7 +1679,7 @@ gs_app_get_reviews (GsApp *app)
* gs_app_add_review:
*/
void
-gs_app_add_review (GsApp *app, GsAppReview *review)
+gs_app_add_review (GsApp *app, GsReview *review)
{
g_return_if_fail (GS_IS_APP (app));
g_ptr_array_add (app->reviews, g_object_ref (review));
diff --git a/src/gs-app.h b/src/gs-app.h
index 7aa100e..f5ea9b2 100644
--- a/src/gs-app.h
+++ b/src/gs-app.h
@@ -26,7 +26,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <appstream-glib.h>
-#include "gs-app-review.h"
+#include "gs-review.h"
G_BEGIN_DECLS
@@ -198,12 +198,12 @@ void gs_app_set_metadata (GsApp *app,
gint gs_app_get_rating (GsApp *app);
void gs_app_set_rating (GsApp *app,
gint rating);
-GsAppReview *gs_app_get_self_review (GsApp *app);
+GsReview *gs_app_get_self_review (GsApp *app);
void gs_app_set_self_review (GsApp *app,
- GsAppReview *review);
+ GsReview *review);
GPtrArray *gs_app_get_reviews (GsApp *app);
void gs_app_add_review (GsApp *app,
- GsAppReview *review);
+ GsReview *review);
guint64 gs_app_get_size (GsApp *app);
void gs_app_set_size (GsApp *app,
guint64 size);
diff --git a/src/gs-app-review-dialog.c b/src/gs-review-dialog.c
similarity index 66%
rename from src/gs-app-review-dialog.c
rename to src/gs-review-dialog.c
index fc9a1ea..eb80826 100644
--- a/src/gs-app-review-dialog.c
+++ b/src/gs-review-dialog.c
@@ -24,10 +24,10 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include "gs-app-review-dialog.h"
+#include "gs-review-dialog.h"
#include "gs-star-widget.h"
-struct _GsAppReviewDialog
+struct _GsReviewDialog
{
GtkDialog parent_instance;
@@ -37,28 +37,28 @@ struct _GsAppReviewDialog
GtkWidget *post_button;
};
-G_DEFINE_TYPE (GsAppReviewDialog, gs_app_review_dialog, GTK_TYPE_DIALOG)
+G_DEFINE_TYPE (GsReviewDialog, gs_review_dialog, GTK_TYPE_DIALOG)
gint
-gs_app_review_dialog_get_rating (GsAppReviewDialog *dialog)
+gs_review_dialog_get_rating (GsReviewDialog *dialog)
{
return gs_star_widget_get_rating (GS_STAR_WIDGET (dialog->star));
}
void
-gs_app_review_dialog_set_rating (GsAppReviewDialog *dialog, gint rating)
+gs_review_dialog_set_rating (GsReviewDialog *dialog, gint rating)
{
gs_star_widget_set_rating (GS_STAR_WIDGET (dialog->star), rating);
}
const gchar *
-gs_app_review_dialog_get_summary (GsAppReviewDialog *dialog)
+gs_review_dialog_get_summary (GsReviewDialog *dialog)
{
return gtk_entry_get_text (GTK_ENTRY (dialog->summary_entry));
}
gchar *
-gs_app_review_dialog_get_text (GsAppReviewDialog *dialog)
+gs_review_dialog_get_text (GsReviewDialog *dialog)
{
GtkTextBuffer *buffer;
GtkTextIter start, end;
@@ -70,28 +70,28 @@ gs_app_review_dialog_get_text (GsAppReviewDialog *dialog)
}
static void
-gs_app_review_dialog_init (GsAppReviewDialog *dialog)
+gs_review_dialog_init (GsReviewDialog *dialog)
{
gtk_widget_init_template (GTK_WIDGET (dialog));
}
static void
-gs_app_review_dialog_class_init (GsAppReviewDialogClass *klass)
+gs_review_dialog_class_init (GsReviewDialogClass *klass)
{
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
- gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/Software/gs-app-review-dialog.ui");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/gs-review-dialog.ui");
- gtk_widget_class_bind_template_child (widget_class, GsAppReviewDialog, star);
- gtk_widget_class_bind_template_child (widget_class, GsAppReviewDialog, summary_entry);
- gtk_widget_class_bind_template_child (widget_class, GsAppReviewDialog, text_view);
- gtk_widget_class_bind_template_child (widget_class, GsAppReviewDialog, post_button);
+ gtk_widget_class_bind_template_child (widget_class, GsReviewDialog, star);
+ gtk_widget_class_bind_template_child (widget_class, GsReviewDialog, summary_entry);
+ gtk_widget_class_bind_template_child (widget_class, GsReviewDialog, text_view);
+ gtk_widget_class_bind_template_child (widget_class, GsReviewDialog, post_button);
}
GtkWidget *
-gs_app_review_dialog_new (void)
+gs_review_dialog_new (void)
{
- return GTK_WIDGET (g_object_new (GS_TYPE_APP_REVIEW_DIALOG,
+ return GTK_WIDGET (g_object_new (GS_TYPE_REVIEW_DIALOG,
"use-header-bar", TRUE,
NULL));
}
diff --git a/src/gs-app-review-dialog.h b/src/gs-review-dialog.h
similarity index 61%
rename from src/gs-app-review-dialog.h
rename to src/gs-review-dialog.h
index 6a1a8d8..800d616 100644
--- a/src/gs-app-review-dialog.h
+++ b/src/gs-review-dialog.h
@@ -19,26 +19,26 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef GS_APP_REVIEW_DIALOG_H
-#define GS_APP_REVIEW_DIALOG_H
+#ifndef GS_REVIEW_DIALOG_H
+#define GS_REVIEW_DIALOG_H
#include <gtk/gtk.h>
G_BEGIN_DECLS
-#define GS_TYPE_APP_REVIEW_DIALOG (gs_app_review_dialog_get_type ())
+#define GS_TYPE_REVIEW_DIALOG (gs_review_dialog_get_type ())
-G_DECLARE_FINAL_TYPE (GsAppReviewDialog, gs_app_review_dialog, GS, APP_REVIEW_DIALOG, GtkDialog)
+G_DECLARE_FINAL_TYPE (GsReviewDialog, gs_review_dialog, GS, REVIEW_DIALOG, GtkDialog)
-GtkWidget *gs_app_review_dialog_new (void);
-gint gs_app_review_dialog_get_rating (GsAppReviewDialog *dialog);
-void gs_app_review_dialog_set_rating (GsAppReviewDialog *dialog,
- gint rating);
-const gchar *gs_app_review_dialog_get_summary (GsAppReviewDialog *dialog);
-gchar *gs_app_review_dialog_get_text (GsAppReviewDialog *dialog);
+GtkWidget *gs_review_dialog_new (void);
+gint gs_review_dialog_get_rating (GsReviewDialog *dialog);
+void gs_review_dialog_set_rating (GsReviewDialog *dialog,
+ gint rating);
+const gchar *gs_review_dialog_get_summary (GsReviewDialog *dialog);
+gchar *gs_review_dialog_get_text (GsReviewDialog *dialog);
G_END_DECLS
-#endif /* GS_APP_REVIEW_DIALOG_H */
+#endif /* GS_REVIEW_DIALOG_H */
/* vim: set noexpandtab: */
diff --git a/src/gs-app-review-dialog.ui b/src/gs-review-dialog.ui
similarity index 99%
rename from src/gs-app-review-dialog.ui
rename to src/gs-review-dialog.ui
index f25640e..f14fbae 100644
--- a/src/gs-app-review-dialog.ui
+++ b/src/gs-review-dialog.ui
@@ -2,7 +2,7 @@
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.10"/>
- <template class="GsAppReviewDialog" parent="GtkDialog">
+ <template class="GsReviewDialog" parent="GtkDialog">
<action-widgets>
<action-widget response="ok">post_button</action-widget>
</action-widgets>
diff --git a/src/gs-app-review-row.c b/src/gs-review-row.c
similarity index 55%
rename from src/gs-app-review-row.c
rename to src/gs-review-row.c
index 45ac574..880b75a 100644
--- a/src/gs-app-review-row.c
+++ b/src/gs-review-row.c
@@ -24,32 +24,32 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include "gs-app-review-row.h"
+#include "gs-review-row.h"
#include "gs-star-widget.h"
-struct _GsAppReviewRow
+struct _GsReviewRow
{
GtkListBoxRow parent_instance;
- GsAppReview *review;
+ GsReview *review;
GtkWidget *stars;
GtkWidget *summary_label;
GtkWidget *author_label;
GtkWidget *text_label;
};
-G_DEFINE_TYPE (GsAppReviewRow, gs_app_review_row, GTK_TYPE_LIST_BOX_ROW)
+G_DEFINE_TYPE (GsReviewRow, gs_review_row, GTK_TYPE_LIST_BOX_ROW)
static void
-gs_app_review_row_refresh (GsAppReviewRow *row)
+gs_review_row_refresh (GsReviewRow *row)
{
const gchar *reviewer;
GDateTime *date;
g_autofree gchar *text;
- gs_star_widget_set_rating (GS_STAR_WIDGET (row->stars), gs_app_review_get_rating (row->review));
- reviewer = gs_app_review_get_reviewer (row->review);
- date = gs_app_review_get_date (row->review);
+ gs_star_widget_set_rating (GS_STAR_WIDGET (row->stars), gs_review_get_rating (row->review));
+ reviewer = gs_review_get_reviewer (row->review);
+ date = gs_review_get_date (row->review);
if (reviewer != NULL && date != NULL) {
gchar *date_text = g_date_time_format (date, "%e %B %Y");
text = g_strdup_printf ("%s, %s", reviewer, date_text);
@@ -62,83 +62,83 @@ gs_app_review_row_refresh (GsAppReviewRow *row)
else
text = g_strdup ("");
gtk_label_set_text (GTK_LABEL (row->author_label), text);
- gtk_label_set_text (GTK_LABEL (row->summary_label), gs_app_review_get_summary (row->review));
- gtk_label_set_text (GTK_LABEL (row->text_label), gs_app_review_get_text (row->review));
+ gtk_label_set_text (GTK_LABEL (row->summary_label), gs_review_get_summary (row->review));
+ gtk_label_set_text (GTK_LABEL (row->text_label), gs_review_get_text (row->review));
}
static gboolean
-gs_app_review_row_refresh_idle (gpointer user_data)
+gs_review_row_refresh_idle (gpointer user_data)
{
- GsAppReviewRow *row = GS_APP_REVIEW_ROW (user_data);
+ GsReviewRow *row = GS_REVIEW_ROW (user_data);
- gs_app_review_row_refresh (row);
+ gs_review_row_refresh (row);
g_object_unref (row);
return G_SOURCE_REMOVE;
}
static void
-gs_app_review_row_notify_props_changed_cb (GsApp *app,
- GParamSpec *pspec,
- GsAppReviewRow *row)
+gs_review_row_notify_props_changed_cb (GsApp *app,
+ GParamSpec *pspec,
+ GsReviewRow *row)
{
- g_idle_add (gs_app_review_row_refresh_idle, g_object_ref (row));
+ g_idle_add (gs_review_row_refresh_idle, g_object_ref (row));
}
static void
-gs_app_review_row_init (GsAppReviewRow *row)
+gs_review_row_init (GsReviewRow *row)
{
gtk_widget_set_has_window (GTK_WIDGET (row), FALSE);
gtk_widget_init_template (GTK_WIDGET (row));
}
static void
-gs_app_review_row_dispose (GObject *object)
+gs_review_row_dispose (GObject *object)
{
- GsAppReviewRow *row = GS_APP_REVIEW_ROW (object);
+ GsReviewRow *row = GS_REVIEW_ROW (object);
g_clear_object (&row->review);
- G_OBJECT_CLASS (gs_app_review_row_parent_class)->dispose (object);
+ G_OBJECT_CLASS (gs_review_row_parent_class)->dispose (object);
}
static void
-gs_app_review_row_class_init (GsAppReviewRowClass *klass)
+gs_review_row_class_init (GsReviewRowClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
- object_class->dispose = gs_app_review_row_dispose;
+ object_class->dispose = gs_review_row_dispose;
- gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/Software/gs-app-review-row.ui");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/gs-review-row.ui");
- gtk_widget_class_bind_template_child (widget_class, GsAppReviewRow, stars);
- gtk_widget_class_bind_template_child (widget_class, GsAppReviewRow, summary_label);
- gtk_widget_class_bind_template_child (widget_class, GsAppReviewRow, author_label);
- gtk_widget_class_bind_template_child (widget_class, GsAppReviewRow, text_label);
+ gtk_widget_class_bind_template_child (widget_class, GsReviewRow, stars);
+ gtk_widget_class_bind_template_child (widget_class, GsReviewRow, summary_label);
+ gtk_widget_class_bind_template_child (widget_class, GsReviewRow, author_label);
+ gtk_widget_class_bind_template_child (widget_class, GsReviewRow, text_label);
}
/**
- * gs_app_review_row_new:
+ * gs_review_row_new:
* @review: The review to show
*
* Create a widget suitable for showing an application review.
*
- * Return value: A new @GsAppReviewRow.
+ * Return value: A new @GsReviewRow.
**/
GtkWidget *
-gs_app_review_row_new (GsAppReview *review)
+gs_review_row_new (GsReview *review)
{
- GsAppReviewRow *row;
+ GsReviewRow *row;
- g_return_val_if_fail (GS_IS_APP_REVIEW (review), NULL);
+ g_return_val_if_fail (GS_IS_REVIEW (review), NULL);
- row = g_object_new (GS_TYPE_APP_REVIEW_ROW, NULL);
+ row = g_object_new (GS_TYPE_REVIEW_ROW, NULL);
row->review = g_object_ref (review);
g_signal_connect_object (row->review, "notify::state",
- G_CALLBACK (gs_app_review_row_notify_props_changed_cb),
+ G_CALLBACK (gs_review_row_notify_props_changed_cb),
row, 0);
- gs_app_review_row_refresh (row);
+ gs_review_row_refresh (row);
return GTK_WIDGET (row);
}
diff --git a/src/gs-app-review-row.h b/src/gs-review-row.h
similarity index 74%
rename from src/gs-app-review-row.h
rename to src/gs-review-row.h
index 4d0ad1b..3ed6aa7 100644
--- a/src/gs-app-review-row.h
+++ b/src/gs-review-row.h
@@ -19,23 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef GS_APP_REVIEW_ROW_H
-#define GS_APP_REVIEW_ROW_H
+#ifndef GS_REVIEW_ROW_H
+#define GS_REVIEW_ROW_H
#include <gtk/gtk.h>
-#include "gs-app-review.h"
+#include "gs-review.h"
G_BEGIN_DECLS
-#define GS_TYPE_APP_REVIEW_ROW (gs_app_review_row_get_type ())
+#define GS_TYPE_REVIEW_ROW (gs_review_row_get_type ())
-G_DECLARE_FINAL_TYPE (GsAppReviewRow, gs_app_review_row, GS, APP_REVIEW_ROW, GtkListBoxRow)
+G_DECLARE_FINAL_TYPE (GsReviewRow, gs_review_row, GS, REVIEW_ROW, GtkListBoxRow)
-GtkWidget *gs_app_review_row_new (GsAppReview *review);
+GtkWidget *gs_review_row_new (GsReview *review);
G_END_DECLS
-#endif /* GS_APP_REVIEW_ROW_H */
+#endif /* GS_REVIEW_ROW_H */
/* vim: set noexpandtab: */
diff --git a/src/gs-app-review-row.ui b/src/gs-review-row.ui
similarity index 97%
rename from src/gs-app-review-row.ui
rename to src/gs-review-row.ui
index 6032f2d..44f95ca 100644
--- a/src/gs-app-review-row.ui
+++ b/src/gs-review-row.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.10 -->
- <template class="GsAppReviewRow" parent="GtkListBoxRow">
+ <template class="GsReviewRow" parent="GtkListBoxRow">
<property name="visible">True</property>
<child>
<object class="GtkGrid" id="grid">
diff --git a/src/gs-app-review.c b/src/gs-review.c
similarity index 57%
rename from src/gs-app-review.c
rename to src/gs-review.c
index 933288f..d6d5bbe 100644
--- a/src/gs-app-review.c
+++ b/src/gs-review.c
@@ -21,9 +21,9 @@
#include "config.h"
-#include "gs-app-review.h"
+#include "gs-review.h"
-struct _GsAppReview
+struct _GsReview
{
GObject parent_instance;
@@ -46,138 +46,138 @@ enum {
PROP_LAST
};
-G_DEFINE_TYPE (GsAppReview, gs_app_review, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GsReview, gs_review, G_TYPE_OBJECT)
/**
- * gs_app_review_get_summary:
+ * gs_review_get_summary:
*/
const gchar *
-gs_app_review_get_summary (GsAppReview *review)
+gs_review_get_summary (GsReview *review)
{
- g_return_val_if_fail (GS_IS_APP_REVIEW (review), NULL);
+ g_return_val_if_fail (GS_IS_REVIEW (review), NULL);
return review->summary;
}
/**
- * gs_app_review_set_summary:
+ * gs_review_set_summary:
*/
void
-gs_app_review_set_summary (GsAppReview *review, const gchar *summary)
+gs_review_set_summary (GsReview *review, const gchar *summary)
{
- g_return_if_fail (GS_IS_APP_REVIEW (review));
+ g_return_if_fail (GS_IS_REVIEW (review));
g_free (review->summary);
review->summary = g_strdup (summary);
}
/**
- * gs_app_review_get_text:
+ * gs_review_get_text:
**/
const gchar *
-gs_app_review_get_text (GsAppReview *review)
+gs_review_get_text (GsReview *review)
{
- g_return_val_if_fail (GS_IS_APP_REVIEW (review), NULL);
+ g_return_val_if_fail (GS_IS_REVIEW (review), NULL);
return review->text;
}
/**
- * gs_app_review_set_text:
+ * gs_review_set_text:
*/
void
-gs_app_review_set_text (GsAppReview *review, const gchar *text)
+gs_review_set_text (GsReview *review, const gchar *text)
{
- g_return_if_fail (GS_IS_APP_REVIEW (review));
+ g_return_if_fail (GS_IS_REVIEW (review));
g_free (review->text);
review->text = g_strdup (text);
}
/**
- * gs_app_review_get_rating:
+ * gs_review_get_rating:
*/
gint
-gs_app_review_get_rating (GsAppReview *review)
+gs_review_get_rating (GsReview *review)
{
- g_return_val_if_fail (GS_IS_APP_REVIEW (review), -1);
+ g_return_val_if_fail (GS_IS_REVIEW (review), -1);
return review->rating;
}
/**
- * gs_app_review_set_rating:
+ * gs_review_set_rating:
*/
void
-gs_app_review_set_rating (GsAppReview *review, gint rating)
+gs_review_set_rating (GsReview *review, gint rating)
{
- g_return_if_fail (GS_IS_APP_REVIEW (review));
+ g_return_if_fail (GS_IS_REVIEW (review));
review->rating = rating;
}
/**
- * gs_app_review_get_reviewer:
+ * gs_review_get_reviewer:
**/
const gchar *
-gs_app_review_get_reviewer (GsAppReview *review)
+gs_review_get_reviewer (GsReview *review)
{
- g_return_val_if_fail (GS_IS_APP_REVIEW (review), NULL);
+ g_return_val_if_fail (GS_IS_REVIEW (review), NULL);
return review->reviewer;
}
/**
- * gs_app_review_set_version:
+ * gs_review_set_version:
*/
void
-gs_app_review_set_version (GsAppReview *review, const gchar *version)
+gs_review_set_version (GsReview *review, const gchar *version)
{
- g_return_if_fail (GS_IS_APP_REVIEW (review));
+ g_return_if_fail (GS_IS_REVIEW (review));
g_free (review->version);
review->version = g_strdup (version);
}
/**
- * gs_app_review_get_version:
+ * gs_review_get_version:
**/
const gchar *
-gs_app_review_get_version (GsAppReview *review)
+gs_review_get_version (GsReview *review)
{
- g_return_val_if_fail (GS_IS_APP_REVIEW (review), NULL);
+ g_return_val_if_fail (GS_IS_REVIEW (review), NULL);
return review->version;
}
/**
- * gs_app_review_set_reviewer:
+ * gs_review_set_reviewer:
*/
void
-gs_app_review_set_reviewer (GsAppReview *review, const gchar *reviewer)
+gs_review_set_reviewer (GsReview *review, const gchar *reviewer)
{
- g_return_if_fail (GS_IS_APP_REVIEW (review));
+ g_return_if_fail (GS_IS_REVIEW (review));
g_free (review->reviewer);
review->reviewer = g_strdup (reviewer);
}
/**
- * gs_app_review_get_date:
+ * gs_review_get_date:
**/
GDateTime *
-gs_app_review_get_date (GsAppReview *review)
+gs_review_get_date (GsReview *review)
{
- g_return_val_if_fail (GS_IS_APP_REVIEW (review), NULL);
+ g_return_val_if_fail (GS_IS_REVIEW (review), NULL);
return review->date;
}
/**
- * gs_app_review_set_date:
+ * gs_review_set_date:
*/
void
-gs_app_review_set_date (GsAppReview *review, GDateTime *date)
+gs_review_set_date (GsReview *review, GDateTime *date)
{
- g_return_if_fail (GS_IS_APP_REVIEW (review));
+ g_return_if_fail (GS_IS_REVIEW (review));
g_clear_pointer (&review->date, g_date_time_unref);
if (date)
review->date = g_date_time_ref (date);
}
static void
-gs_app_review_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+gs_review_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{
- GsAppReview *review = GS_APP_REVIEW (object);
+ GsReview *review = GS_REVIEW (object);
switch (prop_id) {
case PROP_SUMMARY:
@@ -205,28 +205,28 @@ gs_app_review_get_property (GObject *object, guint prop_id, GValue *value, GPara
}
static void
-gs_app_review_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+gs_review_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
- GsAppReview *review = GS_APP_REVIEW (object);
+ GsReview *review = GS_REVIEW (object);
switch (prop_id) {
case PROP_SUMMARY:
- gs_app_review_set_summary (review, g_value_get_string (value));
+ gs_review_set_summary (review, g_value_get_string (value));
break;
case PROP_TEXT:
- gs_app_review_set_text (review, g_value_get_string (value));
+ gs_review_set_text (review, g_value_get_string (value));
break;
case PROP_RATING:
- gs_app_review_set_rating (review, g_value_get_int (value));
+ gs_review_set_rating (review, g_value_get_int (value));
break;
case PROP_VERSION:
- gs_app_review_set_version (review, g_value_get_string (value));
+ gs_review_set_version (review, g_value_get_string (value));
break;
case PROP_REVIEWER:
- gs_app_review_set_reviewer (review, g_value_get_string (value));
+ gs_review_set_reviewer (review, g_value_get_string (value));
break;
case PROP_DATE:
- gs_app_review_set_date (review, g_value_get_object (value));
+ gs_review_set_date (review, g_value_get_object (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -235,36 +235,36 @@ gs_app_review_set_property (GObject *object, guint prop_id, const GValue *value,
}
static void
-gs_app_review_dispose (GObject *object)
+gs_review_dispose (GObject *object)
{
- GsAppReview *review = GS_APP_REVIEW (object);
+ GsReview *review = GS_REVIEW (object);
g_clear_pointer (&review->date, g_date_time_unref);
- G_OBJECT_CLASS (gs_app_review_parent_class)->dispose (object);
+ G_OBJECT_CLASS (gs_review_parent_class)->dispose (object);
}
static void
-gs_app_review_finalize (GObject *object)
+gs_review_finalize (GObject *object)
{
- GsAppReview *review = GS_APP_REVIEW (object);
+ GsReview *review = GS_REVIEW (object);
g_free (review->summary);
g_free (review->text);
g_free (review->reviewer);
- G_OBJECT_CLASS (gs_app_review_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gs_review_parent_class)->finalize (object);
}
static void
-gs_app_review_class_init (GsAppReviewClass *klass)
+gs_review_class_init (GsReviewClass *klass)
{
GParamSpec *pspec;
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->dispose = gs_app_review_dispose;
- object_class->finalize = gs_app_review_finalize;
- object_class->get_property = gs_app_review_get_property;
- object_class->set_property = gs_app_review_set_property;
+ object_class->dispose = gs_review_dispose;
+ object_class->finalize = gs_review_finalize;
+ object_class->get_property = gs_review_get_property;
+ object_class->set_property = gs_review_set_property;
/**
* GsApp:summary:
@@ -310,28 +310,28 @@ gs_app_review_class_init (GsAppReviewClass *klass)
* GsApp:date:
*/
pspec = g_param_spec_object ("date", NULL, NULL,
- GS_TYPE_APP_REVIEW,
+ GS_TYPE_REVIEW,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
g_object_class_install_property (object_class, PROP_DATE, pspec);
}
static void
-gs_app_review_init (GsAppReview *review)
+gs_review_init (GsReview *review)
{
review->rating = -1;
}
/**
- * gs_app_review_new:
+ * gs_review_new:
*
- * Return value: a new #GsAppReview object.
+ * Return value: a new #GsReview object.
**/
-GsAppReview *
-gs_app_review_new (void)
+GsReview *
+gs_review_new (void)
{
- GsAppReview *review;
- review = g_object_new (GS_TYPE_APP_REVIEW, NULL);
- return GS_APP_REVIEW (review);
+ GsReview *review;
+ review = g_object_new (GS_TYPE_REVIEW, NULL);
+ return GS_REVIEW (review);
}
/* vim: set noexpandtab: */
diff --git a/src/gs-review.h b/src/gs-review.h
new file mode 100644
index 0000000..3172fd5
--- /dev/null
+++ b/src/gs-review.h
@@ -0,0 +1,63 @@
+ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2016 Canonical Ltd.
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef __GS_REVIEW_H
+#define __GS_REVIEW_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define GS_TYPE_REVIEW (gs_review_get_type ())
+
+G_DECLARE_FINAL_TYPE (GsReview, gs_review, GS, REVIEW, GObject)
+
+GsReview *gs_review_new (void);
+
+const gchar *gs_review_get_summary (GsReview *review);
+void gs_review_set_summary (GsReview *review,
+ const gchar *summary);
+
+const gchar *gs_review_get_text (GsReview *review);
+void gs_review_set_text (GsReview *review,
+ const gchar *text);
+
+gint gs_review_get_rating (GsReview *review);
+void gs_review_set_rating (GsReview *review,
+ gint rating);
+
+const gchar *gs_review_get_version (GsReview *review);
+void gs_review_set_version (GsReview *review,
+ const gchar *version);
+
+const gchar *gs_review_get_reviewer (GsReview *review);
+void gs_review_set_reviewer (GsReview *review,
+ const gchar *reviewer);
+
+GDateTime *gs_review_get_date (GsReview *review);
+void gs_review_set_date (GsReview *review,
+ GDateTime *date);
+
+G_END_DECLS
+
+#endif /* __GS_REVIEW_H */
+
+/* vim: set noexpandtab: */
diff --git a/src/gs-shell-details.c b/src/gs-shell-details.c
index 4e117c4..5ffcb89 100644
--- a/src/gs-shell-details.c
+++ b/src/gs-shell-details.c
@@ -34,8 +34,8 @@
#include "gs-screenshot-image.h"
#include "gs-progress-button.h"
#include "gs-star-widget.h"
-#include "gs-app-review-dialog.h"
-#include "gs-app-review-row.h"
+#include "gs-review-dialog.h"
+#include "gs-review-row.h"
typedef enum {
GS_SHELL_DETAILS_STATE_LOADING,
@@ -968,12 +968,12 @@ gs_shell_details_refresh_reviews (GsShellDetails *self)
reviews = gs_app_get_reviews (self->app);
for (i = 0; i < reviews->len; i++) {
- GsAppReview *review;
+ GsReview *review;
GtkWidget *row;
review = g_ptr_array_index (reviews, i);
- row = gs_app_review_row_new (review);
+ row = gs_review_row_new (review);
gtk_container_add (GTK_CONTAINER (self->list_box_reviews), row);
gtk_widget_show (row);
@@ -1349,23 +1349,23 @@ gs_shell_details_write_review_cb (GtkButton *button,
GtkWidget *dialog;
GtkResponseType response;
- dialog = gs_app_review_dialog_new ();
+ dialog = gs_review_dialog_new ();
gtk_window_set_transient_for (GTK_WINDOW (dialog), gs_shell_get_window (self->shell));
response = gtk_dialog_run (GTK_DIALOG (dialog));
if (response == GTK_RESPONSE_OK) {
- g_autoptr(GsAppReview) review = NULL;
+ g_autoptr(GsReview) review = NULL;
g_autoptr(GDateTime) now = NULL;
g_autofree gchar *text = NULL;
- review = gs_app_review_new ();
- gs_app_review_set_summary (review, gs_app_review_dialog_get_summary (GS_APP_REVIEW_DIALOG
(dialog)));
- text = gs_app_review_dialog_get_text (GS_APP_REVIEW_DIALOG (dialog));
- gs_app_review_set_text (review, text);
- gs_app_review_set_rating (review, gs_app_review_dialog_get_rating (GS_APP_REVIEW_DIALOG
(dialog)));
- gs_app_review_set_version (review, gs_app_get_version (self->app));
+ review = gs_review_new ();
+ gs_review_set_summary (review, gs_review_dialog_get_summary (GS_REVIEW_DIALOG (dialog)));
+ text = gs_review_dialog_get_text (GS_REVIEW_DIALOG (dialog));
+ gs_review_set_text (review, text);
+ gs_review_set_rating (review, gs_review_dialog_get_rating (GS_REVIEW_DIALOG (dialog)));
+ gs_review_set_version (review, gs_app_get_version (self->app));
now = g_date_time_new_now_local ();
- gs_app_review_set_date (review, now);
+ gs_review_set_date (review, now);
/* call into the plugins to set the new value */
gs_app_set_self_review (self->app, review);
diff --git a/src/plugins/gs-plugin-ubuntu-reviews.c b/src/plugins/gs-plugin-ubuntu-reviews.c
index 6377518..8d7d129 100644
--- a/src/plugins/gs-plugin-ubuntu-reviews.c
+++ b/src/plugins/gs-plugin-ubuntu-reviews.c
@@ -490,10 +490,10 @@ parse_date_time (const gchar *text)
return g_date_time_new_utc (values[0], values[1], values[2], values[3], values[4], values[5]);
}
-static GsAppReview *
+static GsReview *
parse_review (JsonNode *node)
{
- GsAppReview *review;
+ GsReview *review;
JsonObject *object;
gint64 star_rating;
@@ -502,15 +502,15 @@ parse_review (JsonNode *node)
object = json_node_get_object (node);
- review = gs_app_review_new ();
- gs_app_review_set_reviewer (review, json_object_get_string_member (object, "reviewer_displayname"));
- gs_app_review_set_summary (review, json_object_get_string_member (object, "summary"));
- gs_app_review_set_text (review, json_object_get_string_member (object, "review_text"));
- gs_app_review_set_version (review, json_object_get_string_member (object, "version"));
+ review = gs_review_new ();
+ gs_review_set_reviewer (review, json_object_get_string_member (object, "reviewer_displayname"));
+ gs_review_set_summary (review, json_object_get_string_member (object, "summary"));
+ gs_review_set_text (review, json_object_get_string_member (object, "review_text"));
+ gs_review_set_version (review, json_object_get_string_member (object, "version"));
star_rating = json_object_get_int_member (object, "rating");
if (star_rating > 0)
- gs_app_review_set_rating (review, star_rating * 20);
- gs_app_review_set_date (review, parse_date_time (json_object_get_string_member (object,
"date_created")));
+ gs_review_set_rating (review, star_rating * 20);
+ gs_review_set_date (review, parse_date_time (json_object_get_string_member (object, "date_created")));
return review;
}
@@ -530,7 +530,7 @@ parse_reviews (GsPlugin *plugin, const gchar *text, GsApp *app, GError **error)
goto out;
array = json_node_get_array (json_parser_get_root (parser));
for (i = 0; i < json_array_get_length (array); i++) {
- GsAppReview *review;
+ GsReview *review;
/* Read in from JSON... (skip bad entries) */
review = parse_review (json_array_get_element (array, i));
@@ -724,7 +724,7 @@ set_request (SoupMessage *message, JsonBuilder *builder)
static gboolean
send_review (GsPlugin *plugin,
- GsAppReview *review,
+ GsReview *review,
const gchar *package_name,
const gchar *consumer_key,
const gchar *consumer_secret,
@@ -740,7 +740,7 @@ send_review (GsPlugin *plugin,
guint status_code;
/* Ubuntu reviews require a summary and description - just make one up for now */
- rating = gs_app_review_get_rating (review);
+ rating = gs_review_get_rating (review);
if (rating > 80)
n_stars = 5;
else if (rating > 60)
@@ -758,12 +758,12 @@ send_review (GsPlugin *plugin,
builder = json_builder_new ();
json_builder_begin_object (builder);
add_string_member (builder, "package_name", package_name);
- add_string_member (builder, "summary", gs_app_review_get_summary (review));
- add_string_member (builder, "review_text", gs_app_review_get_text (review));
+ add_string_member (builder, "summary", gs_review_get_summary (review));
+ add_string_member (builder, "review_text", gs_review_get_text (review));
add_string_member (builder, "language", "en"); // FIXME
add_string_member (builder, "origin", "ubuntu"); // FIXME gs_app_get_origin (app));
add_string_member (builder, "distroseries", "xenial"); // FIXME
- add_string_member (builder, "version", gs_app_review_get_version (review));
+ add_string_member (builder, "version", gs_review_get_version (review));
add_int_member (builder, "rating", n_stars);
add_string_member (builder, "arch_tag", "amd64"); // FIXME
json_builder_end_object (builder);
@@ -787,7 +787,7 @@ send_review (GsPlugin *plugin,
typedef struct CredentialsFoundInfo {
GsPlugin *plugin;
- GsAppReview *review;
+ GsReview *review;
gchar *package_name;
} CredentialsFoundInfo;
@@ -826,7 +826,7 @@ credentials_found (CredentialsFoundInfo *info,
static gboolean
set_package_review (GsPlugin *plugin,
- GsAppReview *review,
+ GsReview *review,
const gchar *package_name,
GError **error)
{
@@ -911,7 +911,7 @@ gs_plugin_app_set_review (GsPlugin *plugin,
GCancellable *cancellable,
GError **error)
{
- GsAppReview *review;
+ GsReview *review;
GPtrArray *sources;
const gchar *package_name;
gboolean ret;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
