Merge lp:~attente/gnome-software/20160331 into lp:~ubuntu-desktop/gnome-software/ubuntu

[William Hua]

* New upstream snapshot
* debian/patches/rename-menu-item.patch:
  - Rename 'Software Sources' menu item to 'Software & Updates'
* debian/patches/no-notification-actions.patch:
  - Disable actions in notifications (LP: #1547608)

* New upstream snapshot
* debian/patches/rename-menu-item.patch:
  - Rename 'Software Sources' menu item to 'Software & Updates'
* debian/patches/no-notification-actions.patch:
  - Disable actions in notifications (LP: #1547608)

[Robert Ancell (robert-ancell)]

LGTM

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-29 03:47:46 +0000
+++ debian/changelog	2016-04-01 02:07:57 +0000
@@ -1,3 +1,13 @@
+gnome-software (3.20.1~git20160331.78d1aab-0ubuntu1) xenial; urgency=medium
+
+  * New upstream snapshot
+  * debian/patches/rename-menu-item.patch:
+    - Rename 'Software Sources' menu item to 'Software & Updates'
+  * debian/patches/no-notification-actions.patch:
+    - Disable actions in notifications (LP: #1547608)
+
+ -- William Hua <[e-mail]>  Thu, 31 Mar 2016 21:20:12 -0400
+
 gnome-software (3.20.0-0ubuntu1) xenial; urgency=medium
 
   * New upstream stable release

=== modified file 'debian/patches/appstream-refresh.patch'
--- debian/patches/appstream-refresh.patch	2016-03-29 03:47:46 +0000
+++ debian/patches/appstream-refresh.patch	2016-04-01 02:07:57 +0000
@@ -1,7 +1,7 @@
-From 0c85a65669e611c9c8fd269f380c6cc5f438aff0 Mon Sep 17 00:00:00 2001
+From 0a70a60744336ec12ff0dcb61997b1e0ec4fdf64 Mon Sep 17 00:00:00 2001
 From: William Hua <[e-mail]>
 Date: Wed, 16 Mar 2016 12:25:53 -0400
-Subject: [PATCH 15/17] Refresh appstream index if needed
+Subject: [PATCH 15/18] Refresh appstream index if needed
 
 ---
  src/plugins/gs-plugin-appstream.c | 71 +++++++++++++++++++++++++++++++++++++++

=== modified file 'debian/patches/apt-plugin.patch'
--- debian/patches/apt-plugin.patch	2016-03-29 03:47:46 +0000
+++ debian/patches/apt-plugin.patch	2016-04-01 02:07:57 +0000
@@ -1,14 +1,14 @@
-From 71bfaa1cc702705f52fe3e015c7eec588b20b2e6 Mon Sep 17 00:00:00 2001
+From 789cd3a13775799a13ac77cd1409fc9ec93a7929 Mon Sep 17 00:00:00 2001
 From: Robert Ancell <[e-mail]>
-Date: Thu, 4 Feb 2016 14:51:21 +1300
-Subject: [PATCH 09/17] Add an apt plugin that works with aptdaemon
+Date: Thu, 31 Mar 2016 19:56:26 -0400
+Subject: [PATCH 09/18] Add an apt plugin that works with aptdaemon
 
 ---
  src/gs-app.c                                 |   9 +
  src/plugins/Makefile.am                      |  19 +
  src/plugins/com.canonical.Unity.Launcher.xml |  15 +
- src/plugins/gs-plugin-apt.c                  | 976 +++++++++++++++++++++++++++
- 4 files changed, 1019 insertions(+)
+ src/plugins/gs-plugin-apt.c                  | 977 +++++++++++++++++++++++++++
+ 4 files changed, 1020 insertions(+)
  create mode 100644 src/plugins/com.canonical.Unity.Launcher.xml
  create mode 100644 src/plugins/gs-plugin-apt.c
 
@@ -33,7 +33,7 @@
  		if (g_str_has_prefix (tokens[i], "@")) {
  			g_string_append_printf (urld,
 diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
-index b8d16fb..4791b89 100644
+index bc4dd98..db0c971 100644
 --- a/src/plugins/Makefile.am
 +++ b/src/plugins/Makefile.am
 @@ -31,6 +31,7 @@ noinst_LTLIBRARIES =					\
@@ -44,7 +44,7 @@
  	libgs_plugin_appstream.la			\
  	libgs_plugin_dummy.la				\
  	libgs_plugin_hardcoded-featured.la		\
-@@ -132,6 +133,24 @@ libgs_plugin_xdg_app_reviews_la_LDFLAGS = -module -avoid-version
+@@ -135,6 +136,24 @@ libgs_plugin_xdg_app_reviews_la_LDFLAGS = -module -avoid-version
  libgs_plugin_xdg_app_reviews_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
  endif
  
@@ -71,7 +71,7 @@
  	gs-moduleset.h					\
 diff --git a/src/plugins/com.canonical.Unity.Launcher.xml b/src/plugins/com.canonical.Unity.Launcher.xml
 new file mode 100644
-index 0000000..b0d7915
+index 0000000..b631a2d
 --- /dev/null
 +++ b/src/plugins/com.canonical.Unity.Launcher.xml
 @@ -0,0 +1,15 @@
@@ -83,7 +83,7 @@
 +      <arg type='s' name='appstream_app_id' direction='in'/>
 +      <arg type='s' name='aptdaemon_task' direction='in'/>
 +    </method>
-+
++    
 +    <method name='UpdateLauncherIconFavoriteState'>
 +      <arg type='s' name='icon_uri' direction='in'/>
 +      <arg type='b' name='is_sticky' direction='in'/>
@@ -92,10 +92,10 @@
 +</node>
 diff --git a/src/plugins/gs-plugin-apt.c b/src/plugins/gs-plugin-apt.c
 new file mode 100644
-index 0000000..d5c54f1
+index 0000000..d9af67a
 --- /dev/null
 +++ b/src/plugins/gs-plugin-apt.c
-@@ -0,0 +1,976 @@
+@@ -0,0 +1,977 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
 + *
 + * Copyright (C) 2016 Canonical Ltd
@@ -1067,6 +1067,7 @@
 +	gs_app_set_management_plugin (app, "dpkg");
 +	gs_app_add_source (app, tokens[0]);
 +	gs_app_set_origin (app, path);
++	gs_app_set_kind (app, AS_APP_KIND_GENERIC);
 +
 +	gs_plugin_add_app (list, app);
 +

=== modified file 'debian/patches/dedup-source.patch'
--- debian/patches/dedup-source.patch	2016-03-29 03:47:46 +0000
+++ debian/patches/dedup-source.patch	2016-04-01 02:07:57 +0000
@@ -1,7 +1,7 @@
-From 0b15cf42a472bb0cba1980e63674b47ac8af000e Mon Sep 17 00:00:00 2001
+From e2ff62a7b9d4f93acdffc03c0f0ad1e30c89e919 Mon Sep 17 00:00:00 2001
 From: Robert Ancell <[e-mail]>
 Date: Wed, 17 Feb 2016 11:31:07 -0800
-Subject: [PATCH 10/17] De-dup based on source
+Subject: [PATCH 10/18] De-dup based on source
 
 ---
  src/gs-plugin.c | 13 ++++++++++---

=== modified file 'debian/patches/disable-update-monitor.patch'
--- debian/patches/disable-update-monitor.patch	2016-03-29 03:47:46 +0000
+++ debian/patches/disable-update-monitor.patch	2016-04-01 02:07:57 +0000
@@ -1,7 +1,7 @@
-From ab8336e889e136b97d5c1490ac52f98143921901 Mon Sep 17 00:00:00 2001
+From 205e51b284dabc8ac68b0365918c77469cdd4eaf Mon Sep 17 00:00:00 2001
 From: William Hua <[e-mail]>
 Date: Mon, 7 Mar 2016 09:13:07 -0500
-Subject: [PATCH 04/17] Manually disable update monitor
+Subject: [PATCH 04/18] Manually disable update monitor
 
 Ubuntu already has update-manager for this. This is an Ubuntu-specific change
 and should remain downstream.

=== modified file 'debian/patches/fwupd-error.patch'
--- debian/patches/fwupd-error.patch	2016-03-29 03:47:46 +0000
+++ debian/patches/fwupd-error.patch	2016-04-01 02:07:57 +0000
@@ -1,17 +1,17 @@
-From 79b5ed39606c6032f19260cc6588a80d2f3e9344 Mon Sep 17 00:00:00 2001
+From 07b280fafa4f92c9b5cec14701af8b3790e6b2c3 Mon Sep 17 00:00:00 2001
 From: William Hua <[e-mail]>
 Date: Wed, 16 Mar 2016 15:03:42 -0400
-Subject: [PATCH 14/17] Set error when org.freedesktop.fwupd has no service
+Subject: [PATCH 14/18] Set error when org.freedesktop.fwupd has no service
 
 ---
  src/plugins/gs-plugin-fwupd.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/plugins/gs-plugin-fwupd.c b/src/plugins/gs-plugin-fwupd.c
-index fa28c02..1d8e3d4 100644
+index a2bfd9a..312dfcd 100644
 --- a/src/plugins/gs-plugin-fwupd.c
 +++ b/src/plugins/gs-plugin-fwupd.c
-@@ -485,7 +485,10 @@ gs_plugin_add_updates (GsPlugin *plugin,
+@@ -496,7 +496,10 @@ gs_plugin_add_updates (GsPlugin *plugin,
  				     G_DBUS_ERROR,
  				     G_DBUS_ERROR_SERVICE_UNKNOWN)) {
  			/* the fwupd service might be unavailable, continue in that case */

=== modified file 'debian/patches/hide-empty-fields.patch'
--- debian/patches/hide-empty-fields.patch	2016-03-29 03:47:46 +0000
+++ debian/patches/hide-empty-fields.patch	2016-04-01 02:07:57 +0000
@@ -1,7 +1,7 @@
-From 74228765054a43b9264a9c140f6cb66bb9c97f5d Mon Sep 17 00:00:00 2001
+From 922fe1c5766c4b6df3d2867255483227ed79e9b1 Mon Sep 17 00:00:00 2001
 From: Robert Ancell <[e-mail]>
 Date: Tue, 29 Mar 2016 11:30:08 +1300
-Subject: [PATCH 01/17] Hide licence, updated and category fields if they
+Subject: [PATCH 01/18] Hide licence, updated and category fields if they
  aren't set
 
 ---
@@ -9,7 +9,7 @@
  1 file changed, 19 insertions(+)
 
 diff --git a/src/gs-shell-details.c b/src/gs-shell-details.c
-index 9caa854..9540ab7 100644
+index 1d59993..4b6ebf5 100644
 --- a/src/gs-shell-details.c
 +++ b/src/gs-shell-details.c
 @@ -77,13 +77,16 @@ struct _GsShellDetails
@@ -29,7 +29,7 @@
  	GtkWidget		*label_details_updated_value;
  	GtkWidget		*label_details_version_value;
  	GtkWidget		*label_failed;
-@@ -651,9 +654,13 @@ gs_shell_details_refresh_all (GsShellDetails *self)
+@@ -668,9 +671,13 @@ gs_shell_details_refresh_all (GsShellDetails *self)
  		/* 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);
@@ -43,7 +43,7 @@
  	}
  
  	/* set version */
-@@ -683,13 +690,18 @@ gs_shell_details_refresh_all (GsShellDetails *self)
+@@ -700,13 +707,18 @@ gs_shell_details_refresh_all (GsShellDetails *self)
  	if (updated == GS_APP_INSTALL_DATE_UNKNOWN ||
  	    updated == GS_APP_INSTALL_DATE_UNSET) {
  		/* TRANSLATORS: this is where the updated date is not known */
@@ -62,7 +62,7 @@
  	}
  
  	/* set the category */
-@@ -698,6 +710,8 @@ gs_shell_details_refresh_all (GsShellDetails *self)
+@@ -715,6 +727,8 @@ gs_shell_details_refresh_all (GsShellDetails *self)
  		/* TRANSLATORS: this is the application isn't in any
  		 * defined menu category */
  		gtk_label_set_label (GTK_LABEL (self->label_details_category_value), C_("menu category", "None"));
@@ -71,7 +71,7 @@
  	} else {
  		g_autofree gchar *path = NULL;
  		if (gtk_widget_get_direction (self->label_details_category_value) == GTK_TEXT_DIR_RTL)
-@@ -705,6 +719,8 @@ gs_shell_details_refresh_all (GsShellDetails *self)
+@@ -722,6 +736,8 @@ gs_shell_details_refresh_all (GsShellDetails *self)
  		else
  			path = g_strjoinv (" → ", menu_path);
  		gtk_label_set_label (GTK_LABEL (self->label_details_category_value), path);
@@ -80,7 +80,7 @@
  	}
  
  	/* set the origin */
-@@ -1570,13 +1586,16 @@ gs_shell_details_class_init (GsShellDetailsClass *klass)
+@@ -1587,13 +1603,16 @@ gs_shell_details_class_init (GsShellDetailsClass *klass)
  	gtk_widget_class_bind_template_child (widget_class, GsShellDetails, infobar_details_package_baseos);
  	gtk_widget_class_bind_template_child (widget_class, GsShellDetails, infobar_details_repo);
  	gtk_widget_class_bind_template_child (widget_class, GsShellDetails, label_addons_uninstalled_app);

=== modified file 'debian/patches/minimal-review-limits.patch'
--- debian/patches/minimal-review-limits.patch	2016-03-29 03:47:46 +0000
+++ debian/patches/minimal-review-limits.patch	2016-04-01 02:07:57 +0000
@@ -1,7 +1,7 @@
-From 74ab348a4ee2d03dfc857c99ce9ed7f98b82feb4 Mon Sep 17 00:00:00 2001
+From 89bb91224aec3d29276971bc520638343de8a866 Mon Sep 17 00:00:00 2001
 From: Robert Ancell <[e-mail]>
 Date: Thu, 11 Feb 2016 15:00:22 +1300
-Subject: [PATCH 08/17] Use minimal limits for review content
+Subject: [PATCH 08/18] Use minimal limits for review content
 
 ---
  src/gs-review-dialog.c | 10 +++++-----

=== modified file 'debian/patches/no-daemon.patch'
--- debian/patches/no-daemon.patch	2016-03-29 03:47:46 +0000
+++ debian/patches/no-daemon.patch	2016-04-01 02:07:57 +0000
@@ -1,63 +1,65 @@
-From 728a8f2ca54406891a4c871878741fac5efdeaa8 Mon Sep 17 00:00:00 2001
+From 1c71bec4b5ace082c3abdb04df0f964359f80ac5 Mon Sep 17 00:00:00 2001
 From: William Hua <[e-mail]>
-Date: Tue, 1 Mar 2016 17:30:47 -0500
-Subject: [PATCH 12/17] Only quit if we're not running as a GApplication
- service
-
-We were destroying the window explicitly even when the application was
-running as a service, causing subsequent activations to crash since the
-window was already destroyed.
-
-See also
-https://bugs.launchpad.net/ubuntu/+source/gnome-software/+bug/1552150.
+Date: Thu, 24 Mar 2016 09:59:58 -0400
+Subject: [PATCH 12/18] Terminate immediately on close
+
 ---
- src/gs-shell.c | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
+ src/gs-application.c |  1 -
+ src/gs-shell.c       | 22 ----------------------
+ 2 files changed, 23 deletions(-)
 
+diff --git a/src/gs-application.c b/src/gs-application.c
+index fa24d56..97ff103 100644
+--- a/src/gs-application.c
++++ b/src/gs-application.c
+@@ -769,7 +769,6 @@ gs_application_new (void)
+ 	return g_object_new (GS_APPLICATION_TYPE,
+ 			     "application-id", "org.gnome.Software",
+ 			     "flags", G_APPLICATION_HANDLES_OPEN,
+-			     "inactivity-timeout", 12000,
+ 			     NULL);
+ }
+ 
 diff --git a/src/gs-shell.c b/src/gs-shell.c
-index f0844d5..0169a95 100644
+index f0844d5..46d7e8a 100644
 --- a/src/gs-shell.c
 +++ b/src/gs-shell.c
-@@ -623,6 +623,13 @@ main_window_closed_cb (GtkWidget *dialog, GdkEvent *event, gpointer user_data)
- 	return TRUE;
+@@ -604,25 +604,6 @@ window_button_press_event (GtkWidget *win, GdkEventButton *event, GsShell *shell
+ 	return GDK_EVENT_STOP;
  }
  
-+static void
-+main_window_destroyed_cb (GtkWidget *widget,
-+			  GsShell   *shell)
-+{
-+	g_action_group_activate_action (G_ACTION_GROUP (g_application_get_default ()), "quit", NULL);
-+}
-+
+-static gboolean
+-main_window_closed_cb (GtkWidget *dialog, GdkEvent *event, gpointer user_data)
+-{
+-	GsShell *shell = user_data;
+-	GsShellPrivate *priv = gs_shell_get_instance_private (shell);
+-	BackEntry *entry;
+-
+-	/* When the window is closed, reset the initial mode to overview */
+-	priv->mode = GS_SHELL_MODE_OVERVIEW;
+-
+-	/* ... and clear any remaining entries in the back button stack */
+-	while ((entry = g_queue_pop_head (priv->back_entry_stack)) != NULL) {
+-		free_back_entry (entry);
+-	}
+-
+-	gtk_widget_hide (dialog);
+-	return TRUE;
+-}
+-
  /**
   * gs_shell_updates_changed_cb:
   */
-@@ -698,6 +705,7 @@ void
- gs_shell_setup (GsShell *shell, GsPluginLoader *plugin_loader, GCancellable *cancellable)
- {
- 	GsShellPrivate *priv = gs_shell_get_instance_private (shell);
-+	GApplicationFlags flags;
- 	GtkWidget *widget;
- 
- 	g_return_if_fail (GS_IS_SHELL (shell));
-@@ -719,8 +727,15 @@ gs_shell_setup (GsShell *shell, GsPluginLoader *plugin_loader, GCancellable *can
+@@ -719,9 +700,6 @@ gs_shell_setup (GsShell *shell, GsPluginLoader *plugin_loader, GCancellable *can
  	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
  					   GS_DATA G_DIR_SEPARATOR_S "icons");
  
 -	g_signal_connect (priv->main_window, "delete-event",
 -			  G_CALLBACK (main_window_closed_cb), shell);
-+	flags = g_application_get_flags (g_application_get_default ());
-+
-+	if (flags & G_APPLICATION_IS_SERVICE) {
-+		g_signal_connect (priv->main_window, "delete-event",
-+				  G_CALLBACK (main_window_closed_cb), shell);
-+	} else {
-+		g_signal_connect (priv->main_window, "destroy",
-+				  G_CALLBACK (main_window_destroyed_cb), shell);
-+	}
- 
+-
  	/* fix up the header bar */
  	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "header"));
+ 	if (in_desktop ("Unity")) {
 -- 
 2.7.4
 

=== modified file 'debian/patches/no-history.patch'
--- debian/patches/no-history.patch	2016-03-29 03:47:46 +0000
+++ debian/patches/no-history.patch	2016-04-01 02:07:57 +0000
@@ -1,17 +1,17 @@
-From a435a7b3cf74e844b6fa73c78849a6fe73c82c37 Mon Sep 17 00:00:00 2001
+From c1b8c79da8dd54db11ffd5e2e4cdc09df9a031b9 Mon Sep 17 00:00:00 2001
 From: Robert Ancell <[e-mail]>
 Date: Wed, 16 Mar 2016 16:06:23 +1300
-Subject: [PATCH 06/17] Disable history button
+Subject: [PATCH 06/18] Disable history button
 
 ---
  src/gs-shell-details.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/gs-shell-details.c b/src/gs-shell-details.c
-index 9540ab7..6754bf2 100644
+index 4b6ebf5..68cd749 100644
 --- a/src/gs-shell-details.c
 +++ b/src/gs-shell-details.c
-@@ -832,7 +832,8 @@ gs_shell_details_refresh_all (GsShellDetails *self)
+@@ -849,7 +849,8 @@ gs_shell_details_refresh_all (GsShellDetails *self)
  		break;
  	default:
  		gtk_widget_set_sensitive (self->button_history, history->len > 0);

=== modified file 'debian/patches/no-kudo-details.patch'
--- debian/patches/no-kudo-details.patch	2016-03-29 03:47:46 +0000
+++ debian/patches/no-kudo-details.patch	2016-04-01 02:07:57 +0000
@@ -1,7 +1,7 @@
-From 9e2b5e0137fb687f69e0254b7d8927b5e62092a3 Mon Sep 17 00:00:00 2001
+From 914aba0bf6c95442b0e437d52496ff7b1e3bb8ab Mon Sep 17 00:00:00 2001
 From: Robert Ancell <[e-mail]>
 Date: Thu, 25 Feb 2016 12:40:53 +1300
-Subject: [PATCH 11/17] Hide the Kudo details - they're not correctly populated
+Subject: [PATCH 11/18] Hide the Kudo details - they're not correctly populated
  in Ubuntu and probably don't make sense
 
 ---
@@ -9,10 +9,10 @@
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/src/gs-shell-details.c b/src/gs-shell-details.c
-index 6754bf2..5decf09 100644
+index 68cd749..efcb193 100644
 --- a/src/gs-shell-details.c
 +++ b/src/gs-shell-details.c
-@@ -816,9 +816,10 @@ gs_shell_details_refresh_all (GsShellDetails *self)
+@@ -833,9 +833,10 @@ gs_shell_details_refresh_all (GsShellDetails *self)
  
  	/* hide the kudo details for non-desktop software */
  	switch (gs_app_get_kind (self->app)) {

=== added file 'debian/patches/no-notification-actions.patch'
--- debian/patches/no-notification-actions.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/no-notification-actions.patch	2016-04-01 02:07:57 +0000
@@ -0,0 +1,169 @@
+From 01a888ef20ccb7d962a244710f6c7ea9c903a443 Mon Sep 17 00:00:00 2001
+From: William Hua <[e-mail]>
+Date: Wed, 23 Mar 2016 10:27:19 -0400
+Subject: [PATCH 17/18] Don't use notification actions under Unity
+
+---
+ src/gs-dbus-helper.c    | 14 +++++++++++---
+ src/gs-update-monitor.c | 37 ++++++++++++++++++++++++++-----------
+ src/gs-utils.c          | 22 +++++++++++++++-------
+ 3 files changed, 52 insertions(+), 21 deletions(-)
+
+diff --git a/src/gs-dbus-helper.c b/src/gs-dbus-helper.c
+index e657f2a..b75e950 100644
+--- a/src/gs-dbus-helper.c
++++ b/src/gs-dbus-helper.c
+@@ -284,6 +284,12 @@ is_show_confirm_search_set (const gchar *interaction)
+ 	return ret;
+ }
+ 
++static gboolean
++is_unity (void)
++{
++	return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0;
++}
++
+ static void
+ notify_search_resources (GsShellExtrasMode   mode,
+                          const gchar        *desktop_id,
+@@ -344,9 +350,11 @@ notify_search_resources (GsShellExtrasMode   mode,
+ 
+ 	n = g_notification_new (title);
+ 	g_notification_set_body (n, body);
+-	/* TRANSLATORS: this is a button that launches gnome-software */
+-	g_notification_add_button_with_target (n, _("Find in Software"), "app.install-resources", "(s^ass)", mode_string, resources, "");
+-	g_notification_set_default_action_and_target (n, "app.install-resources", "(s^ass)", mode_string, resources, "");
++	if (!is_unity ()) {
++		/* TRANSLATORS: this is a button that launches gnome-software */
++		g_notification_add_button_with_target (n, _("Find in Software"), "app.install-resources", "(s^ass)", mode_string, resources, "");
++		g_notification_set_default_action_and_target (n, "app.install-resources", "(s^ass)", mode_string, resources, "");
++	}
+ 	g_application_send_notification (g_application_get_default (), "install-resources", n);
+ }
+ 
+diff --git a/src/gs-update-monitor.c b/src/gs-update-monitor.c
+index a37c13c..cd472a5 100644
+--- a/src/gs-update-monitor.c
++++ b/src/gs-update-monitor.c
+@@ -57,6 +57,12 @@ reenable_offline_update_notification (gpointer data)
+ 	return G_SOURCE_REMOVE;
+ }
+ 
++static gboolean
++is_unity (void)
++{
++	return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0;
++}
++
+ static void
+ notify_offline_update_available (GsUpdateMonitor *monitor)
+ {
+@@ -90,17 +96,21 @@ notify_offline_update_available (GsUpdateMonitor *monitor)
+ 		body = _("It is recommended that you install important updates now");
+ 		n = g_notification_new (title);
+ 		g_notification_set_body (n, body);
+-		g_notification_add_button (n, _("Restart & Install"), "app.reboot-and-install");
+-		g_notification_set_default_action_and_target (n, "app.set-mode", "s", "updates");
++		if (!is_unity ()) {
++			g_notification_add_button (n, _("Restart & Install"), "app.reboot-and-install");
++			g_notification_set_default_action_and_target (n, "app.set-mode", "s", "updates");
++		}
+ 		g_application_send_notification (monitor->application, "updates-available", n);
+ 	} else {
+ 		title = _("Software Updates Available");
+ 		body = _("Important OS and application updates are ready to be installed");
+ 		n = g_notification_new (title);
+ 		g_notification_set_body (n, body);
+-		g_notification_add_button (n, _("Not Now"), "app.nop");
+-		g_notification_add_button_with_target (n, _("View"), "app.set-mode", "s", "updates");
+-		g_notification_set_default_action_and_target (n, "app.set-mode", "s", "updates");
++		if (!is_unity ()) {
++			g_notification_add_button (n, _("Not Now"), "app.nop");
++			g_notification_add_button_with_target (n, _("View"), "app.set-mode", "s", "updates");
++			g_notification_set_default_action_and_target (n, "app.set-mode", "s", "updates");
++		}
+ 		g_application_send_notification (monitor->application, "updates-available", n);
+ 	}
+ }
+@@ -233,7 +243,8 @@ get_upgrades_finished_cb (GObject *object,
+ 	/* TRANSLATORS: this is a distro upgrade */
+ 	n = g_notification_new (_("Software Upgrade Available"));
+ 	g_notification_set_body (n, body);
+-	g_notification_set_default_action_and_target (n, "app.set-mode", "s", "updates");
++	if (!is_unity ())
++		g_notification_set_default_action_and_target (n, "app.set-mode", "s", "updates");
+ 	g_application_send_notification (monitor->application, "upgrades-available", n);
+ }
+ 
+@@ -429,9 +440,11 @@ get_updates_historical_cb (GObject *object, GAsyncResult *res, gpointer data)
+ 			/* TRANSLATORS: message when we offline updates have failed */
+ 			g_notification_set_body (notification, _("An important OS update failed to be installed."));
+ 			g_application_send_notification (monitor->application, "offline-updates", notification);
+-			g_notification_add_button (notification, _("Show Details"), "app.show-offline-update-error");
+-			g_notification_set_default_action (notification, "app.show-offline-update-error");
+-			g_application_send_notification (monitor->application, "offline-updates", notification);
++			if (!is_unity ()) {
++				g_notification_add_button (notification, _("Show Details"), "app.show-offline-update-error");
++				g_notification_set_default_action (notification, "app.show-offline-update-error");
++				g_application_send_notification (monitor->application, "offline-updates", notification);
++			}
+ 		}
+ 		return;
+ 	}
+@@ -459,8 +472,10 @@ get_updates_historical_cb (GObject *object, GAsyncResult *res, gpointer data)
+ 	 * users can't express their opinions here. In some languages
+ 	 * "Review (evaluate) something" is a different translation than
+ 	 * "Review (browse) something." */
+-	g_notification_add_button_with_target (notification, C_("updates", "Review"), "app.set-mode", "s", "updated");
+-	g_notification_set_default_action_and_target (notification, "app.set-mode", "s", "updated");
++	if (!is_unity ()) {
++		g_notification_add_button_with_target (notification, C_("updates", "Review"), "app.set-mode", "s", "updated");
++		g_notification_set_default_action_and_target (notification, "app.set-mode", "s", "updated");
++	}
+ 	g_application_send_notification (monitor->application, "offline-updates", notification);
+ 
+ 	/* update the timestamp so we don't show again */
+diff --git a/src/gs-utils.c b/src/gs-utils.c
+index fbdb1a6..399f903 100644
+--- a/src/gs-utils.c
++++ b/src/gs-utils.c
+@@ -129,6 +129,12 @@ gs_grab_focus_when_mapped (GtkWidget *widget)
+ 					G_CALLBACK (grab_focus), NULL);
+ }
+ 
++static gboolean
++is_unity (void)
++{
++	return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0;
++}
++
+ void
+ gs_app_notify_installed (GsApp *app)
+ {
+@@ -139,14 +145,16 @@ gs_app_notify_installed (GsApp *app)
+ 	 * has been successfully installed */
+ 	summary = g_strdup_printf (_("%s is now installed"), gs_app_get_name (app));
+ 	n = g_notification_new (summary);
+-	if (gs_app_get_kind (app) == AS_APP_KIND_DESKTOP) {
+-		/* TRANSLATORS: this is button that opens the newly installed application */
+-		g_notification_add_button_with_target (n, _("Launch"),
+-						       "app.launch", "s",
+-						       gs_app_get_id (app));
++	if (!is_unity ()) {
++		if (gs_app_get_kind (app) == AS_APP_KIND_DESKTOP) {
++			/* TRANSLATORS: this is button that opens the newly installed application */
++			g_notification_add_button_with_target (n, _("Launch"),
++							       "app.launch", "s",
++							       gs_app_get_id (app));
++		}
++		g_notification_set_default_action_and_target  (n, "app.details", "(ss)",
++							       gs_app_get_id (app), "");
+ 	}
+-	g_notification_set_default_action_and_target  (n, "app.details", "(ss)",
+-						       gs_app_get_id (app), "");
+ 	g_application_send_notification (g_application_get_default (), "installed", n);
+ }
+ 
+-- 
+2.7.4
+

=== modified file 'debian/patches/no-offline-updates.patch'
--- debian/patches/no-offline-updates.patch	2016-03-29 03:47:46 +0000
+++ debian/patches/no-offline-updates.patch	2016-04-01 02:07:57 +0000
@@ -1,7 +1,7 @@
-From 399b5b1bf8c4ae345e88d96b1147076d94e630d9 Mon Sep 17 00:00:00 2001
+From 705442859e27dd7eae0625102f73c4cf855428e2 Mon Sep 17 00:00:00 2001
 From: Robert Ancell <[e-mail]>
 Date: Wed, 16 Mar 2016 15:09:41 +1300
-Subject: [PATCH 03/17] Disable offline updates, they don't work in Ubuntu
+Subject: [PATCH 03/18] Disable offline updates, they don't work in Ubuntu
 
 ---
  src/gs-shell-updates.c | 6 ++++--

=== added file 'debian/patches/rename-menu-item.patch'
--- debian/patches/rename-menu-item.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/rename-menu-item.patch	2016-04-01 02:07:57 +0000
@@ -0,0 +1,25 @@
+From 45f7efb3e289e46ea952792cc0085624da736f9c Mon Sep 17 00:00:00 2001
+From: William Hua <[e-mail]>
+Date: Mon, 14 Mar 2016 10:56:42 -0400
+Subject: [PATCH 16/18] 'Software Sources' -> 'Software & Updates' in menu
+
+---
+ src/menus.ui | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/menus.ui b/src/menus.ui
+index b138ba5..1dc4c18 100644
+--- a/src/menus.ui
++++ b/src/menus.ui
+@@ -4,7 +4,7 @@
+   <menu id="app-menu">
+     <section>
+       <item>
+-        <attribute name="label" translatable="yes">_Software Sources</attribute>
++        <attribute name="label" translatable="yes">_Software &amp; Updates</attribute>
+         <attribute name="action">app.sources</attribute>
+       </item>
+     </section>
+-- 
+2.7.4
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2016-03-29 03:47:46 +0000
+++ debian/patches/series	2016-04-01 02:07:57 +0000
@@ -13,3 +13,5 @@
 software-properties.patch
 fwupd-error.patch
 appstream-refresh.patch
+rename-menu-item.patch
+no-notification-actions.patch

=== modified file 'debian/patches/software-properties.patch'
--- debian/patches/software-properties.patch	2016-03-29 03:47:46 +0000
+++ debian/patches/software-properties.patch	2016-04-01 02:07:57 +0000
@@ -1,20 +1,19 @@
-From 56aee4f46da074a2116273a4b6817eb865bfc142 Mon Sep 17 00:00:00 2001
+From 84e37e449259aa263d33a47ebb8d51c0c09c80b1 Mon Sep 17 00:00:00 2001
 From: William Hua <[e-mail]>
 Date: Tue, 1 Mar 2016 13:46:56 -0500
-Subject: [PATCH 13/17] Launch software-properties-gtk in place of the sources
+Subject: [PATCH 13/18] Launch software-properties-gtk in place of the sources
  dialog
 
 https://bugs.launchpad.net/ubuntu/+source/gnome-software/+bug/1551702
 ---
  src/gs-shell.c | 3 +++
- src/menus.ui   | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
+ 1 file changed, 3 insertions(+)
 
 diff --git a/src/gs-shell.c b/src/gs-shell.c
-index 0169a95..244b89b 100644
+index 46d7e8a..66bbe38 100644
 --- a/src/gs-shell.c
 +++ b/src/gs-shell.c
-@@ -899,6 +899,9 @@ gs_shell_show_sources (GsShell *shell)
+@@ -862,6 +862,9 @@ gs_shell_show_sources (GsShell *shell)
  	GsShellPrivate *priv = gs_shell_get_instance_private (shell);
  	GtkWidget *dialog;
  
@@ -24,19 +23,6 @@
  	dialog = gs_sources_dialog_new (priv->main_window, priv->plugin_loader);
  	gs_shell_modal_dialog_present (shell, GTK_DIALOG (dialog));
  }
-diff --git a/src/menus.ui b/src/menus.ui
-index b138ba5..1dc4c18 100644
---- a/src/menus.ui
-+++ b/src/menus.ui
-@@ -4,7 +4,7 @@
-   <menu id="app-menu">
-     <section>
-       <item>
--        <attribute name="label" translatable="yes">_Software Sources</attribute>
-+        <attribute name="label" translatable="yes">_Software &amp; Updates</attribute>
-         <attribute name="action">app.sources</attribute>
-       </item>
-     </section>
 -- 
 2.7.4
 

=== modified file 'debian/patches/ubuntu-review-submit.patch'
--- debian/patches/ubuntu-review-submit.patch	2016-03-29 03:47:46 +0000
+++ debian/patches/ubuntu-review-submit.patch	2016-04-01 02:07:57 +0000
@@ -1,7 +1,8 @@
-From 3dff001e45bfa4af3e98390ff3af808af8c3a0ec Mon Sep 17 00:00:00 2001
+From 1f8e790853347fc22a86e4893d8d58e0caf1299d Mon Sep 17 00:00:00 2001
 From: Robert Ancell <[e-mail]>
-Date: Fri, 19 Feb 2016 11:22:37 -0800
-Subject: [PATCH 07/17] Add support for submiting reviews to reviews.ubuntu.com
+Date: Thu, 31 Mar 2016 19:55:07 -0400
+Subject: [PATCH 07/18] Add support for submitting reviews to
+ reviews.ubuntu.com
 
 Authentication work done by William Hua
 ---
@@ -21,7 +22,7 @@
  create mode 100644 src/plugins/gs-ubuntu-login-dialog.ui
 
 diff --git a/configure.ac b/configure.ac
-index 0f00591..cb9a3b9 100644
+index 6c86c62..27d5566 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -68,6 +68,8 @@ PKG_CHECK_MODULES(SQLITE, sqlite3)
@@ -86,7 +87,7 @@
  G_END_DECLS
  
 diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
-index 07546c4..b8d16fb 100644
+index 5ea32be..bc4dd98 100644
 --- a/src/plugins/Makefile.am
 +++ b/src/plugins/Makefile.am
 @@ -13,6 +13,8 @@ AM_CPPFLAGS =						\
@@ -98,7 +99,7 @@
  	-DBINDIR=\"$(bindir)\"				\
  	-DDATADIR=\"$(datadir)\"			\
  	-DGS_MODULESETDIR=\"$(datadir)/gnome-software/modulesets.d\" \
-@@ -165,8 +167,15 @@ libgs_plugin_hardcoded_blacklist_la_LDFLAGS = -module -avoid-version
+@@ -168,8 +170,15 @@ libgs_plugin_hardcoded_blacklist_la_LDFLAGS = -module -avoid-version
  libgs_plugin_hardcoded_blacklist_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
  
  libgs_plugin_ubuntu_reviews_la_SOURCES =		\

=== modified file 'debian/patches/update-descriptions.patch'
--- debian/patches/update-descriptions.patch	2016-03-29 03:47:46 +0000
+++ debian/patches/update-descriptions.patch	2016-04-01 02:07:57 +0000
@@ -1,7 +1,7 @@
-From 83b465f747a55a8055fe4a3e89ce4b66c3392315 Mon Sep 17 00:00:00 2001
+From 6a50d4676fe50d8116e744fa212194cc03e6a622 Mon Sep 17 00:00:00 2001
 From: Robert Ancell <[e-mail]>
 Date: Tue, 15 Mar 2016 14:12:13 +1300
-Subject: [PATCH 05/17] Format update descriptions to be suitable for Ubuntu.
+Subject: [PATCH 05/18] Format update descriptions to be suitable for Ubuntu.
 
 Don't show the update descriptions on the updates page - it's too complex to fit.
 Don't try and use markup - it doesn't work well with the information sourced from debian/changelog.

=== modified file 'debian/patches/window-decorations.patch'
--- debian/patches/window-decorations.patch	2016-03-29 03:47:46 +0000
+++ debian/patches/window-decorations.patch	2016-04-01 02:07:57 +0000
@@ -1,7 +1,7 @@
-From 5bbb53e15237746f0129d3dffc930bde66483817 Mon Sep 17 00:00:00 2001
+From 3ad704bda0701aa1df5cbc8ab309193ce26d3ec5 Mon Sep 17 00:00:00 2001
 From: Robert Ancell <[e-mail]>
 Date: Thu, 3 Mar 2016 15:13:50 +1300
-Subject: [PATCH 02/17] Use traditional window decorations in Unity
+Subject: [PATCH 02/18] Use traditional window decorations in Unity
 
 ---
  src/gs-shell.c | 29 +++++++++++++++++++++++++----