Merge lp:~attente/gnome-software/20160331 into lp:~ubuntu-desktop/gnome-software/ubuntu
- 20160331
- Merge into ubuntu
Proposed by
William Hua
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 3 | ||||||||
Proposed branch: | lp:~attente/gnome-software/20160331 | ||||||||
Merge into: | lp:~ubuntu-desktop/gnome-software/ubuntu | ||||||||
Diff against target: |
762 lines (+308/-112) 19 files modified
debian/changelog (+10/-0) debian/patches/appstream-refresh.patch (+2/-2) debian/patches/apt-plugin.patch (+12/-11) debian/patches/dedup-source.patch (+2/-2) debian/patches/disable-update-monitor.patch (+2/-2) debian/patches/fwupd-error.patch (+4/-4) debian/patches/hide-empty-fields.patch (+8/-8) debian/patches/minimal-review-limits.patch (+2/-2) debian/patches/no-daemon.patch (+44/-42) debian/patches/no-history.patch (+4/-4) debian/patches/no-kudo-details.patch (+4/-4) debian/patches/no-notification-actions.patch (+169/-0) debian/patches/no-offline-updates.patch (+2/-2) debian/patches/rename-menu-item.patch (+25/-0) debian/patches/series (+2/-0) debian/patches/software-properties.patch (+5/-19) debian/patches/ubuntu-review-submit.patch (+7/-6) debian/patches/update-descriptions.patch (+2/-2) debian/patches/window-decorations.patch (+2/-2) |
||||||||
To merge this branch: | bzr merge lp:~attente/gnome-software/20160331 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Ancell | Approve | ||
Review via email: mp+290674@code.launchpad.net |
Commit message
* New upstream snapshot
* debian/
- Rename 'Software Sources' menu item to 'Software & Updates'
* debian/
- Disable actions in notifications (LP: #1547608)
Description of the change
* New upstream snapshot
* debian/
- Rename 'Software Sources' menu item to 'Software & Updates'
* debian/
- Disable actions in notifications (LP: #1547608)
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' | |||
2 | --- debian/changelog 2016-03-29 03:47:46 +0000 | |||
3 | +++ debian/changelog 2016-04-01 02:07:57 +0000 | |||
4 | @@ -1,3 +1,13 @@ | |||
5 | 1 | gnome-software (3.20.1~git20160331.78d1aab-0ubuntu1) xenial; urgency=medium | ||
6 | 2 | |||
7 | 3 | * New upstream snapshot | ||
8 | 4 | * debian/patches/rename-menu-item.patch: | ||
9 | 5 | - Rename 'Software Sources' menu item to 'Software & Updates' | ||
10 | 6 | * debian/patches/no-notification-actions.patch: | ||
11 | 7 | - Disable actions in notifications (LP: #1547608) | ||
12 | 8 | |||
13 | 9 | -- William Hua <william.hua@canonical.com> Thu, 31 Mar 2016 21:20:12 -0400 | ||
14 | 10 | |||
15 | 1 | gnome-software (3.20.0-0ubuntu1) xenial; urgency=medium | 11 | gnome-software (3.20.0-0ubuntu1) xenial; urgency=medium |
16 | 2 | 12 | ||
17 | 3 | * New upstream stable release | 13 | * New upstream stable release |
18 | 4 | 14 | ||
19 | === modified file 'debian/patches/appstream-refresh.patch' | |||
20 | --- debian/patches/appstream-refresh.patch 2016-03-29 03:47:46 +0000 | |||
21 | +++ debian/patches/appstream-refresh.patch 2016-04-01 02:07:57 +0000 | |||
22 | @@ -1,7 +1,7 @@ | |||
24 | 1 | From 0c85a65669e611c9c8fd269f380c6cc5f438aff0 Mon Sep 17 00:00:00 2001 | 1 | From 0a70a60744336ec12ff0dcb61997b1e0ec4fdf64 Mon Sep 17 00:00:00 2001 |
25 | 2 | From: William Hua <william.hua@canonical.com> | 2 | From: William Hua <william.hua@canonical.com> |
26 | 3 | Date: Wed, 16 Mar 2016 12:25:53 -0400 | 3 | Date: Wed, 16 Mar 2016 12:25:53 -0400 |
28 | 4 | Subject: [PATCH 15/17] Refresh appstream index if needed | 4 | Subject: [PATCH 15/18] Refresh appstream index if needed |
29 | 5 | 5 | ||
30 | 6 | --- | 6 | --- |
31 | 7 | src/plugins/gs-plugin-appstream.c | 71 +++++++++++++++++++++++++++++++++++++++ | 7 | src/plugins/gs-plugin-appstream.c | 71 +++++++++++++++++++++++++++++++++++++++ |
32 | 8 | 8 | ||
33 | === modified file 'debian/patches/apt-plugin.patch' | |||
34 | --- debian/patches/apt-plugin.patch 2016-03-29 03:47:46 +0000 | |||
35 | +++ debian/patches/apt-plugin.patch 2016-04-01 02:07:57 +0000 | |||
36 | @@ -1,14 +1,14 @@ | |||
38 | 1 | From 71bfaa1cc702705f52fe3e015c7eec588b20b2e6 Mon Sep 17 00:00:00 2001 | 1 | From 789cd3a13775799a13ac77cd1409fc9ec93a7929 Mon Sep 17 00:00:00 2001 |
39 | 2 | From: Robert Ancell <robert.ancell@canonical.com> | 2 | From: Robert Ancell <robert.ancell@canonical.com> |
42 | 3 | Date: Thu, 4 Feb 2016 14:51:21 +1300 | 3 | Date: Thu, 31 Mar 2016 19:56:26 -0400 |
43 | 4 | Subject: [PATCH 09/17] Add an apt plugin that works with aptdaemon | 4 | Subject: [PATCH 09/18] Add an apt plugin that works with aptdaemon |
44 | 5 | 5 | ||
45 | 6 | --- | 6 | --- |
46 | 7 | src/gs-app.c | 9 + | 7 | src/gs-app.c | 9 + |
47 | 8 | src/plugins/Makefile.am | 19 + | 8 | src/plugins/Makefile.am | 19 + |
48 | 9 | src/plugins/com.canonical.Unity.Launcher.xml | 15 + | 9 | src/plugins/com.canonical.Unity.Launcher.xml | 15 + |
51 | 10 | src/plugins/gs-plugin-apt.c | 976 +++++++++++++++++++++++++++ | 10 | src/plugins/gs-plugin-apt.c | 977 +++++++++++++++++++++++++++ |
52 | 11 | 4 files changed, 1019 insertions(+) | 11 | 4 files changed, 1020 insertions(+) |
53 | 12 | create mode 100644 src/plugins/com.canonical.Unity.Launcher.xml | 12 | create mode 100644 src/plugins/com.canonical.Unity.Launcher.xml |
54 | 13 | create mode 100644 src/plugins/gs-plugin-apt.c | 13 | create mode 100644 src/plugins/gs-plugin-apt.c |
55 | 14 | 14 | ||
56 | @@ -33,7 +33,7 @@ | |||
57 | 33 | if (g_str_has_prefix (tokens[i], "@")) { | 33 | if (g_str_has_prefix (tokens[i], "@")) { |
58 | 34 | g_string_append_printf (urld, | 34 | g_string_append_printf (urld, |
59 | 35 | diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am | 35 | diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am |
61 | 36 | index b8d16fb..4791b89 100644 | 36 | index bc4dd98..db0c971 100644 |
62 | 37 | --- a/src/plugins/Makefile.am | 37 | --- a/src/plugins/Makefile.am |
63 | 38 | +++ b/src/plugins/Makefile.am | 38 | +++ b/src/plugins/Makefile.am |
64 | 39 | @@ -31,6 +31,7 @@ noinst_LTLIBRARIES = \ | 39 | @@ -31,6 +31,7 @@ noinst_LTLIBRARIES = \ |
65 | @@ -44,7 +44,7 @@ | |||
66 | 44 | libgs_plugin_appstream.la \ | 44 | libgs_plugin_appstream.la \ |
67 | 45 | libgs_plugin_dummy.la \ | 45 | libgs_plugin_dummy.la \ |
68 | 46 | libgs_plugin_hardcoded-featured.la \ | 46 | libgs_plugin_hardcoded-featured.la \ |
70 | 47 | @@ -132,6 +133,24 @@ libgs_plugin_xdg_app_reviews_la_LDFLAGS = -module -avoid-version | 47 | @@ -135,6 +136,24 @@ libgs_plugin_xdg_app_reviews_la_LDFLAGS = -module -avoid-version |
71 | 48 | libgs_plugin_xdg_app_reviews_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS) | 48 | libgs_plugin_xdg_app_reviews_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS) |
72 | 49 | endif | 49 | endif |
73 | 50 | 50 | ||
74 | @@ -71,7 +71,7 @@ | |||
75 | 71 | gs-moduleset.h \ | 71 | gs-moduleset.h \ |
76 | 72 | diff --git a/src/plugins/com.canonical.Unity.Launcher.xml b/src/plugins/com.canonical.Unity.Launcher.xml | 72 | diff --git a/src/plugins/com.canonical.Unity.Launcher.xml b/src/plugins/com.canonical.Unity.Launcher.xml |
77 | 73 | new file mode 100644 | 73 | new file mode 100644 |
79 | 74 | index 0000000..b0d7915 | 74 | index 0000000..b631a2d |
80 | 75 | --- /dev/null | 75 | --- /dev/null |
81 | 76 | +++ b/src/plugins/com.canonical.Unity.Launcher.xml | 76 | +++ b/src/plugins/com.canonical.Unity.Launcher.xml |
82 | 77 | @@ -0,0 +1,15 @@ | 77 | @@ -0,0 +1,15 @@ |
83 | @@ -83,7 +83,7 @@ | |||
84 | 83 | + <arg type='s' name='appstream_app_id' direction='in'/> | 83 | + <arg type='s' name='appstream_app_id' direction='in'/> |
85 | 84 | + <arg type='s' name='aptdaemon_task' direction='in'/> | 84 | + <arg type='s' name='aptdaemon_task' direction='in'/> |
86 | 85 | + </method> | 85 | + </method> |
88 | 86 | + | 86 | + |
89 | 87 | + <method name='UpdateLauncherIconFavoriteState'> | 87 | + <method name='UpdateLauncherIconFavoriteState'> |
90 | 88 | + <arg type='s' name='icon_uri' direction='in'/> | 88 | + <arg type='s' name='icon_uri' direction='in'/> |
91 | 89 | + <arg type='b' name='is_sticky' direction='in'/> | 89 | + <arg type='b' name='is_sticky' direction='in'/> |
92 | @@ -92,10 +92,10 @@ | |||
93 | 92 | +</node> | 92 | +</node> |
94 | 93 | diff --git a/src/plugins/gs-plugin-apt.c b/src/plugins/gs-plugin-apt.c | 93 | diff --git a/src/plugins/gs-plugin-apt.c b/src/plugins/gs-plugin-apt.c |
95 | 94 | new file mode 100644 | 94 | new file mode 100644 |
97 | 95 | index 0000000..d5c54f1 | 95 | index 0000000..d9af67a |
98 | 96 | --- /dev/null | 96 | --- /dev/null |
99 | 97 | +++ b/src/plugins/gs-plugin-apt.c | 97 | +++ b/src/plugins/gs-plugin-apt.c |
101 | 98 | @@ -0,0 +1,976 @@ | 98 | @@ -0,0 +1,977 @@ |
102 | 99 | +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- | 99 | +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- |
103 | 100 | + * | 100 | + * |
104 | 101 | + * Copyright (C) 2016 Canonical Ltd | 101 | + * Copyright (C) 2016 Canonical Ltd |
105 | @@ -1067,6 +1067,7 @@ | |||
106 | 1067 | + gs_app_set_management_plugin (app, "dpkg"); | 1067 | + gs_app_set_management_plugin (app, "dpkg"); |
107 | 1068 | + gs_app_add_source (app, tokens[0]); | 1068 | + gs_app_add_source (app, tokens[0]); |
108 | 1069 | + gs_app_set_origin (app, path); | 1069 | + gs_app_set_origin (app, path); |
109 | 1070 | + gs_app_set_kind (app, AS_APP_KIND_GENERIC); | ||
110 | 1070 | + | 1071 | + |
111 | 1071 | + gs_plugin_add_app (list, app); | 1072 | + gs_plugin_add_app (list, app); |
112 | 1072 | + | 1073 | + |
113 | 1073 | 1074 | ||
114 | === modified file 'debian/patches/dedup-source.patch' | |||
115 | --- debian/patches/dedup-source.patch 2016-03-29 03:47:46 +0000 | |||
116 | +++ debian/patches/dedup-source.patch 2016-04-01 02:07:57 +0000 | |||
117 | @@ -1,7 +1,7 @@ | |||
119 | 1 | From 0b15cf42a472bb0cba1980e63674b47ac8af000e Mon Sep 17 00:00:00 2001 | 1 | From e2ff62a7b9d4f93acdffc03c0f0ad1e30c89e919 Mon Sep 17 00:00:00 2001 |
120 | 2 | From: Robert Ancell <robert.ancell@canonical.com> | 2 | From: Robert Ancell <robert.ancell@canonical.com> |
121 | 3 | Date: Wed, 17 Feb 2016 11:31:07 -0800 | 3 | Date: Wed, 17 Feb 2016 11:31:07 -0800 |
123 | 4 | Subject: [PATCH 10/17] De-dup based on source | 4 | Subject: [PATCH 10/18] De-dup based on source |
124 | 5 | 5 | ||
125 | 6 | --- | 6 | --- |
126 | 7 | src/gs-plugin.c | 13 ++++++++++--- | 7 | src/gs-plugin.c | 13 ++++++++++--- |
127 | 8 | 8 | ||
128 | === modified file 'debian/patches/disable-update-monitor.patch' | |||
129 | --- debian/patches/disable-update-monitor.patch 2016-03-29 03:47:46 +0000 | |||
130 | +++ debian/patches/disable-update-monitor.patch 2016-04-01 02:07:57 +0000 | |||
131 | @@ -1,7 +1,7 @@ | |||
133 | 1 | From ab8336e889e136b97d5c1490ac52f98143921901 Mon Sep 17 00:00:00 2001 | 1 | From 205e51b284dabc8ac68b0365918c77469cdd4eaf Mon Sep 17 00:00:00 2001 |
134 | 2 | From: William Hua <william.hua@canonical.com> | 2 | From: William Hua <william.hua@canonical.com> |
135 | 3 | Date: Mon, 7 Mar 2016 09:13:07 -0500 | 3 | Date: Mon, 7 Mar 2016 09:13:07 -0500 |
137 | 4 | Subject: [PATCH 04/17] Manually disable update monitor | 4 | Subject: [PATCH 04/18] Manually disable update monitor |
138 | 5 | 5 | ||
139 | 6 | Ubuntu already has update-manager for this. This is an Ubuntu-specific change | 6 | Ubuntu already has update-manager for this. This is an Ubuntu-specific change |
140 | 7 | and should remain downstream. | 7 | and should remain downstream. |
141 | 8 | 8 | ||
142 | === modified file 'debian/patches/fwupd-error.patch' | |||
143 | --- debian/patches/fwupd-error.patch 2016-03-29 03:47:46 +0000 | |||
144 | +++ debian/patches/fwupd-error.patch 2016-04-01 02:07:57 +0000 | |||
145 | @@ -1,17 +1,17 @@ | |||
147 | 1 | From 79b5ed39606c6032f19260cc6588a80d2f3e9344 Mon Sep 17 00:00:00 2001 | 1 | From 07b280fafa4f92c9b5cec14701af8b3790e6b2c3 Mon Sep 17 00:00:00 2001 |
148 | 2 | From: William Hua <william.hua@canonical.com> | 2 | From: William Hua <william.hua@canonical.com> |
149 | 3 | Date: Wed, 16 Mar 2016 15:03:42 -0400 | 3 | Date: Wed, 16 Mar 2016 15:03:42 -0400 |
151 | 4 | Subject: [PATCH 14/17] Set error when org.freedesktop.fwupd has no service | 4 | Subject: [PATCH 14/18] Set error when org.freedesktop.fwupd has no service |
152 | 5 | 5 | ||
153 | 6 | --- | 6 | --- |
154 | 7 | src/plugins/gs-plugin-fwupd.c | 5 ++++- | 7 | src/plugins/gs-plugin-fwupd.c | 5 ++++- |
155 | 8 | 1 file changed, 4 insertions(+), 1 deletion(-) | 8 | 1 file changed, 4 insertions(+), 1 deletion(-) |
156 | 9 | 9 | ||
157 | 10 | diff --git a/src/plugins/gs-plugin-fwupd.c b/src/plugins/gs-plugin-fwupd.c | 10 | diff --git a/src/plugins/gs-plugin-fwupd.c b/src/plugins/gs-plugin-fwupd.c |
159 | 11 | index fa28c02..1d8e3d4 100644 | 11 | index a2bfd9a..312dfcd 100644 |
160 | 12 | --- a/src/plugins/gs-plugin-fwupd.c | 12 | --- a/src/plugins/gs-plugin-fwupd.c |
161 | 13 | +++ b/src/plugins/gs-plugin-fwupd.c | 13 | +++ b/src/plugins/gs-plugin-fwupd.c |
163 | 14 | @@ -485,7 +485,10 @@ gs_plugin_add_updates (GsPlugin *plugin, | 14 | @@ -496,7 +496,10 @@ gs_plugin_add_updates (GsPlugin *plugin, |
164 | 15 | G_DBUS_ERROR, | 15 | G_DBUS_ERROR, |
165 | 16 | G_DBUS_ERROR_SERVICE_UNKNOWN)) { | 16 | G_DBUS_ERROR_SERVICE_UNKNOWN)) { |
166 | 17 | /* the fwupd service might be unavailable, continue in that case */ | 17 | /* the fwupd service might be unavailable, continue in that case */ |
167 | 18 | 18 | ||
168 | === modified file 'debian/patches/hide-empty-fields.patch' | |||
169 | --- debian/patches/hide-empty-fields.patch 2016-03-29 03:47:46 +0000 | |||
170 | +++ debian/patches/hide-empty-fields.patch 2016-04-01 02:07:57 +0000 | |||
171 | @@ -1,7 +1,7 @@ | |||
173 | 1 | From 74228765054a43b9264a9c140f6cb66bb9c97f5d Mon Sep 17 00:00:00 2001 | 1 | From 922fe1c5766c4b6df3d2867255483227ed79e9b1 Mon Sep 17 00:00:00 2001 |
174 | 2 | From: Robert Ancell <robert.ancell@canonical.com> | 2 | From: Robert Ancell <robert.ancell@canonical.com> |
175 | 3 | Date: Tue, 29 Mar 2016 11:30:08 +1300 | 3 | Date: Tue, 29 Mar 2016 11:30:08 +1300 |
177 | 4 | Subject: [PATCH 01/17] Hide licence, updated and category fields if they | 4 | Subject: [PATCH 01/18] Hide licence, updated and category fields if they |
178 | 5 | aren't set | 5 | aren't set |
179 | 6 | 6 | ||
180 | 7 | --- | 7 | --- |
181 | @@ -9,7 +9,7 @@ | |||
182 | 9 | 1 file changed, 19 insertions(+) | 9 | 1 file changed, 19 insertions(+) |
183 | 10 | 10 | ||
184 | 11 | diff --git a/src/gs-shell-details.c b/src/gs-shell-details.c | 11 | diff --git a/src/gs-shell-details.c b/src/gs-shell-details.c |
186 | 12 | index 9caa854..9540ab7 100644 | 12 | index 1d59993..4b6ebf5 100644 |
187 | 13 | --- a/src/gs-shell-details.c | 13 | --- a/src/gs-shell-details.c |
188 | 14 | +++ b/src/gs-shell-details.c | 14 | +++ b/src/gs-shell-details.c |
189 | 15 | @@ -77,13 +77,16 @@ struct _GsShellDetails | 15 | @@ -77,13 +77,16 @@ struct _GsShellDetails |
190 | @@ -29,7 +29,7 @@ | |||
191 | 29 | GtkWidget *label_details_updated_value; | 29 | GtkWidget *label_details_updated_value; |
192 | 30 | GtkWidget *label_details_version_value; | 30 | GtkWidget *label_details_version_value; |
193 | 31 | GtkWidget *label_failed; | 31 | GtkWidget *label_failed; |
195 | 32 | @@ -651,9 +654,13 @@ gs_shell_details_refresh_all (GsShellDetails *self) | 32 | @@ -668,9 +671,13 @@ gs_shell_details_refresh_all (GsShellDetails *self) |
196 | 33 | /* TRANSLATORS: this is where the licence is not known */ | 33 | /* TRANSLATORS: this is where the licence is not known */ |
197 | 34 | gtk_label_set_label (GTK_LABEL (self->label_details_licence_value), C_("license", "Unknown")); | 34 | gtk_label_set_label (GTK_LABEL (self->label_details_licence_value), C_("license", "Unknown")); |
198 | 35 | gtk_widget_set_tooltip_text (self->label_details_licence_value, NULL); | 35 | gtk_widget_set_tooltip_text (self->label_details_licence_value, NULL); |
199 | @@ -43,7 +43,7 @@ | |||
200 | 43 | } | 43 | } |
201 | 44 | 44 | ||
202 | 45 | /* set version */ | 45 | /* set version */ |
204 | 46 | @@ -683,13 +690,18 @@ gs_shell_details_refresh_all (GsShellDetails *self) | 46 | @@ -700,13 +707,18 @@ gs_shell_details_refresh_all (GsShellDetails *self) |
205 | 47 | if (updated == GS_APP_INSTALL_DATE_UNKNOWN || | 47 | if (updated == GS_APP_INSTALL_DATE_UNKNOWN || |
206 | 48 | updated == GS_APP_INSTALL_DATE_UNSET) { | 48 | updated == GS_APP_INSTALL_DATE_UNSET) { |
207 | 49 | /* TRANSLATORS: this is where the updated date is not known */ | 49 | /* TRANSLATORS: this is where the updated date is not known */ |
208 | @@ -62,7 +62,7 @@ | |||
209 | 62 | } | 62 | } |
210 | 63 | 63 | ||
211 | 64 | /* set the category */ | 64 | /* set the category */ |
213 | 65 | @@ -698,6 +710,8 @@ gs_shell_details_refresh_all (GsShellDetails *self) | 65 | @@ -715,6 +727,8 @@ gs_shell_details_refresh_all (GsShellDetails *self) |
214 | 66 | /* TRANSLATORS: this is the application isn't in any | 66 | /* TRANSLATORS: this is the application isn't in any |
215 | 67 | * defined menu category */ | 67 | * defined menu category */ |
216 | 68 | gtk_label_set_label (GTK_LABEL (self->label_details_category_value), C_("menu category", "None")); | 68 | gtk_label_set_label (GTK_LABEL (self->label_details_category_value), C_("menu category", "None")); |
217 | @@ -71,7 +71,7 @@ | |||
218 | 71 | } else { | 71 | } else { |
219 | 72 | g_autofree gchar *path = NULL; | 72 | g_autofree gchar *path = NULL; |
220 | 73 | if (gtk_widget_get_direction (self->label_details_category_value) == GTK_TEXT_DIR_RTL) | 73 | if (gtk_widget_get_direction (self->label_details_category_value) == GTK_TEXT_DIR_RTL) |
222 | 74 | @@ -705,6 +719,8 @@ gs_shell_details_refresh_all (GsShellDetails *self) | 74 | @@ -722,6 +736,8 @@ gs_shell_details_refresh_all (GsShellDetails *self) |
223 | 75 | else | 75 | else |
224 | 76 | path = g_strjoinv (" → ", menu_path); | 76 | path = g_strjoinv (" → ", menu_path); |
225 | 77 | gtk_label_set_label (GTK_LABEL (self->label_details_category_value), path); | 77 | gtk_label_set_label (GTK_LABEL (self->label_details_category_value), path); |
226 | @@ -80,7 +80,7 @@ | |||
227 | 80 | } | 80 | } |
228 | 81 | 81 | ||
229 | 82 | /* set the origin */ | 82 | /* set the origin */ |
231 | 83 | @@ -1570,13 +1586,16 @@ gs_shell_details_class_init (GsShellDetailsClass *klass) | 83 | @@ -1587,13 +1603,16 @@ gs_shell_details_class_init (GsShellDetailsClass *klass) |
232 | 84 | gtk_widget_class_bind_template_child (widget_class, GsShellDetails, infobar_details_package_baseos); | 84 | gtk_widget_class_bind_template_child (widget_class, GsShellDetails, infobar_details_package_baseos); |
233 | 85 | gtk_widget_class_bind_template_child (widget_class, GsShellDetails, infobar_details_repo); | 85 | gtk_widget_class_bind_template_child (widget_class, GsShellDetails, infobar_details_repo); |
234 | 86 | gtk_widget_class_bind_template_child (widget_class, GsShellDetails, label_addons_uninstalled_app); | 86 | gtk_widget_class_bind_template_child (widget_class, GsShellDetails, label_addons_uninstalled_app); |
235 | 87 | 87 | ||
236 | === modified file 'debian/patches/minimal-review-limits.patch' | |||
237 | --- debian/patches/minimal-review-limits.patch 2016-03-29 03:47:46 +0000 | |||
238 | +++ debian/patches/minimal-review-limits.patch 2016-04-01 02:07:57 +0000 | |||
239 | @@ -1,7 +1,7 @@ | |||
241 | 1 | From 74ab348a4ee2d03dfc857c99ce9ed7f98b82feb4 Mon Sep 17 00:00:00 2001 | 1 | From 89bb91224aec3d29276971bc520638343de8a866 Mon Sep 17 00:00:00 2001 |
242 | 2 | From: Robert Ancell <robert.ancell@canonical.com> | 2 | From: Robert Ancell <robert.ancell@canonical.com> |
243 | 3 | Date: Thu, 11 Feb 2016 15:00:22 +1300 | 3 | Date: Thu, 11 Feb 2016 15:00:22 +1300 |
245 | 4 | Subject: [PATCH 08/17] Use minimal limits for review content | 4 | Subject: [PATCH 08/18] Use minimal limits for review content |
246 | 5 | 5 | ||
247 | 6 | --- | 6 | --- |
248 | 7 | src/gs-review-dialog.c | 10 +++++----- | 7 | src/gs-review-dialog.c | 10 +++++----- |
249 | 8 | 8 | ||
250 | === modified file 'debian/patches/no-daemon.patch' | |||
251 | --- debian/patches/no-daemon.patch 2016-03-29 03:47:46 +0000 | |||
252 | +++ debian/patches/no-daemon.patch 2016-04-01 02:07:57 +0000 | |||
253 | @@ -1,63 +1,65 @@ | |||
255 | 1 | From 728a8f2ca54406891a4c871878741fac5efdeaa8 Mon Sep 17 00:00:00 2001 | 1 | From 1c71bec4b5ace082c3abdb04df0f964359f80ac5 Mon Sep 17 00:00:00 2001 |
256 | 2 | From: William Hua <william.hua@canonical.com> | 2 | From: William Hua <william.hua@canonical.com> |
267 | 3 | Date: Tue, 1 Mar 2016 17:30:47 -0500 | 3 | Date: Thu, 24 Mar 2016 09:59:58 -0400 |
268 | 4 | Subject: [PATCH 12/17] Only quit if we're not running as a GApplication | 4 | Subject: [PATCH 12/18] Terminate immediately on close |
269 | 5 | service | 5 | |
260 | 6 | |||
261 | 7 | We were destroying the window explicitly even when the application was | ||
262 | 8 | running as a service, causing subsequent activations to crash since the | ||
263 | 9 | window was already destroyed. | ||
264 | 10 | |||
265 | 11 | See also | ||
266 | 12 | https://bugs.launchpad.net/ubuntu/+source/gnome-software/+bug/1552150. | ||
270 | 13 | --- | 6 | --- |
273 | 14 | src/gs-shell.c | 19 +++++++++++++++++-- | 7 | src/gs-application.c | 1 - |
274 | 15 | 1 file changed, 17 insertions(+), 2 deletions(-) | 8 | src/gs-shell.c | 22 ---------------------- |
275 | 9 | 2 files changed, 23 deletions(-) | ||
276 | 16 | 10 | ||
277 | 11 | diff --git a/src/gs-application.c b/src/gs-application.c | ||
278 | 12 | index fa24d56..97ff103 100644 | ||
279 | 13 | --- a/src/gs-application.c | ||
280 | 14 | +++ b/src/gs-application.c | ||
281 | 15 | @@ -769,7 +769,6 @@ gs_application_new (void) | ||
282 | 16 | return g_object_new (GS_APPLICATION_TYPE, | ||
283 | 17 | "application-id", "org.gnome.Software", | ||
284 | 18 | "flags", G_APPLICATION_HANDLES_OPEN, | ||
285 | 19 | - "inactivity-timeout", 12000, | ||
286 | 20 | NULL); | ||
287 | 21 | } | ||
288 | 22 | |||
289 | 17 | diff --git a/src/gs-shell.c b/src/gs-shell.c | 23 | diff --git a/src/gs-shell.c b/src/gs-shell.c |
291 | 18 | index f0844d5..0169a95 100644 | 24 | index f0844d5..46d7e8a 100644 |
292 | 19 | --- a/src/gs-shell.c | 25 | --- a/src/gs-shell.c |
293 | 20 | +++ b/src/gs-shell.c | 26 | +++ b/src/gs-shell.c |
296 | 21 | @@ -623,6 +623,13 @@ main_window_closed_cb (GtkWidget *dialog, GdkEvent *event, gpointer user_data) | 27 | @@ -604,25 +604,6 @@ window_button_press_event (GtkWidget *win, GdkEventButton *event, GsShell *shell |
297 | 22 | return TRUE; | 28 | return GDK_EVENT_STOP; |
298 | 23 | } | 29 | } |
299 | 24 | 30 | ||
307 | 25 | +static void | 31 | -static gboolean |
308 | 26 | +main_window_destroyed_cb (GtkWidget *widget, | 32 | -main_window_closed_cb (GtkWidget *dialog, GdkEvent *event, gpointer user_data) |
309 | 27 | + GsShell *shell) | 33 | -{ |
310 | 28 | +{ | 34 | - GsShell *shell = user_data; |
311 | 29 | + g_action_group_activate_action (G_ACTION_GROUP (g_application_get_default ()), "quit", NULL); | 35 | - GsShellPrivate *priv = gs_shell_get_instance_private (shell); |
312 | 30 | +} | 36 | - BackEntry *entry; |
313 | 31 | + | 37 | - |
314 | 38 | - /* When the window is closed, reset the initial mode to overview */ | ||
315 | 39 | - priv->mode = GS_SHELL_MODE_OVERVIEW; | ||
316 | 40 | - | ||
317 | 41 | - /* ... and clear any remaining entries in the back button stack */ | ||
318 | 42 | - while ((entry = g_queue_pop_head (priv->back_entry_stack)) != NULL) { | ||
319 | 43 | - free_back_entry (entry); | ||
320 | 44 | - } | ||
321 | 45 | - | ||
322 | 46 | - gtk_widget_hide (dialog); | ||
323 | 47 | - return TRUE; | ||
324 | 48 | -} | ||
325 | 49 | - | ||
326 | 32 | /** | 50 | /** |
327 | 33 | * gs_shell_updates_changed_cb: | 51 | * gs_shell_updates_changed_cb: |
328 | 34 | */ | 52 | */ |
338 | 35 | @@ -698,6 +705,7 @@ void | 53 | @@ -719,9 +700,6 @@ gs_shell_setup (GsShell *shell, GsPluginLoader *plugin_loader, GCancellable *can |
330 | 36 | gs_shell_setup (GsShell *shell, GsPluginLoader *plugin_loader, GCancellable *cancellable) | ||
331 | 37 | { | ||
332 | 38 | GsShellPrivate *priv = gs_shell_get_instance_private (shell); | ||
333 | 39 | + GApplicationFlags flags; | ||
334 | 40 | GtkWidget *widget; | ||
335 | 41 | |||
336 | 42 | g_return_if_fail (GS_IS_SHELL (shell)); | ||
337 | 43 | @@ -719,8 +727,15 @@ gs_shell_setup (GsShell *shell, GsPluginLoader *plugin_loader, GCancellable *can | ||
339 | 44 | gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), | 54 | gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), |
340 | 45 | GS_DATA G_DIR_SEPARATOR_S "icons"); | 55 | GS_DATA G_DIR_SEPARATOR_S "icons"); |
341 | 46 | 56 | ||
342 | 47 | - g_signal_connect (priv->main_window, "delete-event", | 57 | - g_signal_connect (priv->main_window, "delete-event", |
343 | 48 | - G_CALLBACK (main_window_closed_cb), shell); | 58 | - G_CALLBACK (main_window_closed_cb), shell); |
354 | 49 | + flags = g_application_get_flags (g_application_get_default ()); | 59 | - |
345 | 50 | + | ||
346 | 51 | + if (flags & G_APPLICATION_IS_SERVICE) { | ||
347 | 52 | + g_signal_connect (priv->main_window, "delete-event", | ||
348 | 53 | + G_CALLBACK (main_window_closed_cb), shell); | ||
349 | 54 | + } else { | ||
350 | 55 | + g_signal_connect (priv->main_window, "destroy", | ||
351 | 56 | + G_CALLBACK (main_window_destroyed_cb), shell); | ||
352 | 57 | + } | ||
353 | 58 | |||
355 | 59 | /* fix up the header bar */ | 60 | /* fix up the header bar */ |
356 | 60 | widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "header")); | 61 | widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "header")); |
357 | 62 | if (in_desktop ("Unity")) { | ||
358 | 61 | -- | 63 | -- |
359 | 62 | 2.7.4 | 64 | 2.7.4 |
360 | 63 | 65 | ||
361 | 64 | 66 | ||
362 | === modified file 'debian/patches/no-history.patch' | |||
363 | --- debian/patches/no-history.patch 2016-03-29 03:47:46 +0000 | |||
364 | +++ debian/patches/no-history.patch 2016-04-01 02:07:57 +0000 | |||
365 | @@ -1,17 +1,17 @@ | |||
367 | 1 | From a435a7b3cf74e844b6fa73c78849a6fe73c82c37 Mon Sep 17 00:00:00 2001 | 1 | From c1b8c79da8dd54db11ffd5e2e4cdc09df9a031b9 Mon Sep 17 00:00:00 2001 |
368 | 2 | From: Robert Ancell <robert.ancell@canonical.com> | 2 | From: Robert Ancell <robert.ancell@canonical.com> |
369 | 3 | Date: Wed, 16 Mar 2016 16:06:23 +1300 | 3 | Date: Wed, 16 Mar 2016 16:06:23 +1300 |
371 | 4 | Subject: [PATCH 06/17] Disable history button | 4 | Subject: [PATCH 06/18] Disable history button |
372 | 5 | 5 | ||
373 | 6 | --- | 6 | --- |
374 | 7 | src/gs-shell-details.c | 3 ++- | 7 | src/gs-shell-details.c | 3 ++- |
375 | 8 | 1 file changed, 2 insertions(+), 1 deletion(-) | 8 | 1 file changed, 2 insertions(+), 1 deletion(-) |
376 | 9 | 9 | ||
377 | 10 | diff --git a/src/gs-shell-details.c b/src/gs-shell-details.c | 10 | diff --git a/src/gs-shell-details.c b/src/gs-shell-details.c |
379 | 11 | index 9540ab7..6754bf2 100644 | 11 | index 4b6ebf5..68cd749 100644 |
380 | 12 | --- a/src/gs-shell-details.c | 12 | --- a/src/gs-shell-details.c |
381 | 13 | +++ b/src/gs-shell-details.c | 13 | +++ b/src/gs-shell-details.c |
383 | 14 | @@ -832,7 +832,8 @@ gs_shell_details_refresh_all (GsShellDetails *self) | 14 | @@ -849,7 +849,8 @@ gs_shell_details_refresh_all (GsShellDetails *self) |
384 | 15 | break; | 15 | break; |
385 | 16 | default: | 16 | default: |
386 | 17 | gtk_widget_set_sensitive (self->button_history, history->len > 0); | 17 | gtk_widget_set_sensitive (self->button_history, history->len > 0); |
387 | 18 | 18 | ||
388 | === modified file 'debian/patches/no-kudo-details.patch' | |||
389 | --- debian/patches/no-kudo-details.patch 2016-03-29 03:47:46 +0000 | |||
390 | +++ debian/patches/no-kudo-details.patch 2016-04-01 02:07:57 +0000 | |||
391 | @@ -1,7 +1,7 @@ | |||
393 | 1 | From 9e2b5e0137fb687f69e0254b7d8927b5e62092a3 Mon Sep 17 00:00:00 2001 | 1 | From 914aba0bf6c95442b0e437d52496ff7b1e3bb8ab Mon Sep 17 00:00:00 2001 |
394 | 2 | From: Robert Ancell <robert.ancell@canonical.com> | 2 | From: Robert Ancell <robert.ancell@canonical.com> |
395 | 3 | Date: Thu, 25 Feb 2016 12:40:53 +1300 | 3 | Date: Thu, 25 Feb 2016 12:40:53 +1300 |
397 | 4 | Subject: [PATCH 11/17] Hide the Kudo details - they're not correctly populated | 4 | Subject: [PATCH 11/18] Hide the Kudo details - they're not correctly populated |
398 | 5 | in Ubuntu and probably don't make sense | 5 | in Ubuntu and probably don't make sense |
399 | 6 | 6 | ||
400 | 7 | --- | 7 | --- |
401 | @@ -9,10 +9,10 @@ | |||
402 | 9 | 1 file changed, 3 insertions(+), 2 deletions(-) | 9 | 1 file changed, 3 insertions(+), 2 deletions(-) |
403 | 10 | 10 | ||
404 | 11 | diff --git a/src/gs-shell-details.c b/src/gs-shell-details.c | 11 | diff --git a/src/gs-shell-details.c b/src/gs-shell-details.c |
406 | 12 | index 6754bf2..5decf09 100644 | 12 | index 68cd749..efcb193 100644 |
407 | 13 | --- a/src/gs-shell-details.c | 13 | --- a/src/gs-shell-details.c |
408 | 14 | +++ b/src/gs-shell-details.c | 14 | +++ b/src/gs-shell-details.c |
410 | 15 | @@ -816,9 +816,10 @@ gs_shell_details_refresh_all (GsShellDetails *self) | 15 | @@ -833,9 +833,10 @@ gs_shell_details_refresh_all (GsShellDetails *self) |
411 | 16 | 16 | ||
412 | 17 | /* hide the kudo details for non-desktop software */ | 17 | /* hide the kudo details for non-desktop software */ |
413 | 18 | switch (gs_app_get_kind (self->app)) { | 18 | switch (gs_app_get_kind (self->app)) { |
414 | 19 | 19 | ||
415 | === added file 'debian/patches/no-notification-actions.patch' | |||
416 | --- debian/patches/no-notification-actions.patch 1970-01-01 00:00:00 +0000 | |||
417 | +++ debian/patches/no-notification-actions.patch 2016-04-01 02:07:57 +0000 | |||
418 | @@ -0,0 +1,169 @@ | |||
419 | 1 | From 01a888ef20ccb7d962a244710f6c7ea9c903a443 Mon Sep 17 00:00:00 2001 | ||
420 | 2 | From: William Hua <william.hua@canonical.com> | ||
421 | 3 | Date: Wed, 23 Mar 2016 10:27:19 -0400 | ||
422 | 4 | Subject: [PATCH 17/18] Don't use notification actions under Unity | ||
423 | 5 | |||
424 | 6 | --- | ||
425 | 7 | src/gs-dbus-helper.c | 14 +++++++++++--- | ||
426 | 8 | src/gs-update-monitor.c | 37 ++++++++++++++++++++++++++----------- | ||
427 | 9 | src/gs-utils.c | 22 +++++++++++++++------- | ||
428 | 10 | 3 files changed, 52 insertions(+), 21 deletions(-) | ||
429 | 11 | |||
430 | 12 | diff --git a/src/gs-dbus-helper.c b/src/gs-dbus-helper.c | ||
431 | 13 | index e657f2a..b75e950 100644 | ||
432 | 14 | --- a/src/gs-dbus-helper.c | ||
433 | 15 | +++ b/src/gs-dbus-helper.c | ||
434 | 16 | @@ -284,6 +284,12 @@ is_show_confirm_search_set (const gchar *interaction) | ||
435 | 17 | return ret; | ||
436 | 18 | } | ||
437 | 19 | |||
438 | 20 | +static gboolean | ||
439 | 21 | +is_unity (void) | ||
440 | 22 | +{ | ||
441 | 23 | + return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0; | ||
442 | 24 | +} | ||
443 | 25 | + | ||
444 | 26 | static void | ||
445 | 27 | notify_search_resources (GsShellExtrasMode mode, | ||
446 | 28 | const gchar *desktop_id, | ||
447 | 29 | @@ -344,9 +350,11 @@ notify_search_resources (GsShellExtrasMode mode, | ||
448 | 30 | |||
449 | 31 | n = g_notification_new (title); | ||
450 | 32 | g_notification_set_body (n, body); | ||
451 | 33 | - /* TRANSLATORS: this is a button that launches gnome-software */ | ||
452 | 34 | - g_notification_add_button_with_target (n, _("Find in Software"), "app.install-resources", "(s^ass)", mode_string, resources, ""); | ||
453 | 35 | - g_notification_set_default_action_and_target (n, "app.install-resources", "(s^ass)", mode_string, resources, ""); | ||
454 | 36 | + if (!is_unity ()) { | ||
455 | 37 | + /* TRANSLATORS: this is a button that launches gnome-software */ | ||
456 | 38 | + g_notification_add_button_with_target (n, _("Find in Software"), "app.install-resources", "(s^ass)", mode_string, resources, ""); | ||
457 | 39 | + g_notification_set_default_action_and_target (n, "app.install-resources", "(s^ass)", mode_string, resources, ""); | ||
458 | 40 | + } | ||
459 | 41 | g_application_send_notification (g_application_get_default (), "install-resources", n); | ||
460 | 42 | } | ||
461 | 43 | |||
462 | 44 | diff --git a/src/gs-update-monitor.c b/src/gs-update-monitor.c | ||
463 | 45 | index a37c13c..cd472a5 100644 | ||
464 | 46 | --- a/src/gs-update-monitor.c | ||
465 | 47 | +++ b/src/gs-update-monitor.c | ||
466 | 48 | @@ -57,6 +57,12 @@ reenable_offline_update_notification (gpointer data) | ||
467 | 49 | return G_SOURCE_REMOVE; | ||
468 | 50 | } | ||
469 | 51 | |||
470 | 52 | +static gboolean | ||
471 | 53 | +is_unity (void) | ||
472 | 54 | +{ | ||
473 | 55 | + return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0; | ||
474 | 56 | +} | ||
475 | 57 | + | ||
476 | 58 | static void | ||
477 | 59 | notify_offline_update_available (GsUpdateMonitor *monitor) | ||
478 | 60 | { | ||
479 | 61 | @@ -90,17 +96,21 @@ notify_offline_update_available (GsUpdateMonitor *monitor) | ||
480 | 62 | body = _("It is recommended that you install important updates now"); | ||
481 | 63 | n = g_notification_new (title); | ||
482 | 64 | g_notification_set_body (n, body); | ||
483 | 65 | - g_notification_add_button (n, _("Restart & Install"), "app.reboot-and-install"); | ||
484 | 66 | - g_notification_set_default_action_and_target (n, "app.set-mode", "s", "updates"); | ||
485 | 67 | + if (!is_unity ()) { | ||
486 | 68 | + g_notification_add_button (n, _("Restart & Install"), "app.reboot-and-install"); | ||
487 | 69 | + g_notification_set_default_action_and_target (n, "app.set-mode", "s", "updates"); | ||
488 | 70 | + } | ||
489 | 71 | g_application_send_notification (monitor->application, "updates-available", n); | ||
490 | 72 | } else { | ||
491 | 73 | title = _("Software Updates Available"); | ||
492 | 74 | body = _("Important OS and application updates are ready to be installed"); | ||
493 | 75 | n = g_notification_new (title); | ||
494 | 76 | g_notification_set_body (n, body); | ||
495 | 77 | - g_notification_add_button (n, _("Not Now"), "app.nop"); | ||
496 | 78 | - g_notification_add_button_with_target (n, _("View"), "app.set-mode", "s", "updates"); | ||
497 | 79 | - g_notification_set_default_action_and_target (n, "app.set-mode", "s", "updates"); | ||
498 | 80 | + if (!is_unity ()) { | ||
499 | 81 | + g_notification_add_button (n, _("Not Now"), "app.nop"); | ||
500 | 82 | + g_notification_add_button_with_target (n, _("View"), "app.set-mode", "s", "updates"); | ||
501 | 83 | + g_notification_set_default_action_and_target (n, "app.set-mode", "s", "updates"); | ||
502 | 84 | + } | ||
503 | 85 | g_application_send_notification (monitor->application, "updates-available", n); | ||
504 | 86 | } | ||
505 | 87 | } | ||
506 | 88 | @@ -233,7 +243,8 @@ get_upgrades_finished_cb (GObject *object, | ||
507 | 89 | /* TRANSLATORS: this is a distro upgrade */ | ||
508 | 90 | n = g_notification_new (_("Software Upgrade Available")); | ||
509 | 91 | g_notification_set_body (n, body); | ||
510 | 92 | - g_notification_set_default_action_and_target (n, "app.set-mode", "s", "updates"); | ||
511 | 93 | + if (!is_unity ()) | ||
512 | 94 | + g_notification_set_default_action_and_target (n, "app.set-mode", "s", "updates"); | ||
513 | 95 | g_application_send_notification (monitor->application, "upgrades-available", n); | ||
514 | 96 | } | ||
515 | 97 | |||
516 | 98 | @@ -429,9 +440,11 @@ get_updates_historical_cb (GObject *object, GAsyncResult *res, gpointer data) | ||
517 | 99 | /* TRANSLATORS: message when we offline updates have failed */ | ||
518 | 100 | g_notification_set_body (notification, _("An important OS update failed to be installed.")); | ||
519 | 101 | g_application_send_notification (monitor->application, "offline-updates", notification); | ||
520 | 102 | - g_notification_add_button (notification, _("Show Details"), "app.show-offline-update-error"); | ||
521 | 103 | - g_notification_set_default_action (notification, "app.show-offline-update-error"); | ||
522 | 104 | - g_application_send_notification (monitor->application, "offline-updates", notification); | ||
523 | 105 | + if (!is_unity ()) { | ||
524 | 106 | + g_notification_add_button (notification, _("Show Details"), "app.show-offline-update-error"); | ||
525 | 107 | + g_notification_set_default_action (notification, "app.show-offline-update-error"); | ||
526 | 108 | + g_application_send_notification (monitor->application, "offline-updates", notification); | ||
527 | 109 | + } | ||
528 | 110 | } | ||
529 | 111 | return; | ||
530 | 112 | } | ||
531 | 113 | @@ -459,8 +472,10 @@ get_updates_historical_cb (GObject *object, GAsyncResult *res, gpointer data) | ||
532 | 114 | * users can't express their opinions here. In some languages | ||
533 | 115 | * "Review (evaluate) something" is a different translation than | ||
534 | 116 | * "Review (browse) something." */ | ||
535 | 117 | - g_notification_add_button_with_target (notification, C_("updates", "Review"), "app.set-mode", "s", "updated"); | ||
536 | 118 | - g_notification_set_default_action_and_target (notification, "app.set-mode", "s", "updated"); | ||
537 | 119 | + if (!is_unity ()) { | ||
538 | 120 | + g_notification_add_button_with_target (notification, C_("updates", "Review"), "app.set-mode", "s", "updated"); | ||
539 | 121 | + g_notification_set_default_action_and_target (notification, "app.set-mode", "s", "updated"); | ||
540 | 122 | + } | ||
541 | 123 | g_application_send_notification (monitor->application, "offline-updates", notification); | ||
542 | 124 | |||
543 | 125 | /* update the timestamp so we don't show again */ | ||
544 | 126 | diff --git a/src/gs-utils.c b/src/gs-utils.c | ||
545 | 127 | index fbdb1a6..399f903 100644 | ||
546 | 128 | --- a/src/gs-utils.c | ||
547 | 129 | +++ b/src/gs-utils.c | ||
548 | 130 | @@ -129,6 +129,12 @@ gs_grab_focus_when_mapped (GtkWidget *widget) | ||
549 | 131 | G_CALLBACK (grab_focus), NULL); | ||
550 | 132 | } | ||
551 | 133 | |||
552 | 134 | +static gboolean | ||
553 | 135 | +is_unity (void) | ||
554 | 136 | +{ | ||
555 | 137 | + return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0; | ||
556 | 138 | +} | ||
557 | 139 | + | ||
558 | 140 | void | ||
559 | 141 | gs_app_notify_installed (GsApp *app) | ||
560 | 142 | { | ||
561 | 143 | @@ -139,14 +145,16 @@ gs_app_notify_installed (GsApp *app) | ||
562 | 144 | * has been successfully installed */ | ||
563 | 145 | summary = g_strdup_printf (_("%s is now installed"), gs_app_get_name (app)); | ||
564 | 146 | n = g_notification_new (summary); | ||
565 | 147 | - if (gs_app_get_kind (app) == AS_APP_KIND_DESKTOP) { | ||
566 | 148 | - /* TRANSLATORS: this is button that opens the newly installed application */ | ||
567 | 149 | - g_notification_add_button_with_target (n, _("Launch"), | ||
568 | 150 | - "app.launch", "s", | ||
569 | 151 | - gs_app_get_id (app)); | ||
570 | 152 | + if (!is_unity ()) { | ||
571 | 153 | + if (gs_app_get_kind (app) == AS_APP_KIND_DESKTOP) { | ||
572 | 154 | + /* TRANSLATORS: this is button that opens the newly installed application */ | ||
573 | 155 | + g_notification_add_button_with_target (n, _("Launch"), | ||
574 | 156 | + "app.launch", "s", | ||
575 | 157 | + gs_app_get_id (app)); | ||
576 | 158 | + } | ||
577 | 159 | + g_notification_set_default_action_and_target (n, "app.details", "(ss)", | ||
578 | 160 | + gs_app_get_id (app), ""); | ||
579 | 161 | } | ||
580 | 162 | - g_notification_set_default_action_and_target (n, "app.details", "(ss)", | ||
581 | 163 | - gs_app_get_id (app), ""); | ||
582 | 164 | g_application_send_notification (g_application_get_default (), "installed", n); | ||
583 | 165 | } | ||
584 | 166 | |||
585 | 167 | -- | ||
586 | 168 | 2.7.4 | ||
587 | 169 | |||
588 | 0 | 170 | ||
589 | === modified file 'debian/patches/no-offline-updates.patch' | |||
590 | --- debian/patches/no-offline-updates.patch 2016-03-29 03:47:46 +0000 | |||
591 | +++ debian/patches/no-offline-updates.patch 2016-04-01 02:07:57 +0000 | |||
592 | @@ -1,7 +1,7 @@ | |||
594 | 1 | From 399b5b1bf8c4ae345e88d96b1147076d94e630d9 Mon Sep 17 00:00:00 2001 | 1 | From 705442859e27dd7eae0625102f73c4cf855428e2 Mon Sep 17 00:00:00 2001 |
595 | 2 | From: Robert Ancell <robert.ancell@canonical.com> | 2 | From: Robert Ancell <robert.ancell@canonical.com> |
596 | 3 | Date: Wed, 16 Mar 2016 15:09:41 +1300 | 3 | Date: Wed, 16 Mar 2016 15:09:41 +1300 |
598 | 4 | Subject: [PATCH 03/17] Disable offline updates, they don't work in Ubuntu | 4 | Subject: [PATCH 03/18] Disable offline updates, they don't work in Ubuntu |
599 | 5 | 5 | ||
600 | 6 | --- | 6 | --- |
601 | 7 | src/gs-shell-updates.c | 6 ++++-- | 7 | src/gs-shell-updates.c | 6 ++++-- |
602 | 8 | 8 | ||
603 | === added file 'debian/patches/rename-menu-item.patch' | |||
604 | --- debian/patches/rename-menu-item.patch 1970-01-01 00:00:00 +0000 | |||
605 | +++ debian/patches/rename-menu-item.patch 2016-04-01 02:07:57 +0000 | |||
606 | @@ -0,0 +1,25 @@ | |||
607 | 1 | From 45f7efb3e289e46ea952792cc0085624da736f9c Mon Sep 17 00:00:00 2001 | ||
608 | 2 | From: William Hua <william.hua@canonical.com> | ||
609 | 3 | Date: Mon, 14 Mar 2016 10:56:42 -0400 | ||
610 | 4 | Subject: [PATCH 16/18] 'Software Sources' -> 'Software & Updates' in menu | ||
611 | 5 | |||
612 | 6 | --- | ||
613 | 7 | src/menus.ui | 2 +- | ||
614 | 8 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
615 | 9 | |||
616 | 10 | diff --git a/src/menus.ui b/src/menus.ui | ||
617 | 11 | index b138ba5..1dc4c18 100644 | ||
618 | 12 | --- a/src/menus.ui | ||
619 | 13 | +++ b/src/menus.ui | ||
620 | 14 | @@ -4,7 +4,7 @@ | ||
621 | 15 | <menu id="app-menu"> | ||
622 | 16 | <section> | ||
623 | 17 | <item> | ||
624 | 18 | - <attribute name="label" translatable="yes">_Software Sources</attribute> | ||
625 | 19 | + <attribute name="label" translatable="yes">_Software & Updates</attribute> | ||
626 | 20 | <attribute name="action">app.sources</attribute> | ||
627 | 21 | </item> | ||
628 | 22 | </section> | ||
629 | 23 | -- | ||
630 | 24 | 2.7.4 | ||
631 | 25 | |||
632 | 0 | 26 | ||
633 | === modified file 'debian/patches/series' | |||
634 | --- debian/patches/series 2016-03-29 03:47:46 +0000 | |||
635 | +++ debian/patches/series 2016-04-01 02:07:57 +0000 | |||
636 | @@ -13,3 +13,5 @@ | |||
637 | 13 | software-properties.patch | 13 | software-properties.patch |
638 | 14 | fwupd-error.patch | 14 | fwupd-error.patch |
639 | 15 | appstream-refresh.patch | 15 | appstream-refresh.patch |
640 | 16 | rename-menu-item.patch | ||
641 | 17 | no-notification-actions.patch | ||
642 | 16 | 18 | ||
643 | === modified file 'debian/patches/software-properties.patch' | |||
644 | --- debian/patches/software-properties.patch 2016-03-29 03:47:46 +0000 | |||
645 | +++ debian/patches/software-properties.patch 2016-04-01 02:07:57 +0000 | |||
646 | @@ -1,20 +1,19 @@ | |||
648 | 1 | From 56aee4f46da074a2116273a4b6817eb865bfc142 Mon Sep 17 00:00:00 2001 | 1 | From 84e37e449259aa263d33a47ebb8d51c0c09c80b1 Mon Sep 17 00:00:00 2001 |
649 | 2 | From: William Hua <william.hua@canonical.com> | 2 | From: William Hua <william.hua@canonical.com> |
650 | 3 | Date: Tue, 1 Mar 2016 13:46:56 -0500 | 3 | Date: Tue, 1 Mar 2016 13:46:56 -0500 |
652 | 4 | Subject: [PATCH 13/17] Launch software-properties-gtk in place of the sources | 4 | Subject: [PATCH 13/18] Launch software-properties-gtk in place of the sources |
653 | 5 | dialog | 5 | dialog |
654 | 6 | 6 | ||
655 | 7 | https://bugs.launchpad.net/ubuntu/+source/gnome-software/+bug/1551702 | 7 | https://bugs.launchpad.net/ubuntu/+source/gnome-software/+bug/1551702 |
656 | 8 | --- | 8 | --- |
657 | 9 | src/gs-shell.c | 3 +++ | 9 | src/gs-shell.c | 3 +++ |
660 | 10 | src/menus.ui | 2 +- | 10 | 1 file changed, 3 insertions(+) |
659 | 11 | 2 files changed, 4 insertions(+), 1 deletion(-) | ||
661 | 12 | 11 | ||
662 | 13 | diff --git a/src/gs-shell.c b/src/gs-shell.c | 12 | diff --git a/src/gs-shell.c b/src/gs-shell.c |
664 | 14 | index 0169a95..244b89b 100644 | 13 | index 46d7e8a..66bbe38 100644 |
665 | 15 | --- a/src/gs-shell.c | 14 | --- a/src/gs-shell.c |
666 | 16 | +++ b/src/gs-shell.c | 15 | +++ b/src/gs-shell.c |
668 | 17 | @@ -899,6 +899,9 @@ gs_shell_show_sources (GsShell *shell) | 16 | @@ -862,6 +862,9 @@ gs_shell_show_sources (GsShell *shell) |
669 | 18 | GsShellPrivate *priv = gs_shell_get_instance_private (shell); | 17 | GsShellPrivate *priv = gs_shell_get_instance_private (shell); |
670 | 19 | GtkWidget *dialog; | 18 | GtkWidget *dialog; |
671 | 20 | 19 | ||
672 | @@ -24,19 +23,6 @@ | |||
673 | 24 | dialog = gs_sources_dialog_new (priv->main_window, priv->plugin_loader); | 23 | dialog = gs_sources_dialog_new (priv->main_window, priv->plugin_loader); |
674 | 25 | gs_shell_modal_dialog_present (shell, GTK_DIALOG (dialog)); | 24 | gs_shell_modal_dialog_present (shell, GTK_DIALOG (dialog)); |
675 | 26 | } | 25 | } |
676 | 27 | diff --git a/src/menus.ui b/src/menus.ui | ||
677 | 28 | index b138ba5..1dc4c18 100644 | ||
678 | 29 | --- a/src/menus.ui | ||
679 | 30 | +++ b/src/menus.ui | ||
680 | 31 | @@ -4,7 +4,7 @@ | ||
681 | 32 | <menu id="app-menu"> | ||
682 | 33 | <section> | ||
683 | 34 | <item> | ||
684 | 35 | - <attribute name="label" translatable="yes">_Software Sources</attribute> | ||
685 | 36 | + <attribute name="label" translatable="yes">_Software & Updates</attribute> | ||
686 | 37 | <attribute name="action">app.sources</attribute> | ||
687 | 38 | </item> | ||
688 | 39 | </section> | ||
689 | 40 | -- | 26 | -- |
690 | 41 | 2.7.4 | 27 | 2.7.4 |
691 | 42 | 28 | ||
692 | 43 | 29 | ||
693 | === modified file 'debian/patches/ubuntu-review-submit.patch' | |||
694 | --- debian/patches/ubuntu-review-submit.patch 2016-03-29 03:47:46 +0000 | |||
695 | +++ debian/patches/ubuntu-review-submit.patch 2016-04-01 02:07:57 +0000 | |||
696 | @@ -1,7 +1,8 @@ | |||
698 | 1 | From 3dff001e45bfa4af3e98390ff3af808af8c3a0ec Mon Sep 17 00:00:00 2001 | 1 | From 1f8e790853347fc22a86e4893d8d58e0caf1299d Mon Sep 17 00:00:00 2001 |
699 | 2 | From: Robert Ancell <robert.ancell@canonical.com> | 2 | From: Robert Ancell <robert.ancell@canonical.com> |
702 | 3 | Date: Fri, 19 Feb 2016 11:22:37 -0800 | 3 | Date: Thu, 31 Mar 2016 19:55:07 -0400 |
703 | 4 | Subject: [PATCH 07/17] Add support for submiting reviews to reviews.ubuntu.com | 4 | Subject: [PATCH 07/18] Add support for submitting reviews to |
704 | 5 | reviews.ubuntu.com | ||
705 | 5 | 6 | ||
706 | 6 | Authentication work done by William Hua | 7 | Authentication work done by William Hua |
707 | 7 | --- | 8 | --- |
708 | @@ -21,7 +22,7 @@ | |||
709 | 21 | create mode 100644 src/plugins/gs-ubuntu-login-dialog.ui | 22 | create mode 100644 src/plugins/gs-ubuntu-login-dialog.ui |
710 | 22 | 23 | ||
711 | 23 | diff --git a/configure.ac b/configure.ac | 24 | diff --git a/configure.ac b/configure.ac |
713 | 24 | index 0f00591..cb9a3b9 100644 | 25 | index 6c86c62..27d5566 100644 |
714 | 25 | --- a/configure.ac | 26 | --- a/configure.ac |
715 | 26 | +++ b/configure.ac | 27 | +++ b/configure.ac |
716 | 27 | @@ -68,6 +68,8 @@ PKG_CHECK_MODULES(SQLITE, sqlite3) | 28 | @@ -68,6 +68,8 @@ PKG_CHECK_MODULES(SQLITE, sqlite3) |
717 | @@ -86,7 +87,7 @@ | |||
718 | 86 | G_END_DECLS | 87 | G_END_DECLS |
719 | 87 | 88 | ||
720 | 88 | diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am | 89 | diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am |
722 | 89 | index 07546c4..b8d16fb 100644 | 90 | index 5ea32be..bc4dd98 100644 |
723 | 90 | --- a/src/plugins/Makefile.am | 91 | --- a/src/plugins/Makefile.am |
724 | 91 | +++ b/src/plugins/Makefile.am | 92 | +++ b/src/plugins/Makefile.am |
725 | 92 | @@ -13,6 +13,8 @@ AM_CPPFLAGS = \ | 93 | @@ -13,6 +13,8 @@ AM_CPPFLAGS = \ |
726 | @@ -98,7 +99,7 @@ | |||
727 | 98 | -DBINDIR=\"$(bindir)\" \ | 99 | -DBINDIR=\"$(bindir)\" \ |
728 | 99 | -DDATADIR=\"$(datadir)\" \ | 100 | -DDATADIR=\"$(datadir)\" \ |
729 | 100 | -DGS_MODULESETDIR=\"$(datadir)/gnome-software/modulesets.d\" \ | 101 | -DGS_MODULESETDIR=\"$(datadir)/gnome-software/modulesets.d\" \ |
731 | 101 | @@ -165,8 +167,15 @@ libgs_plugin_hardcoded_blacklist_la_LDFLAGS = -module -avoid-version | 102 | @@ -168,8 +170,15 @@ libgs_plugin_hardcoded_blacklist_la_LDFLAGS = -module -avoid-version |
732 | 102 | libgs_plugin_hardcoded_blacklist_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS) | 103 | libgs_plugin_hardcoded_blacklist_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS) |
733 | 103 | 104 | ||
734 | 104 | libgs_plugin_ubuntu_reviews_la_SOURCES = \ | 105 | libgs_plugin_ubuntu_reviews_la_SOURCES = \ |
735 | 105 | 106 | ||
736 | === modified file 'debian/patches/update-descriptions.patch' | |||
737 | --- debian/patches/update-descriptions.patch 2016-03-29 03:47:46 +0000 | |||
738 | +++ debian/patches/update-descriptions.patch 2016-04-01 02:07:57 +0000 | |||
739 | @@ -1,7 +1,7 @@ | |||
741 | 1 | From 83b465f747a55a8055fe4a3e89ce4b66c3392315 Mon Sep 17 00:00:00 2001 | 1 | From 6a50d4676fe50d8116e744fa212194cc03e6a622 Mon Sep 17 00:00:00 2001 |
742 | 2 | From: Robert Ancell <robert.ancell@canonical.com> | 2 | From: Robert Ancell <robert.ancell@canonical.com> |
743 | 3 | Date: Tue, 15 Mar 2016 14:12:13 +1300 | 3 | Date: Tue, 15 Mar 2016 14:12:13 +1300 |
745 | 4 | Subject: [PATCH 05/17] Format update descriptions to be suitable for Ubuntu. | 4 | Subject: [PATCH 05/18] Format update descriptions to be suitable for Ubuntu. |
746 | 5 | 5 | ||
747 | 6 | Don't show the update descriptions on the updates page - it's too complex to fit. | 6 | Don't show the update descriptions on the updates page - it's too complex to fit. |
748 | 7 | Don't try and use markup - it doesn't work well with the information sourced from debian/changelog. | 7 | Don't try and use markup - it doesn't work well with the information sourced from debian/changelog. |
749 | 8 | 8 | ||
750 | === modified file 'debian/patches/window-decorations.patch' | |||
751 | --- debian/patches/window-decorations.patch 2016-03-29 03:47:46 +0000 | |||
752 | +++ debian/patches/window-decorations.patch 2016-04-01 02:07:57 +0000 | |||
753 | @@ -1,7 +1,7 @@ | |||
755 | 1 | From 5bbb53e15237746f0129d3dffc930bde66483817 Mon Sep 17 00:00:00 2001 | 1 | From 3ad704bda0701aa1df5cbc8ab309193ce26d3ec5 Mon Sep 17 00:00:00 2001 |
756 | 2 | From: Robert Ancell <robert.ancell@canonical.com> | 2 | From: Robert Ancell <robert.ancell@canonical.com> |
757 | 3 | Date: Thu, 3 Mar 2016 15:13:50 +1300 | 3 | Date: Thu, 3 Mar 2016 15:13:50 +1300 |
759 | 4 | Subject: [PATCH 02/17] Use traditional window decorations in Unity | 4 | Subject: [PATCH 02/18] Use traditional window decorations in Unity |
760 | 5 | 5 | ||
761 | 6 | --- | 6 | --- |
762 | 7 | src/gs-shell.c | 29 +++++++++++++++++++++++++---- | 7 | src/gs-shell.c | 29 +++++++++++++++++++++++++---- |
LGTM