Ubuntu
gnome-initial-setup package

Merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master

  1. Git
  2. lp:~azzar1/ubuntu/+source/gnome-initial-setup
  3. ubuntu/master-ubuntu-firstrun
  4. Merge into ubuntu/master
Proposed by Andrea Azzarone
Status: Merged
Merged at revision: 663c0cc4b2284b16d08562ce2f8c10b02e41c778
Proposed branch: ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun
Merge into: ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
Diff against target: 66 lines (+12/-6)
3 files modified
debian/changelog (+6/-0)
debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch (+2/-2)
debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch (+4/-4)
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+356910@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index c1bea68..9394f07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
1gnome-initial-setup (3.30.0-1ubuntu3) UNRELEASED; urgency=medium
2
3 * Populate featured snaps from ubuntu-firstrun category
4
5 -- Andrea Azzarone <andrea.azzarone@canonical.com> Wed, 17 Oct 2018 10:25:35 +0100
6
1gnome-initial-setup (3.30.0-1ubuntu2) cosmic; urgency=medium7gnome-initial-setup (3.30.0-1ubuntu2) cosmic; urgency=medium
28
3 * Add Don-t-show-Facebook-in-Ubuntu.patch:9 * 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
468\ No newline at end of file468\ No newline at end of file
469diff --git a/gnome-initial-setup/pages/apps/gis-apps-page.c b/gnome-initial-setup/pages/apps/gis-apps-page.c469diff --git a/gnome-initial-setup/pages/apps/gis-apps-page.c b/gnome-initial-setup/pages/apps/gis-apps-page.c
470new file mode 100644470new file mode 100644
471index 0000000..bcd9462471index 0000000..1230c61
472--- /dev/null472--- /dev/null
473+++ b/gnome-initial-setup/pages/apps/gis-apps-page.c473+++ b/gnome-initial-setup/pages/apps/gis-apps-page.c
474@@ -0,0 +1,528 @@474@@ -0,0 +1,528 @@
@@ -953,7 +953,7 @@ index 0000000..bcd9462
953+ installed_snaps = snapd_client_list_sync (client, NULL, &error);953+ installed_snaps = snapd_client_list_sync (client, NULL, &error);
954+ if (installed_snaps == NULL)954+ if (installed_snaps == NULL)
955+ g_warning ("Failed to get installed snaps: %s", error->message);955+ g_warning ("Failed to get installed snaps: %s", error->message);
956+ featured_snaps = snapd_client_find_section_sync (client, SNAPD_FIND_FLAGS_NONE, "featured", NULL, NULL, NULL, &error);956+ featured_snaps = snapd_client_find_section_sync (client, SNAPD_FIND_FLAGS_NONE, "ubuntu-firstrun", NULL, NULL, NULL, &error);
957+ if (featured_snaps != NULL) {957+ if (featured_snaps != NULL) {
958+ guint i, n_tiles = 0, n_extra = 0;958+ guint i, n_tiles = 0, n_extra = 0;
959+959+
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
166 obj_props[PROP_NEEDS_ACCEPT] =166 obj_props[PROP_NEEDS_ACCEPT] =
167 g_param_spec_boolean ("needs-accept", "", "", FALSE,167 g_param_spec_boolean ("needs-accept", "", "", FALSE,
168 G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);168 G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
169@@ -282,6 +293,21 @@ gis_page_set_skippable (GisPage *page, gboolean skippable)169@@ -283,6 +294,21 @@ gis_page_set_skippable (GisPage *page, gboolean skippable)
170 g_object_notify_by_pspec (G_OBJECT (page), obj_props[PROP_SKIPPABLE]);
171 }170 }
172 171
173+gboolean172 gboolean
174+gis_page_get_hide_navigation (GisPage *page)173+gis_page_get_hide_navigation (GisPage *page)
175+{174+{
176+ GisPagePrivate *priv = gis_page_get_instance_private (page);175+ GisPagePrivate *priv = gis_page_get_instance_private (page);
@@ -185,9 +184,10 @@ index 8564935..64272ba 100644
185+ g_object_notify_by_pspec (G_OBJECT (page), obj_props[PROP_HIDE_NAVIGATION]);184+ g_object_notify_by_pspec (G_OBJECT (page), obj_props[PROP_HIDE_NAVIGATION]);
186+}185+}
187+186+
188 gboolean187+gboolean
189 gis_page_get_needs_accept (GisPage *page)188 gis_page_get_needs_accept (GisPage *page)
190 {189 {
190 GisPagePrivate *priv = gis_page_get_instance_private (page);
191diff --git a/gnome-initial-setup/gis-page.h b/gnome-initial-setup/gis-page.h191diff --git a/gnome-initial-setup/gis-page.h b/gnome-initial-setup/gis-page.h
192index b9a3e9a..3862caf 100644192index b9a3e9a..3862caf 100644
193--- a/gnome-initial-setup/gis-page.h193--- a/gnome-initial-setup/gis-page.h

Subscribers

People subscribed via source and target branches