[gnome-software/wip/ubuntu-changes: 87/87] Merge branch 'gnome-3-20' into wip/ubuntu-changes
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/ubuntu-changes: 87/87] Merge branch 'gnome-3-20' into wip/ubuntu-changes
- Date: Fri, 13 May 2016 02:18:01 +0000 (UTC)
commit 7889cd2e0df40d49af3ed6e6a21a9979c89016a5
Merge: a29762f ba27295
Author: Robert Ancell <robert ancell canonical com>
Date: Fri May 13 13:32:11 2016 +1200
Merge branch 'gnome-3-20' into wip/ubuntu-changes
RELEASE | 6 +-
configure.ac | 6 +-
data/Makefile.am | 3 +-
data/appdata/org.gnome.Software.appdata.xml.in | 11 +
doc/kudos.md | 42 +-
doc/update-fedora-tagger.sh | 1 -
po/LINGUAS | 2 +
po/POTFILES.in | 13 +-
po/fur.po | 2814 ++++++++++++++++++++
po/ja.po | 655 +++--
po/pt_BR.po | 55 +-
po/ru.po | 130 +-
po/sr.po | 16 +-
po/tg.po | 2743 +++++++++++++++++++
po/zh_CN.po | 1853 +++++++++----
po/zh_TW.po | 55 +-
src/Makefile.am | 24 +-
src/gnome-software-service.desktop.in | 2 +-
src/gnome-software.gresource.xml | 18 +-
src/gs-app-folder-dialog.c | 2 +-
...pp-folder-dialog.ui => gs-app-folder-dialog.ui} | 0
src/gs-app-row.c | 12 +-
src/gs-app-tile.c | 2 +-
src/{app-tile.ui => gs-app-tile.ui} | 0
src/gs-app.c | 387 ++--
src/gs-app.h | 17 +-
src/gs-application.c | 4 +-
src/gs-category-tile.c | 2 +-
src/{category-tile.ui => gs-category-tile.ui} | 0
src/gs-category.c | 3 +
src/gs-cmd.c | 30 +-
src/gs-feature-tile.c | 2 +-
src/{feature-tile.ui => gs-feature-tile.ui} | 0
src/{menus.ui => gs-menus.ui} | 0
src/gs-page.c | 28 +
src/gs-plugin-loader-sync.c | 1 -
src/gs-plugin-loader.c | 491 ++--
src/gs-plugin-loader.h | 8 +-
src/gs-plugin.c | 137 +
src/gs-plugin.h | 59 +-
src/gs-popular-tile.c | 2 +-
src/{popular-tile.ui => gs-popular-tile.ui} | 0
src/gs-screenshot-image.c | 12 +-
...{screenshot-image.ui => gs-screenshot-image.ui} | 0
src/gs-self-test.c | 829 +++----
src/gs-shell-details.c | 37 +-
src/gs-shell-details.ui | 8 +-
src/gs-shell-extras.c | 1 -
src/gs-shell-installed.c | 9 +-
src/gs-shell-moderate.c | 2 +-
src/gs-shell-search.c | 2 +-
src/gs-shell-updates.c | 53 +-
src/gs-shell.c | 20 +-
src/gs-update-dialog.c | 23 +-
src/gs-update-monitor.c | 5 +-
src/gs-upgrade-banner.c | 99 +-
src/gs-upgrade-banner.h | 7 +-
src/gs-upgrade-banner.ui | 20 +-
src/gs-utils.c | 116 +-
src/gs-utils.h | 6 +
src/plugins/Makefile.am | 31 +-
src/plugins/gs-appstream.c | 21 +-
src/{ => plugins}/gs-markdown.c | 0
src/{ => plugins}/gs-markdown.h | 0
src/plugins/gs-plugin-appstream.c | 128 +-
src/plugins/gs-plugin-dummy.c | 447 +++-
src/plugins/gs-plugin-epiphany.c | 56 +-
src/plugins/gs-plugin-fedora-distro-upgrades.c | 153 +-
src/plugins/gs-plugin-fedora-tagger-usage.c | 8 +-
src/plugins/gs-plugin-fwupd.c | 98 +-
src/plugins/gs-plugin-hardcoded-blacklist.c | 36 +-
src/plugins/gs-plugin-hardcoded-featured.c | 1 +
src/plugins/gs-plugin-icons.c | 55 +-
src/plugins/gs-plugin-limba.c | 70 +-
src/plugins/gs-plugin-menu-spec-refine.c | 50 +-
src/plugins/gs-plugin-moduleset.c | 8 +-
...s-plugin-xdg-app-reviews.c => gs-plugin-odrs.c} | 202 +-
src/plugins/gs-plugin-packagekit-history.c | 19 +-
src/plugins/gs-plugin-packagekit-offline.c | 2 +-
src/plugins/gs-plugin-packagekit-origin.c | 59 +-
src/plugins/gs-plugin-packagekit-proxy.c | 47 +-
src/plugins/gs-plugin-packagekit-refine.c | 81 +-
src/plugins/gs-plugin-packagekit-refresh.c | 152 +-
src/plugins/gs-plugin-packagekit.c | 89 +-
src/plugins/gs-plugin-provenance.c | 110 +-
src/plugins/gs-plugin-self-test.c | 68 -
src/plugins/gs-plugin-systemd-updates.c | 40 +-
src/plugins/gs-plugin-ubuntu-reviews.c | 48 +-
src/plugins/gs-plugin-xdg-app.c | 250 +--
src/plugins/gs-self-test.c | 185 ++-
src/plugins/menu-spec-common.c | 354 ++--
src/plugins/menu-spec-common.h | 1 +
src/plugins/packagekit-common.c | 74 +-
src/plugins/packagekit-common.h | 1 +
94 files changed, 10407 insertions(+), 3422 deletions(-)
---
diff --cc src/gs-app-row.c
index 623d840,b40dab0..aaff113
--- a/src/gs-app-row.c
+++ b/src/gs-app-row.c
@@@ -85,6 -84,15 +84,17 @@@ gs_app_row_get_description (GsAppRow *a
const gchar *tmp = NULL;
g_autofree gchar *escaped = NULL;
++#if 0
+ /* convert the markdown update description into PangoMarkup */
+ if (priv->show_update &&
+ (gs_app_get_state (priv->app) == AS_APP_STATE_UPDATABLE ||
+ gs_app_get_state (priv->app) == AS_APP_STATE_UPDATABLE_LIVE)) {
+ tmp = gs_app_get_update_details (priv->app);
+ if (tmp != NULL && tmp[0] != '\0')
+ return g_string_new (tmp);
+ }
++#endif
+
if (gs_app_get_state (priv->app) == AS_APP_STATE_UNAVAILABLE)
return g_string_new (gs_app_get_summary_missing (priv->app));
diff --cc src/gs-shell-details.c
index efcb193,7e1982f..3e7884c
--- a/src/gs-shell-details.c
+++ b/src/gs-shell-details.c
@@@ -81,8 -80,7 +81,8 @@@ struct _GsShellDetail
GtkWidget *label_details_category_value;
GtkWidget *label_details_developer_title;
GtkWidget *label_details_developer_value;
- GtkWidget *label_details_licence_title;
- GtkWidget *label_details_licence_value;
++ GtkWidget *label_details_license_title;
+ GtkWidget *label_details_license_value;
GtkWidget *label_details_origin_title;
GtkWidget *label_details_origin_value;
GtkWidget *label_details_size_value;
@@@ -665,19 -662,15 +665,19 @@@ gs_shell_details_refresh_all (GsShellDe
gtk_widget_set_visible (self->label_details_developer_value, TRUE);
}
- /* set the licence */
+ /* set the license */
tmp = gs_app_get_license (self->app);
if (tmp == NULL) {
- /* TRANSLATORS: this is where the licence is not known */
- gtk_label_set_label (GTK_LABEL (self->label_details_licence_value), C_("license", "Unknown"));
- gtk_widget_set_tooltip_text (self->label_details_licence_value, NULL);
- gtk_widget_set_visible (self->label_details_licence_title, FALSE);
- gtk_widget_set_visible (self->label_details_licence_value, FALSE);
+ /* TRANSLATORS: this is where the license is not known */
+ gtk_label_set_label (GTK_LABEL (self->label_details_license_value), C_("license", "Unknown"));
+ gtk_widget_set_tooltip_text (self->label_details_license_value, NULL);
++ gtk_widget_set_visible (self->label_details_license_title, FALSE);
++ gtk_widget_set_visible (self->label_details_license_value, FALSE);
} else {
- gtk_label_set_markup (GTK_LABEL (self->label_details_licence_value), tmp);
- gtk_widget_set_tooltip_text (self->label_details_licence_value, NULL);
- gtk_widget_set_visible (self->label_details_licence_title, TRUE);
- gtk_widget_set_visible (self->label_details_licence_value, TRUE);
+ gtk_label_set_markup (GTK_LABEL (self->label_details_license_value), tmp);
+ gtk_widget_set_tooltip_text (self->label_details_license_value, NULL);
++ gtk_widget_set_visible (self->label_details_license_title, TRUE);
++ gtk_widget_set_visible (self->label_details_license_value, TRUE);
}
/* set version */
@@@ -1609,8 -1594,7 +1613,7 @@@ gs_shell_details_class_init (GsShellDet
gtk_widget_class_bind_template_child (widget_class, GsShellDetails, label_details_category_value);
gtk_widget_class_bind_template_child (widget_class, GsShellDetails, label_details_developer_title);
gtk_widget_class_bind_template_child (widget_class, GsShellDetails, label_details_developer_value);
- gtk_widget_class_bind_template_child (widget_class, GsShellDetails, label_details_licence_title);
- gtk_widget_class_bind_template_child (widget_class, GsShellDetails, label_details_licence_value);
- gtk_widget_class_bind_template_child (widget_class, GsShellDetails, label_details_license_value);
++ gtk_widget_class_bind_template_child (widget_class, GsShellDetails, label_details_license_title);
gtk_widget_class_bind_template_child (widget_class, GsShellDetails, label_details_origin_title);
gtk_widget_class_bind_template_child (widget_class, GsShellDetails, label_details_origin_value);
gtk_widget_class_bind_template_child (widget_class, GsShellDetails, label_details_size_value);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
