Skip to content
Commits on Source (100)
This diff is collapsed.
42.beta
-------
* Bugs fixed:
- !137 welcome: tweak illustration
- !138 timezone: Load GisLocationEntry type before page template
* Translation updates:
- Basque
- Chinese (China)
- Galician
- Hebrew
- Indonesian
- Slovenian
- Spanish
42.alpha.1
----------
* Fix gweather4 pkg-config name.
* Fix project license identifier in Meson build rules.
* Translation updates:
- Portuguese (Brazil)
42.alpha
----
* Initial Setup now depends on libgweather-4 and gnome-desktop-4, rather than
their predecessors. Meson wrap files are provided in case these dependencies
are not available.
* The third-party software sources page has been tweaked to more accurately
describe what the switch does, and to replace the switch with a
suggested-action toggle button. (This page is currently Fedora-specific;
patches welcome!)
* The COPYING file has been clarified to contain only a copy of GPL version 2.
Previously it also contained a copy of LGPL version 2 (not 2.1). There is no
change to the actual licensing of GNOME Initial Setup: as before, it is
distributed under the terms of the GNU General Public License, version 2 or
later.
* The summary page widget tree has been simplified, with no visual change.
* Some Meson deprecation warnings have been addressed. Meson 0.53.0 or newer is
now required to build Initial Setup.
* Translation updates:
- Basque
- Bulgarian
- Chinese (China)
- Croatian
- Friulian
- Hebrew
- Icelandic
- Indonesian
- Japanese
- Latvian
- Occitan (post 1500)
- Portuguese
- Portuguese (Brazil)
- Russian
- Serbian
- Slovak
- Spanish
- Swedish
- Ukrainian
- Vietnamese
41.0
----
......
......@@ -64,3 +64,9 @@ new_user_only=privacy
# Accounts page
providers=owncloud;imap_smtp
```
License
-------
GNOME Initial Setup is distributed under the terms of the GNU General Public License,
version 2 or later. See the [COPYING](COPYING) file for details.
......@@ -31,7 +31,6 @@ desktop_conf.set('systemd_hidden', enable_systemd ? 'true' : 'false')
foreach desktop_file: autostart_files
i18n.merge_file(
'desktop',
input: configure_file(
input: files(desktop_file + '.in.in'),
output: desktop_file + '.in',
......@@ -46,7 +45,6 @@ foreach desktop_file: autostart_files
endforeach
i18n.merge_file(
'desktop',
input: configure_file(
input: files('gnome-initial-setup.desktop.in.in'),
output: 'gnome-initial-setup.desktop.in',
......
gnome-initial-setup (42~beta-1ubuntu1) jammy; urgency=medium
* Resynchronize with Debian. Remaining changes:
+ debian/control.in:
- Build-Depends on libsnapd-glib-dev, libsoup2.4-dev, libsysmetrics-dev
+ Add Ubuntu-specific patches:
- 0001-Make-summary-page-explicitly-request-navigation-butt.patch
- 0001-Ensure-stamp-file-if-the-user-quit-the-wizard.patch
- 0001-Add-Ubuntu-mode-with-special-pages.patch
- 0001-Display-the-ubuntu-welcome-wizard-in-Unity.patch
- 0006-goa-Add-Ubuntu-Single-Sign-On-to-the-list.patch
- 0007-goa-adjust-description-to-not-mention-email-or-conta.patch
- Don-t-show-Facebook-in-Ubuntu.patch
- 0008-Ubuntu-location-default.patch
- ubuntu_newuser_wizard.patch:
+ revert the new upstream behaviour of not using the wizard for
existing users since it has a purpose in Ubuntu
-- Jeremy Bicha <jeremy.bicha@canonical.com> Thu, 17 Feb 2022 08:22:03 -0500
gnome-initial-setup (42~beta-1) unstable; urgency=medium
* New upstream release
* Drop all patches: applied in new release
* Add patch to support GNOME 42 dark theme preference
* Revert switch to libgweather4
* Build-Depend on libgnome-desktop-4-dev instead of libgnome-desktop-3-dev
* debian/control.in: Build-Depend on libhandy
* debian/vendor.conf: Drop unused run_welcome_tour line
-- Jeremy Bicha <jeremy.bicha@canonical.com> Wed, 16 Feb 2022 10:34:12 -0500
gnome-initial-setup (41.2-2) unstable; urgency=medium
* Team upload
* d/patches: Update to upstream gnome-41 branch commit 41.2-2-g916995f0
- Update Icelandic translation
* d/p/build-Fix-Meson-deprecation-warning.patch:
Add patch from upstream to fix FTBFS with recent Meson
(Closes: #1004780)
-- Simon McVittie <smcv@debian.org> Tue, 01 Feb 2022 23:03:00 +0000
gnome-initial-setup (41.2-1) unstable; urgency=medium
* New upstream release
* debian/vendor.conf: Don't try to run the welcome tour on Ubuntu
-- Jeremy Bicha <jbicha@debian.org> Sun, 05 Dec 2021 02:57:19 -0500
gnome-initial-setup (41.0-1ubuntu1) jammy; urgency=medium
* Resynchronize with Debian. Remaining changes:
......
......@@ -19,11 +19,12 @@ Build-Depends: debhelper-compat (= 13),
libgeoclue-2-dev (>= 2.3.1),
libgeocode-glib-dev,
libglib2.0-dev (>= 2.63.1),
libgnome-desktop-3-dev (>= 3.7.5),
libgnome-desktop-4-dev,
libgoa-1.0-dev,
libgoa-backend-1.0-dev,
libgtk-3-dev (>= 3.19.12),
libgweather-3-dev (>= 3.13.91),
libhandy-1-dev (>= 1.5.90),
libibus-1.0-dev (>= 1.5.2),
libjson-glib-dev,
libkrb5-dev,
......
......@@ -15,11 +15,12 @@ Build-Depends: debhelper-compat (= 13),
libgeoclue-2-dev (>= 2.3.1),
libgeocode-glib-dev,
libglib2.0-dev (>= 2.63.1),
libgnome-desktop-3-dev (>= 3.7.5),
libgnome-desktop-4-dev,
libgoa-1.0-dev,
libgoa-backend-1.0-dev,
libgtk-3-dev (>= 3.19.12),
libgweather-3-dev (>= 3.13.91),
libhandy-1-dev (>= 1.5.90),
libibus-1.0-dev (>= 1.5.2),
libjson-glib-dev,
libkrb5-dev,
......
......@@ -9,10 +9,10 @@ Subject: [PATCH] Display the ubuntu welcome wizard in Unity Don't display the
gnome-initial-setup/gnome-initial-setup.c | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
Index: gnome-initial-setup/data/gnome-initial-setup-first-login.desktop.in.in
===================================================================
--- gnome-initial-setup.orig/data/gnome-initial-setup-first-login.desktop.in.in
+++ gnome-initial-setup/data/gnome-initial-setup-first-login.desktop.in.in
diff --git a/data/gnome-initial-setup-first-login.desktop.in.in b/data/gnome-initial-setup-first-login.desktop.in.in
index f3d0df7..38f86cf 100644
--- a/data/gnome-initial-setup-first-login.desktop.in.in
+++ b/data/gnome-initial-setup-first-login.desktop.in.in
@@ -7,7 +7,7 @@ Terminal=false
Type=Application
StartupNotify=true
......@@ -22,10 +22,10 @@ Index: gnome-initial-setup/data/gnome-initial-setup-first-login.desktop.in.in
NoDisplay=true
AutostartCondition=unless-exists gnome-initial-setup-done
X-GNOME-HiddenUnderSystemd=@systemd_hidden@
Index: gnome-initial-setup/gnome-initial-setup/gnome-initial-setup.c
===================================================================
--- gnome-initial-setup.orig/gnome-initial-setup/gnome-initial-setup.c
+++ gnome-initial-setup/gnome-initial-setup/gnome-initial-setup.c
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 81281d8..46d0b48 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -97,6 +97,16 @@ static PageData ubuntu_page_table[] = {
{ NULL },
};
......
......@@ -3,14 +3,14 @@ Date: Tue, 8 May 2018 17:16:03 +1200
Subject: Ensure stamp file if the user quit the wizard
---
gnome-initial-setup/gis-driver.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
gnome-initial-setup/gis-driver.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
Index: gnome-initial-setup/gnome-initial-setup/gis-driver.c
===================================================================
--- gnome-initial-setup.orig/gnome-initial-setup/gis-driver.c
+++ gnome-initial-setup/gnome-initial-setup/gis-driver.c
@@ -589,6 +589,17 @@ gis_driver_is_small_screen (GisDriver *d
diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c
index daf3a43..77434ee 100644
--- a/gnome-initial-setup/gis-driver.c
+++ b/gnome-initial-setup/gis-driver.c
@@ -589,6 +589,17 @@ gis_driver_is_small_screen (GisDriver *driver)
return driver->small_screen;
}
......@@ -28,7 +28,7 @@ Index: gnome-initial-setup/gnome-initial-setup/gis-driver.c
static gboolean
monitor_is_small (GdkMonitor *monitor)
{
@@ -873,6 +884,7 @@ gis_driver_class_init (GisDriverClass *k
@@ -873,6 +884,7 @@ gis_driver_class_init (GisDriverClass *klass)
gobject_class->finalize = gis_driver_finalize;
application_class->startup = gis_driver_startup;
application_class->activate = gis_driver_activate;
......
......@@ -11,10 +11,10 @@ Subject: [PATCH 4/6] Make summary page explicitly request navigation buttons
.../pages/summary/gis-summary-page.c | 2 ++
5 files changed, 54 insertions(+), 3 deletions(-)
Index: gnome-initial-setup/gnome-initial-setup/gis-assistant.c
===================================================================
--- gnome-initial-setup.orig/gnome-initial-setup/gis-assistant.c
+++ gnome-initial-setup/gnome-initial-setup/gis-assistant.c
diff --git a/gnome-initial-setup/gis-assistant.c b/gnome-initial-setup/gis-assistant.c
index 8405357..b71cd07 100644
--- a/gnome-initial-setup/gis-assistant.c
+++ b/gnome-initial-setup/gis-assistant.c
@@ -47,6 +47,7 @@ struct _GisAssistant
GtkBox parent_instance;
......@@ -36,7 +36,7 @@ Index: gnome-initial-setup/gnome-initial-setup/gis-assistant.c
}
static void
@@ -185,6 +190,7 @@ set_navigation_button (GisAssistant *ass
@@ -185,6 +190,7 @@ set_navigation_button (GisAssistant *assistant,
GtkWidget *widget)
{
gtk_widget_set_visible (assistant->forward, (widget == assistant->forward));
......@@ -44,7 +44,7 @@ Index: gnome-initial-setup/gnome-initial-setup/gis-assistant.c
gtk_widget_set_visible (assistant->accept, (widget == assistant->accept));
gtk_widget_set_visible (assistant->skip, (widget == assistant->skip));
}
@@ -203,7 +209,7 @@ update_navigation_buttons (GisAssistant
@@ -203,7 +209,7 @@ update_navigation_buttons (GisAssistant *assistant)
is_last_page = (l->next == NULL);
......@@ -53,7 +53,7 @@ Index: gnome-initial-setup/gnome-initial-setup/gis-assistant.c
{
gtk_widget_hide (assistant->back);
gtk_widget_hide (assistant->forward);
@@ -223,6 +229,8 @@ update_navigation_buttons (GisAssistant
@@ -223,6 +229,8 @@ update_navigation_buttons (GisAssistant *assistant)
if (gis_page_get_needs_accept (page))
next_widget = assistant->accept;
......@@ -62,7 +62,7 @@ Index: gnome-initial-setup/gnome-initial-setup/gis-assistant.c
else
next_widget = assistant->forward;
@@ -254,6 +262,7 @@ update_applying_state (GisAssistant *ass
@@ -254,6 +262,7 @@ update_applying_state (GisAssistant *assistant)
is_first_page = assistant->pages->data == assistant->current_page;
}
gtk_widget_set_sensitive (assistant->forward, !applying);
......@@ -70,7 +70,7 @@ Index: gnome-initial-setup/gnome-initial-setup/gis-assistant.c
gtk_widget_set_visible (assistant->back, !applying && !is_first_page);
gtk_widget_set_visible (assistant->cancel, applying);
gtk_widget_set_visible (assistant->spinner, applying);
@@ -405,6 +414,7 @@ gis_assistant_locale_changed (GisAssista
@@ -405,6 +414,7 @@ gis_assistant_locale_changed (GisAssistant *assistant)
GList *l;
gtk_button_set_label (GTK_BUTTON (assistant->forward), _("_Next"));
......@@ -78,7 +78,7 @@ Index: gnome-initial-setup/gnome-initial-setup/gis-assistant.c
gtk_button_set_label (GTK_BUTTON (assistant->accept), _("_Accept"));
gtk_button_set_label (GTK_BUTTON (assistant->skip), _("_Skip"));
gtk_button_set_label (GTK_BUTTON (assistant->back), _("_Previous"));
@@ -440,6 +450,7 @@ gis_assistant_init (GisAssistant *assist
@@ -440,6 +450,7 @@ gis_assistant_init (GisAssistant *assistant)
G_CALLBACK (current_page_changed), assistant);
g_signal_connect (assistant->forward, "clicked", G_CALLBACK (go_forward), assistant);
......@@ -86,7 +86,7 @@ Index: gnome-initial-setup/gnome-initial-setup/gis-assistant.c
g_signal_connect (assistant->accept, "clicked", G_CALLBACK (go_forward), assistant);
g_signal_connect (assistant->skip, "clicked", G_CALLBACK (go_forward), assistant);
@@ -478,6 +489,7 @@ gis_assistant_class_init (GisAssistantCl
@@ -478,6 +489,7 @@ gis_assistant_class_init (GisAssistantClass *klass)
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/initial-setup/gis-assistant.ui");
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GisAssistant, forward);
......@@ -94,10 +94,10 @@ Index: gnome-initial-setup/gnome-initial-setup/gis-assistant.c
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GisAssistant, accept);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GisAssistant, skip);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GisAssistant, back);
Index: gnome-initial-setup/gnome-initial-setup/gis-assistant.ui
===================================================================
--- gnome-initial-setup.orig/gnome-initial-setup/gis-assistant.ui
+++ gnome-initial-setup/gnome-initial-setup/gis-assistant.ui
diff --git a/gnome-initial-setup/gis-assistant.ui b/gnome-initial-setup/gis-assistant.ui
index 936f829..faac293 100644
--- a/gnome-initial-setup/gis-assistant.ui
+++ b/gnome-initial-setup/gis-assistant.ui
@@ -68,6 +68,15 @@
<property name="pack-type">end</property>
</packing>
......@@ -114,10 +114,10 @@ Index: gnome-initial-setup/gnome-initial-setup/gis-assistant.ui
</object>
<object class="GtkSizeGroup" id="headerheight">
Index: gnome-initial-setup/gnome-initial-setup/gis-page.c
===================================================================
--- gnome-initial-setup.orig/gnome-initial-setup/gis-page.c
+++ gnome-initial-setup/gnome-initial-setup/gis-page.c
diff --git a/gnome-initial-setup/gis-page.c b/gnome-initial-setup/gis-page.c
index 25729d0..a6553c3 100644
--- a/gnome-initial-setup/gis-page.c
+++ b/gnome-initial-setup/gis-page.c
@@ -38,7 +38,8 @@ struct _GisPagePrivate
guint skippable : 1;
guint needs_accept : 1;
......@@ -136,7 +136,7 @@ Index: gnome-initial-setup/gnome-initial-setup/gis-page.c
PROP_NEEDS_ACCEPT,
PROP_APPLYING,
PROP_SMALL_SCREEN,
@@ -82,6 +84,9 @@ gis_page_get_property (GObject *objec
@@ -82,6 +84,9 @@ gis_page_get_property (GObject *object,
case PROP_SKIPPABLE:
g_value_set_boolean (value, priv->skippable);
break;
......@@ -146,7 +146,7 @@ Index: gnome-initial-setup/gnome-initial-setup/gis-page.c
case PROP_NEEDS_ACCEPT:
g_value_set_boolean (value, priv->needs_accept);
break;
@@ -131,6 +136,9 @@ gis_page_set_property (GObject *obj
@@ -131,6 +136,9 @@ gis_page_set_property (GObject *object,
case PROP_SKIPPABLE:
priv->skippable = g_value_get_boolean (value);
break;
......@@ -156,7 +156,7 @@ Index: gnome-initial-setup/gnome-initial-setup/gis-page.c
case PROP_NEEDS_ACCEPT:
priv->needs_accept = g_value_get_boolean (value);
break;
@@ -219,6 +227,9 @@ gis_page_class_init (GisPageClass *klass
@@ -219,6 +227,9 @@ gis_page_class_init (GisPageClass *klass)
obj_props[PROP_SKIPPABLE] =
g_param_spec_boolean ("skippable", "", "", FALSE,
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
......@@ -166,10 +166,11 @@ Index: gnome-initial-setup/gnome-initial-setup/gis-page.c
obj_props[PROP_NEEDS_ACCEPT] =
g_param_spec_boolean ("needs-accept", "", "", FALSE,
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
@@ -294,6 +305,21 @@ gis_page_set_skippable (GisPage *page, g
@@ -293,6 +304,21 @@ gis_page_set_skippable (GisPage *page, gboolean skippable)
g_object_notify_by_pspec (G_OBJECT (page), obj_props[PROP_SKIPPABLE]);
}
gboolean
+gboolean
+gis_page_get_hide_navigation (GisPage *page)
+{
+ GisPagePrivate *priv = gis_page_get_instance_private (page);
......@@ -184,15 +185,14 @@ Index: gnome-initial-setup/gnome-initial-setup/gis-page.c
+ 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);
Index: gnome-initial-setup/gnome-initial-setup/gis-page.h
===================================================================
--- gnome-initial-setup.orig/gnome-initial-setup/gis-page.h
+++ gnome-initial-setup/gnome-initial-setup/gis-page.h
@@ -71,6 +71,8 @@ gboolean gis_page_get_complete (GisP
diff --git a/gnome-initial-setup/gis-page.h b/gnome-initial-setup/gis-page.h
index ecc38b6..3d6b25d 100644
--- a/gnome-initial-setup/gis-page.h
+++ b/gnome-initial-setup/gis-page.h
@@ -71,6 +71,8 @@ gboolean gis_page_get_complete (GisPage *page);
void gis_page_set_complete (GisPage *page, gboolean complete);
gboolean gis_page_get_skippable (GisPage *page);
void gis_page_set_skippable (GisPage *page, gboolean skippable);
......@@ -201,11 +201,11 @@ Index: gnome-initial-setup/gnome-initial-setup/gis-page.h
gboolean gis_page_get_needs_accept (GisPage *page);
void gis_page_set_needs_accept (GisPage *page, gboolean needs_accept);
gboolean gis_page_get_has_forward (GisPage *page);
Index: gnome-initial-setup/gnome-initial-setup/pages/summary/gis-summary-page.c
===================================================================
--- gnome-initial-setup.orig/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ gnome-initial-setup/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -250,6 +250,8 @@ gis_summary_page_constructed (GObject *o
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c
index 09c00ab..b1e0f78 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -250,6 +250,8 @@ gis_summary_page_constructed (GObject *object)
G_OBJECT_CLASS (gis_summary_page_parent_class)->constructed (object);
......
......@@ -9,11 +9,11 @@ Forwared: not-needed
gnome-initial-setup/pages/goa/gis-goa-page.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: gnome-initial-setup/gnome-initial-setup/pages/goa/gis-goa-page.c
===================================================================
--- gnome-initial-setup.orig/gnome-initial-setup/pages/goa/gis-goa-page.c
+++ gnome-initial-setup/gnome-initial-setup/pages/goa/gis-goa-page.c
@@ -186,7 +186,7 @@ populate_provider_list (GisGoaPage *page
diff --git a/gnome-initial-setup/pages/goa/gis-goa-page.c b/gnome-initial-setup/pages/goa/gis-goa-page.c
index 87341c4..bc135fc 100644
--- a/gnome-initial-setup/pages/goa/gis-goa-page.c
+++ b/gnome-initial-setup/pages/goa/gis-goa-page.c
@@ -186,7 +186,7 @@ populate_provider_list (GisGoaPage *page)
g_auto(GStrv) conf_providers =
gis_driver_conf_get_string_list (GIS_PAGE (page)->driver, VENDOR_GOA_GROUP, VENDOR_PROVIDERS_KEY, NULL);
GStrv providers = conf_providers ? conf_providers :
......
......@@ -10,10 +10,10 @@ Forwared: https://gitlab.gnome.org/GNOME/gnome-initial-setup/merge_requests/13/
gnome-initial-setup/pages/goa/gis-goa-page.ui | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: gnome-initial-setup/gnome-initial-setup/pages/goa/gis-goa-page.ui
===================================================================
--- gnome-initial-setup.orig/gnome-initial-setup/pages/goa/gis-goa-page.ui
+++ gnome-initial-setup/gnome-initial-setup/pages/goa/gis-goa-page.ui
diff --git a/gnome-initial-setup/pages/goa/gis-goa-page.ui b/gnome-initial-setup/pages/goa/gis-goa-page.ui
index 9ef1d95..f826da9 100644
--- a/gnome-initial-setup/pages/goa/gis-goa-page.ui
+++ b/gnome-initial-setup/pages/goa/gis-goa-page.ui
@@ -15,7 +15,7 @@
<property name="visible">True</property>
<property name="margin_top">24</property>
......
......@@ -13,11 +13,11 @@ Subject: Ubuntu-location-default
gnome-initial-setup/pages/privacy/gis-privacy-page.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: gnome-initial-setup/gnome-initial-setup/pages/privacy/gis-privacy-page.c
===================================================================
--- gnome-initial-setup.orig/gnome-initial-setup/pages/privacy/gis-privacy-page.c
+++ gnome-initial-setup/gnome-initial-setup/pages/privacy/gis-privacy-page.c
@@ -127,7 +127,7 @@ gis_privacy_page_constructed (GObject *o
diff --git a/gnome-initial-setup/pages/privacy/gis-privacy-page.c b/gnome-initial-setup/pages/privacy/gis-privacy-page.c
index 0774ec4..1dfd95c 100644
--- a/gnome-initial-setup/pages/privacy/gis-privacy-page.c
+++ b/gnome-initial-setup/pages/privacy/gis-privacy-page.c
@@ -127,7 +127,7 @@ gis_privacy_page_constructed (GObject *object)
priv->location_settings = g_settings_new ("org.gnome.system.location");
priv->privacy_settings = g_settings_new ("org.gnome.desktop.privacy");
......
......@@ -10,10 +10,10 @@ LP: #1797736
gnome-initial-setup/pages/goa/gis-goa-page.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
Index: gnome-initial-setup/gnome-initial-setup/pages/goa/gis-goa-page.c
===================================================================
--- gnome-initial-setup.orig/gnome-initial-setup/pages/goa/gis-goa-page.c
+++ gnome-initial-setup/gnome-initial-setup/pages/goa/gis-goa-page.c
diff --git a/gnome-initial-setup/pages/goa/gis-goa-page.c b/gnome-initial-setup/pages/goa/gis-goa-page.c
index bc135fc..780a085 100644
--- a/gnome-initial-setup/pages/goa/gis-goa-page.c
+++ b/gnome-initial-setup/pages/goa/gis-goa-page.c
@@ -62,6 +62,25 @@ struct _ProviderWidget {
};
typedef struct _ProviderWidget ProviderWidget;
......@@ -40,7 +40,7 @@ Index: gnome-initial-setup/gnome-initial-setup/pages/goa/gis-goa-page.c
static void
sync_provider_widget (ProviderWidget *provider_widget)
{
@@ -185,8 +204,10 @@ populate_provider_list (GisGoaPage *page
@@ -185,8 +204,10 @@ populate_provider_list (GisGoaPage *page)
{
g_auto(GStrv) conf_providers =
gis_driver_conf_get_string_list (GIS_PAGE (page)->driver, VENDOR_GOA_GROUP, VENDOR_PROVIDERS_KEY, NULL);
......
From: Jeremy Bicha <jbicha@debian.org>
Date: Wed, 16 Feb 2022 09:42:50 -0500
Subject: Revert "timezone: Build against gweather-4.0"
This reverts commit 34462d5c6255cd432044a7d9799ac055991b552e.
---
gnome-initial-setup/meson.build | 2 +-
.../pages/timezone/gis-timezone-page.c | 23 +++++++++++-----------
.../pages/timezone/gis-timezone-page.ui | 2 +-
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build
index 60edab8..e4f1199 100644
--- a/gnome-initial-setup/meson.build
+++ b/gnome-initial-setup/meson.build
@@ -35,7 +35,7 @@ dependencies = [
dependency ('gnome-desktop-4', fallback: ['gnome-desktop', 'libgnome_desktop_base_dep']),
dependency ('gsettings-desktop-schemas', version: '>= 3.37.1'),
dependency ('fontconfig'),
- dependency ('gweather4', fallback: ['libgweather', 'libgweather_dep']),
+ dependency ('gweather-3.0'),
dependency ('goa-1.0'),
dependency ('goa-backend-1.0'),
dependency ('gtk+-3.0', version: '>= 3.11.3'),
diff --git a/gnome-initial-setup/pages/timezone/gis-timezone-page.c b/gnome-initial-setup/pages/timezone/gis-timezone-page.c
index e0a6d3d..573b876 100644
--- a/gnome-initial-setup/pages/timezone/gis-timezone-page.c
+++ b/gnome-initial-setup/pages/timezone/gis-timezone-page.c
@@ -39,6 +39,7 @@
#include <geoclue.h>
#include <geocode-glib/geocode-glib.h>
+#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
#include <libgweather/gweather.h>
#include "timedated.h"
@@ -125,20 +126,20 @@ set_location (GisTimezonePage *page,
{
GisTimezonePagePrivate *priv = gis_timezone_page_get_instance_private (page);
- g_clear_object (&priv->current_location);
+ g_clear_pointer (&priv->current_location, gweather_location_unref);
gtk_widget_set_visible (priv->search_overlay, (location == NULL));
gis_page_set_complete (GIS_PAGE (page), (location != NULL));
if (location)
{
- GTimeZone *zone;
+ GWeatherTimezone *zone;
const char *tzid;
- priv->current_location = g_object_ref (location);
+ priv->current_location = gweather_location_ref (location);
zone = gweather_location_get_timezone (location);
- tzid = g_time_zone_get_identifier (zone);
+ tzid = gweather_timezone_get_tzid (zone);
cc_timezone_map_set_timezone (CC_TIMEZONE_MAP (priv->map), tzid);
@@ -157,18 +158,18 @@ on_location_notify (GClueSimple *simple,
GisTimezonePagePrivate *priv = gis_timezone_page_get_instance_private (page);
GClueLocation *location;
gdouble latitude, longitude;
- g_autoptr(GWeatherLocation) world = gweather_location_get_world ();
- g_autoptr(GWeatherLocation) glocation = NULL;
+ GWeatherLocation *glocation = NULL;
location = gclue_simple_get_location (simple);
latitude = gclue_location_get_latitude (location);
longitude = gclue_location_get_longitude (location);
- glocation = gweather_location_find_nearest_city (world, latitude, longitude);
+ glocation = gweather_location_find_nearest_city (NULL, latitude, longitude);
priv->in_geoclue_callback = TRUE;
set_location (page, glocation);
priv->in_geoclue_callback = FALSE;
+ gweather_location_unref (glocation);
}
static void
@@ -228,13 +229,12 @@ entry_text_changed (GtkEditable *editable,
priv->search_entry_text_changed_id = 0;
}
-#if 0
static void
entry_location_changed (GObject *object, GParamSpec *param, GisTimezonePage *page)
{
GisTimezonePagePrivate *priv = gis_timezone_page_get_instance_private (page);
GWeatherLocationEntry *entry = GWEATHER_LOCATION_ENTRY (object);
- g_autoptr(GWeatherLocation) location = NULL;
+ GWeatherLocation *location;
location = gweather_location_entry_get_location (entry);
if (!location)
@@ -243,8 +243,9 @@ entry_location_changed (GObject *object, GParamSpec *param, GisTimezonePage *pag
priv->in_search = TRUE;
set_location (page, location);
priv->in_search = FALSE;
+
+ gweather_location_unref (location);
}
-#endif
#define GETTEXT_PACKAGE_TIMEZONES "gnome-control-center-2.0-timezones"
@@ -446,10 +447,8 @@ gis_timezone_page_constructed (GObject *object)
priv->search_entry_text_changed_id =
g_signal_connect (priv->search_entry, "changed",
G_CALLBACK (entry_text_changed), page);
-#if 0
g_signal_connect (priv->search_entry, "notify::location",
G_CALLBACK (entry_location_changed), page);
-#endif
g_signal_connect (priv->search_entry, "map",
G_CALLBACK (entry_mapped), page);
g_signal_connect (priv->map, "location-changed",
diff --git a/gnome-initial-setup/pages/timezone/gis-timezone-page.ui b/gnome-initial-setup/pages/timezone/gis-timezone-page.ui
index 1f81d3e..07fc352 100644
--- a/gnome-initial-setup/pages/timezone/gis-timezone-page.ui
+++ b/gnome-initial-setup/pages/timezone/gis-timezone-page.ui
@@ -28,7 +28,7 @@
<property name="orientation">vertical</property>
<property name="spacing">14</property>
<child>
- <object class="GtkEntry" id="search_entry">
+ <object class="GWeatherLocationEntry" id="search_entry">
<property name="visible">True</property>
<property name="halign">center</property>
<property name="max-width-chars">55</property>
From: Jeremy Bicha <jbicha@debian.org>
Date: Wed, 16 Feb 2022 09:40:54 -0500
Subject: Revert "timezone: Load GisLocationEntry type before page template"
This reverts commit 8486fda8ed6232aa086855bebb3bfac5f33285f5.
---
gnome-initial-setup/pages/timezone/gis-timezone-page.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/gnome-initial-setup/pages/timezone/gis-timezone-page.c b/gnome-initial-setup/pages/timezone/gis-timezone-page.c
index 5db5413..c4a5b5d 100644
--- a/gnome-initial-setup/pages/timezone/gis-timezone-page.c
+++ b/gnome-initial-setup/pages/timezone/gis-timezone-page.c
@@ -522,7 +522,6 @@ gis_timezone_page_init (GisTimezonePage *page)
g_type_ensure (CC_TYPE_TIMEZONE_MAP);
g_type_ensure (GIS_TYPE_BUBBLE_WIDGET);
g_type_ensure (GIS_TYPE_PAGE_HEADER);
- g_type_ensure (GIS_TYPE_LOCATION_ENTRY);
gtk_widget_init_template (GTK_WIDGET (page));
}
From: Jeremy Bicha <jbicha@debian.org>
Date: Wed, 16 Feb 2022 09:41:22 -0500
Subject: Revert "timezone: Reintroduce GisLocationEntry"
This reverts commit a7dfea203494c285cd222f44cf05e9e07bfd6b38.
---
gnome-initial-setup/pages/timezone/gis-timezone-page.c | 9 ++++++---
gnome-initial-setup/pages/timezone/gis-timezone-page.ui | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnome-initial-setup/pages/timezone/gis-timezone-page.c b/gnome-initial-setup/pages/timezone/gis-timezone-page.c
index c4a5b5d..e0a6d3d 100644
--- a/gnome-initial-setup/pages/timezone/gis-timezone-page.c
+++ b/gnome-initial-setup/pages/timezone/gis-timezone-page.c
@@ -49,7 +49,6 @@
#include "gis-bubble-widget.h"
#include "gis-page-header.h"
-#include "gis-location-entry.h"
#define DEFAULT_TZ "Europe/London"
#define DESKTOP_ID "gnome-datetime-panel"
@@ -229,14 +228,15 @@ entry_text_changed (GtkEditable *editable,
priv->search_entry_text_changed_id = 0;
}
+#if 0
static void
entry_location_changed (GObject *object, GParamSpec *param, GisTimezonePage *page)
{
GisTimezonePagePrivate *priv = gis_timezone_page_get_instance_private (page);
- GisLocationEntry *entry = GIS_LOCATION_ENTRY (object);
+ GWeatherLocationEntry *entry = GWEATHER_LOCATION_ENTRY (object);
g_autoptr(GWeatherLocation) location = NULL;
- location = gis_location_entry_get_location (entry);
+ location = gweather_location_entry_get_location (entry);
if (!location)
return;
@@ -244,6 +244,7 @@ entry_location_changed (GObject *object, GParamSpec *param, GisTimezonePage *pag
set_location (page, location);
priv->in_search = FALSE;
}
+#endif
#define GETTEXT_PACKAGE_TIMEZONES "gnome-control-center-2.0-timezones"
@@ -445,8 +446,10 @@ gis_timezone_page_constructed (GObject *object)
priv->search_entry_text_changed_id =
g_signal_connect (priv->search_entry, "changed",
G_CALLBACK (entry_text_changed), page);
+#if 0
g_signal_connect (priv->search_entry, "notify::location",
G_CALLBACK (entry_location_changed), page);
+#endif
g_signal_connect (priv->search_entry, "map",
G_CALLBACK (entry_mapped), page);
g_signal_connect (priv->map, "location-changed",
diff --git a/gnome-initial-setup/pages/timezone/gis-timezone-page.ui b/gnome-initial-setup/pages/timezone/gis-timezone-page.ui
index 588ec41..1f81d3e 100644
--- a/gnome-initial-setup/pages/timezone/gis-timezone-page.ui
+++ b/gnome-initial-setup/pages/timezone/gis-timezone-page.ui
@@ -28,7 +28,7 @@
<property name="orientation">vertical</property>
<property name="spacing">14</property>
<child>
- <object class="GisLocationEntry" id="search_entry">
+ <object class="GtkEntry" id="search_entry">
<property name="visible">True</property>
<property name="halign">center</property>
<property name="max-width-chars">55</property>