[Bug 1810316] Re: gnome-control-center SIGABRT when n-m is not working (G_IS_OBJECT (object))
** Changed in: gnome-control-center (Ubuntu) Importance: Medium => Low -- You received this bug notification because you are a member of Network- manager, which is subscribed to NetworkManager. https://bugs.launchpad.net/bugs/1810316 Title: gnome-control-center SIGABRT when n-m is not working (G_IS_OBJECT (object)) To manage notifications about this bug go to: https://bugs.launchpad.net/gnome-control-center/+bug/1810316/+subscriptions -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-lp-1824188 into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
Andrea Azzarone has proposed merging
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-lp-1824188 into
~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master.
Commit message:
* d/p/0001-Add-Ubuntu-mode-with-special-pages.patch:
- Retry getting the list of featured snaps in case of failure. (LP: #1824188)
* d/p/0001-Ensure-stamp-file-if-the-user-quit-the-wizard.patch:
* d/p/0001-Make-summary-page-explicitly-request-navigation-butt.patch:
* d/p/0008-Ubuntu-location-default.patch:
- Patches refreshed automatically by gbp.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1824188 in gnome-initial-setup (Ubuntu): "Software tab is empty on clean
19.04 install"
https://bugs.launchpad.net/ubuntu/+source/gnome-initial-setup/+bug/1824188
For more details, see:
https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/365966
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-lp-1824188 into
~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index c934f8e..00df9a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gnome-initial-setup (3.32.1-1ubuntu2) UNRELEASED; urgency=medium
+
+ * d/p/0001-Add-Ubuntu-mode-with-special-pages.patch:
+- Retry getting the list of featured snaps in case of failure. (LP: #1824188)
+ * d/p/0001-Ensure-stamp-file-if-the-user-quit-the-wizard.patch:
+ * d/p/0001-Make-summary-page-explicitly-request-navigation-butt.patch:
+ * d/p/0008-Ubuntu-location-default.patch:
+- Patches refreshed automatically by gbp.
+
+ -- Andrea Azzarone Fri, 12 Apr 2019 17:17:35 +
+
gnome-initial-setup (3.32.1-1ubuntu1) disco; urgency=medium
* Sync with Debian. Remaining changes:
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 fbb4d35..4b2eb38 100644
--- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
+++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
@@ -13,31 +13,31 @@ Subject: Add Ubuntu mode with special pages
gnome-initial-setup/meson.build| 3 +
gnome-initial-setup/pages/apps/apps.gresource.xml | 8 +
.../pages/apps/default-snap-icon.svg | 1 +
- gnome-initial-setup/pages/apps/gis-apps-page.c | 528
+ gnome-initial-setup/pages/apps/gis-apps-page.c | 651 +
gnome-initial-setup/pages/apps/gis-apps-page.h | 52 ++
- gnome-initial-setup/pages/apps/gis-apps-page.ui| 96
+ gnome-initial-setup/pages/apps/gis-apps-page.ui| 112
gnome-initial-setup/pages/apps/meson.build | 10 +
- .../pages/livepatch/gis-auth-dialog.c | 528
+ .../pages/livepatch/gis-auth-dialog.c | 528 +
.../pages/livepatch/gis-auth-dialog.h | 40 ++
- .../pages/livepatch/gis-auth-dialog.ui | 231 +
- .../pages/livepatch/gis-livepatch-page.c | 538 +
+ .../pages/livepatch/gis-auth-dialog.ui | 231
+ .../pages/livepatch/gis-livepatch-page.c | 538 +
.../pages/livepatch/gis-livepatch-page.h | 52 ++
- .../pages/livepatch/gis-livepatch-page.ui | 156 ++
+ .../pages/livepatch/gis-livepatch-page.ui | 156 +
.../pages/livepatch/livepatch.gresource.xml| 9 +
gnome-initial-setup/pages/livepatch/livepatch.svg | 1 +
gnome-initial-setup/pages/livepatch/meson.build| 12 +
gnome-initial-setup/pages/meson.build | 5 +-
.../pages/privacy/gis-privacy-page.c | 2 +-
.../pages/summary/gis-summary-page.c | 2 +-
- .../pages/ubuntu-report/gis-ubuntu-report-page.c | 207
+ .../pages/ubuntu-report/gis-ubuntu-report-page.c | 207 +++
.../pages/ubuntu-report/gis-ubuntu-report-page.h | 52 ++
- .../pages/ubuntu-report/gis-ubuntu-report-page.ui | 181 +++
+ .../pages/ubuntu-report/gis-ubuntu-report-page.ui | 181 ++
.../pages/ubuntu-report/meson.build| 10 +
.../ubuntu-report/ubuntu-report.gresource.xml | 8 +
.../pages/ubuntu-report/ubuntu-report.svg | 1 +
meson.build| 3 +
po/POTFILES.in | 12 +
- 34 files changed, 2883 insertions(+), 5 deletions(-)
+ 34 files changed, 3022 insertions(+), 5 deletions(-)
create mode 100644 data/com.ubuntu.welcome.policy.in
create mode 100644 data/its/polkit.its
create mode 100644 data/its/polkit.loc
@@ -154,10 +154,10 @@ index 8fa6f29..27a19d5 100644
install_data('20-gnome-initial-setup.rules', install_dir: rules_dir)
diff --git a/gnome-initial-setup/gis-driver.c
[Merge] ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix-2 into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
The proposal to merge ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix-2 into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master has been updated. Commit message changed to: Fix issues with locales including a modifier (LP: #1823778) For more details, see: https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365920 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix-2 into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~gunnarhj/ubuntu/+source/mutter:translation-fix into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
Gunnar Hjalmarsson has proposed merging ~gunnarhj/ubuntu/+source/mutter:translation-fix into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1823722 in mutter (Ubuntu): "keyboard shortcuts are displayed not translated" https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1823722 For more details, see: https://code.launchpad.net/~gunnarhj/ubuntu/+source/mutter/+git/mutter/+merge/365971 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/mutter:translation-fix into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index 7471ed8..44e1d8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +mutter (3.32.0+git20190410-1ubuntu2) UNRELEASED; urgency=medium + + * debian/control: +- Add gnome-control-center-data to Build-Depends in order to have + gnome-keybindings.[its,loc] available when parsing po/POTFILES.in + (LP: #1823722). + + -- Gunnar Hjalmarsson Fri, 12 Apr 2019 19:57:00 +0200 + mutter (3.32.0+git20190410-1ubuntu1) disco; urgency=medium * Merge with debian git snapshot (LP: #1820542), remaining changes: diff --git a/debian/control b/debian/control index ebbb4d0..1b21f55 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: debhelper-compat (= 12), at-spi2-core , dbus , dmz-cursor-theme , + gnome-control-center-data, gnome-pkg-tools (>= 0.10), gnome-settings-daemon-common , gnome-settings-daemon-dev, diff --git a/debian/control.in b/debian/control.in index b8cb5fa..cc216e6 100644 --- a/debian/control.in +++ b/debian/control.in @@ -10,6 +10,7 @@ Build-Depends: debhelper-compat (= 12), at-spi2-core , dbus , dmz-cursor-theme , + gnome-control-center-data, gnome-pkg-tools (>= 0.10), gnome-settings-daemon-common , gnome-settings-daemon-dev, -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~gunnarhj/ubuntu/+source/mutter:translation-fix into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
Review: Approve LGTM -- https://code.launchpad.net/~gunnarhj/ubuntu/+source/mutter/+git/mutter/+merge/365971 Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/mutter:translation-fix into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-lp-1824188 into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-lp-1824188 into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master has been updated. Commit message changed to: * d/p/0001-Add-Ubuntu-mode-with-special-pages.patch: - Retry getting the list of featured snaps in case of failure. (LP: #1824188) * d/p/0001-Ensure-stamp-file-if-the-user-quit-the-wizard.patch: * d/p/0001-Make-summary-page-explicitly-request-navigation-butt.patch: * d/p/0008-Ubuntu-location-default.patch: - Patches refreshed automatically by gbp. For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/365966 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-lp-1824188 into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix-2 into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
Gunnar Hjalmarsson has proposed merging
~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix-2 into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1823778 in gnome-control-center (Ubuntu): "Unable to set Serbian as
Language"
https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1823778
For more details, see:
https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365920
This proposal fixes the language labels for languages represented by locales
with a modifier. So it looks better if you have languages like Serbian or
Catalan installed.
However, if you try to select a language with a modifier from Region &
Language, the language without the modifier is still set. So some further fix
is needed before this gets correct.
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix-2 into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master.
diff --git a/debian/patches/52_region_language.patch b/debian/patches/52_region_language.patch
index 5ee0883..dcf1e20 100644
--- a/debian/patches/52_region_language.patch
+++ b/debian/patches/52_region_language.patch
@@ -299,7 +299,32 @@ Index: gnome-control-center-3.32.1/panels/common/cc-language-chooser.c
===
--- gnome-control-center-3.32.1.orig/panels/common/cc-language-chooser.c
+++ gnome-control-center-3.32.1/panels/common/cc-language-chooser.c
-@@ -166,7 +166,7 @@ add_languages (CcLanguageChooser *choose
+@@ -62,16 +62,21 @@ language_widget_new (const gchar *locale_id,
+ g_autofree gchar *country = NULL;
+ g_autofree gchar *language_local = NULL;
+ g_autofree gchar *country_local = NULL;
++g_autofree gchar *language_tmp = NULL;
++g_autofree gchar *language_loc_tmp = NULL;
++g_autofree gchar *modifier = NULL;
+ GtkWidget *row;
+ GtkWidget *box;
+ GtkWidget *language_label;
+ GtkWidget *check;
+ GtkWidget *country_label;
+
+-gnome_parse_locale (locale_id, _code, _code, NULL, NULL);
+-language = gnome_get_language_from_code (language_code, locale_id);
++gnome_parse_locale (locale_id, _code, _code, NULL, );
++language_tmp = gnome_get_language_from_code (language_code, locale_id);
++language = g_strdup_printf ("%s%s%s", language_tmp, modifier ? " - " : "", modifier ? modifier : "");
+ country = gnome_get_country_from_code (country_code, locale_id);
+-language_local = gnome_get_language_from_code (language_code, NULL);
++language_loc_tmp = gnome_get_language_from_code (language_code, NULL);
++language_local = g_strdup_printf ("%s%s%s", language_loc_tmp, modifier ? " - " : "", modifier ? modifier : "");
+ country_local = gnome_get_country_from_code (country_code, NULL);
+
+ row = gtk_list_box_row_new ();
+@@ -166,7 +171,7 @@ add_languages (CcLanguageChooser *choose
gtk_container_add (GTK_CONTAINER (chooser->language_listbox), widget);
}
@@ -308,7 +333,7 @@ Index: gnome-control-center-3.32.1/panels/common/cc-language-chooser.c
}
static void
-@@ -392,7 +392,7 @@ cc_language_chooser_init (CcLanguageChoo
+@@ -392,7 +397,7 @@ cc_language_chooser_init (CcLanguageChoo
gtk_widget_init_template (GTK_WIDGET (chooser));
chooser->more_item = more_widget_new ();
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix-2 into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
The proposal to merge ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix-2 into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master has been updated. Description changed to: This proposal fixes the language labels for languages represented by locales with a modifier. So it looks better if you have languages like Serbian or Catalan installed. However, if you try to select a language with a modifier from Region & Language, the language without the modifier is still set. So some further fix is needed before this gets correct. Edit: See comment below. For more details, see: https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365920 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix-2 into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix-2 into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
The latest commit fixes the remaining issue related to modifiers. Now a language represented by a locale with a modifier both has a distinguishing label and can be set from Region & Language. -- https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365920 Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix-2 into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix_bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic
Gunnar Hjalmarsson has proposed merging
~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix_bionic into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1823778 in gnome-control-center (Ubuntu): "Unable to set Serbian as
Language"
https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1823778
For more details, see:
https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365984
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix_bionic into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index c124bf3..34b8d1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gnome-control-center (1:3.28.2-0ubuntu0.18.04.4) bionic; urgency=medium
+
+ * debian/patches/ubuntu-region-langpack-install.patch:
+- Dropped, which makes Serbian language items show up as selectable
+ in Region & Language (LP: #1823778).
+ * debian/patches/52_region_language.patch:
+- Prevent that the modifier part is dropped when a language
+ represented by a locale with modifier is set (LP: #1823778).
+
+ -- Gunnar Hjalmarsson Sat, 13 Apr 2019 03:05:00 +0200
+
gnome-control-center (1:3.28.2-0ubuntu0.18.04.3) bionic; urgency=medium
* debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch:
diff --git a/debian/patches/52_region_language.patch b/debian/patches/52_region_language.patch
index b6cc0ba..ab78f7f 100644
--- a/debian/patches/52_region_language.patch
+++ b/debian/patches/52_region_language.patch
@@ -285,26 +285,7 @@ Index: b/panels/region/cc-region-panel.c
===
--- a/panels/region/cc-region-panel.c
+++ b/panels/region/cc-region-panel.c
-@@ -377,11 +377,15 @@
-gint response_id,
-CcRegionPanel *self)
- {
--const gchar *language;
-+const gchar *locale, *language, *country;
-+gchar *name = NULL;
-
- if (response_id == GTK_RESPONSE_OK) {
--language = cc_language_chooser_get_language (GTK_WIDGET (chooser));
--update_language (self, language);
-+locale = cc_language_chooser_get_language (GTK_WIDGET (chooser));
-+gnome_parse_locale (locale, , , NULL, NULL);
-+name = g_strdup_printf ("%s_%s", language, country);
-+update_language (self, name);
-+g_free (name);
- }
-
- gtk_widget_destroy (GTK_WIDGET (chooser));
-@@ -403,6 +407,47 @@
+@@ -403,6 +403,47 @@
}
static void
@@ -352,7 +333,7 @@ Index: b/panels/region/cc-region-panel.c
update_region (CcRegionPanel *self,
const gchar *region)
{
-@@ -413,6 +458,7 @@
+@@ -413,6 +454,7 @@
} else {
if (g_strcmp0 (region, priv->region) == 0)
return;
@@ -360,7 +341,7 @@ Index: b/panels/region/cc-region-panel.c
g_settings_set_string (priv->locale_settings, KEY_REGION, region);
if (priv->login_auto_apply)
set_system_region (self, region);
-@@ -593,7 +639,7 @@
+@@ -593,7 +635,7 @@
CcRegionPanelPrivate *priv = self->priv;
g_free (priv->region);
@@ -369,7 +350,7 @@ Index: b/panels/region/cc-region-panel.c
update_region_label (self);
}
-@@ -622,15 +668,19 @@
+@@ -622,15 +664,19 @@
{
CcRegionPanelPrivate *priv = self->priv;
const gchar *language = NULL;
@@ -393,7 +374,7 @@ Index: b/panels/region/cc-region-panel.c
update_language_label (self);
}
-@@ -1485,6 +1535,16 @@
+@@ -1485,6 +1531,16 @@
update_buttons (self);
}
@@ -410,7 +391,7 @@ Index: b/panels/region/cc-region-panel.c
static void
on_localed_properties_changed (GDBusProxy *proxy,
GVariant *changed_properties,
-@@ -1499,32 +1559,46 @@
+@@ -1499,32 +1555,46 @@
const gchar **strv;
gsize len;
gint i;
@@ -466,7 +447,7 @@ Index: b/panels/region/cc-region-panel.c
update_language_label (self);
}
-@@ -1594,27 +1668,24 @@
+@@ -1594,27 +1664,24 @@
CcRegionPanelPrivate *priv = self->priv;
GVariantBuilder *b;
gchar *s;
diff --git a/debian/patches/series b/debian/patches/series
index 6357c3a..6d1a542 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,7 +12,6 @@
99_add_lock-on-suspend.patch
ubuntu-gnome-version.patch
ubuntu-region-packagekit.patch
-ubuntu-region-langpack-install.patch
ubuntu-language-support.patch
ubuntu-printer-support.patch
ubuntu-legacy-notifications.patch
diff --git
