Andrea Azzarone has proposed merging
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into
~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/356910
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into
~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index c1bea68..9394f07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnome-initial-setup (3.30.0-1ubuntu3) UNRELEASED; urgency=medium
+
+ * Populate featured snaps from ubuntu-firstrun category
+
+ -- Andrea Azzarone <andrea.azzar...@canonical.com> Wed, 17 Oct 2018 10:25:35 +0100
+
gnome-initial-setup (3.30.0-1ubuntu2) cosmic; urgency=medium
* Add Don-t-show-Facebook-in-Ubuntu.patch:
diff --git a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
index df7bbdb..3de104b 100644
--- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
+++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
@@ -468,7 +468,7 @@ index 0000000..0d8dd94
\ No newline at end of file
diff --git a/gnome-initial-setup/pages/apps/gis-apps-page.c b/gnome-initial-setup/pages/apps/gis-apps-page.c
new file mode 100644
-index 0000000..bcd9462
+index 0000000..1230c61
--- /dev/null
+++ b/gnome-initial-setup/pages/apps/gis-apps-page.c
@@ -0,0 +1,528 @@
@@ -953,7 +953,7 @@ index 0000000..bcd9462
+ installed_snaps = snapd_client_list_sync (client, NULL, &error);
+ if (installed_snaps == NULL)
+ g_warning ("Failed to get installed snaps: %s", error->message);
-+ featured_snaps = snapd_client_find_section_sync (client, SNAPD_FIND_FLAGS_NONE, "featured", NULL, NULL, NULL, &error);
++ featured_snaps = snapd_client_find_section_sync (client, SNAPD_FIND_FLAGS_NONE, "ubuntu-firstrun", NULL, NULL, NULL, &error);
+ if (featured_snaps != NULL) {
+ guint i, n_tiles = 0, n_extra = 0;
+
diff --git a/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch b/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch
index 8bad3a5..623f566 100644
--- a/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch
+++ b/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch
@@ -166,11 +166,10 @@ index 8564935..64272ba 100644
obj_props[PROP_NEEDS_ACCEPT] =
g_param_spec_boolean ("needs-accept", "", "", FALSE,
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
-@@ -282,6 +293,21 @@ gis_page_set_skippable (GisPage *page, gboolean skippable)
- g_object_notify_by_pspec (G_OBJECT (page), obj_props[PROP_SKIPPABLE]);
+@@ -283,6 +294,21 @@ gis_page_set_skippable (GisPage *page, gboolean skippable)
}
-+gboolean
+ gboolean
+gis_page_get_hide_navigation (GisPage *page)
+{
+ GisPagePrivate *priv = gis_page_get_instance_private (page);
@@ -185,9 +184,10 @@ index 8564935..64272ba 100644
+ g_object_notify_by_pspec (G_OBJECT (page), obj_props[PROP_HIDE_NAVIGATION]);
+}
+
- gboolean
++gboolean
gis_page_get_needs_accept (GisPage *page)
{
+ GisPagePrivate *priv = gis_page_get_instance_private (page);
diff --git a/gnome-initial-setup/gis-page.h b/gnome-initial-setup/gis-page.h
index b9a3e9a..3862caf 100644
--- a/gnome-initial-setup/gis-page.h
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
