Hello community, here is the log from the commit of package cinnamon-control-center for openSUSE:Factory checked in at 2019-07-22 12:21:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-control-center (Old) and /work/SRC/openSUSE:Factory/.cinnamon-control-center.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-control-center" Mon Jul 22 12:21:11 2019 rev:16 rq:717344 version:4.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-control-center/cinnamon-control-center.changes 2019-07-18 15:19:32.744153427 +0200 +++ /work/SRC/openSUSE:Factory/.cinnamon-control-center.new.4126/cinnamon-control-center.changes 2019-07-22 12:21:11.835651665 +0200 @@ -1,0 +2,6 @@ +Sun Jul 21 10:58:55 UTC 2019 - Marguerite Su <i...@marguerite.su> + +- Update to version 4.2.1: + * Fix network settings, fixes e.g. eduroam + +------------------------------------------------------------------- Old: ---- cinnamon-control-center-4.2.0.tar.gz New: ---- cinnamon-control-center-4.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-control-center.spec ++++++ --- /var/tmp/diff_new_pack.CaG7cr/_old 2019-07-22 12:21:12.675651445 +0200 +++ /var/tmp/diff_new_pack.CaG7cr/_new 2019-07-22 12:21:12.679651444 +0200 @@ -1,7 +1,7 @@ # # spec file for package cinnamon-control-center # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,14 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define soname libcinnamon-control-center %define sover 1 Name: cinnamon-control-center -Version: 4.2.0 +Version: 4.2.1 Release: 0 Summary: Utilities to configure the Cinnamon desktop License: GPL-2.0-only AND GPL-3.0-or-later AND MIT ++++++ cinnamon-control-center-4.2.0.tar.gz -> cinnamon-control-center-4.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-4.2.0/configure.ac new/cinnamon-control-center-4.2.1/configure.ac --- old/cinnamon-control-center-4.2.0/configure.ac 2019-06-14 13:49:05.000000000 +0200 +++ new/cinnamon-control-center-4.2.1/configure.ac 2019-07-10 11:51:47.000000000 +0200 @@ -1,4 +1,4 @@ -m4_define([cinnamon_control_center_version], 4.2.0) +m4_define([cinnamon_control_center_version], 4.2.1) AC_INIT([cinnamon-control-center], [cinnamon_control_center_version], [https://github.com/linuxmint/cinnamon-control-center/issues]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-4.2.0/debian/changelog new/cinnamon-control-center-4.2.1/debian/changelog --- old/cinnamon-control-center-4.2.0/debian/changelog 2019-06-14 13:49:05.000000000 +0200 +++ new/cinnamon-control-center-4.2.1/debian/changelog 2019-07-10 11:51:47.000000000 +0200 @@ -1,3 +1,10 @@ +cinnamon-control-center (4.2.1) tina; urgency=medium + + [ NikoKrause ] + * Fix network settings, fixes e.g. eduroam (#220) + + -- Clement Lefebvre <r...@linuxmint.com> Wed, 10 Jul 2019 11:51:29 +0200 + cinnamon-control-center (4.2.0) tina; urgency=medium [ Michael Webster ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-4.2.0/panels/network/cc-network-panel.c new/cinnamon-control-center-4.2.1/panels/network/cc-network-panel.c --- old/cinnamon-control-center-4.2.0/panels/network/cc-network-panel.c 2019-06-14 13:49:05.000000000 +0200 +++ new/cinnamon-control-center-4.2.1/panels/network/cc-network-panel.c 2019-07-10 11:51:47.000000000 +0200 @@ -264,8 +264,7 @@ object_class->dispose = cc_network_panel_dispose; object_class->finalize = cc_network_panel_finalize; - //FIXME: Causing warnings - //g_object_class_override_property (object_class, PROP_PARAMETERS, "parameters"); + g_object_class_override_property (object_class, PROP_PARAMETERS, "parameters"); } static NetObject * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-4.2.0/shell/cc-panel.c new/cinnamon-control-center-4.2.1/shell/cc-panel.c --- old/cinnamon-control-center-4.2.0/shell/cc-panel.c 2019-06-14 13:49:05.000000000 +0200 +++ new/cinnamon-control-center-4.2.1/shell/cc-panel.c 2019-07-10 11:51:47.000000000 +0200 @@ -58,7 +58,7 @@ { PROP_0, PROP_SHELL, - PROP_ARGV + PROP_PARAMETERS }; G_DEFINE_ABSTRACT_TYPE (CcPanel, cc_panel, GTK_TYPE_BIN) @@ -80,11 +80,32 @@ panel->priv->shell = g_value_get_object (value); break; - case PROP_ARGV: + case PROP_PARAMETERS: { - gchar **argv = g_value_get_boxed (value); - if (argv && argv[0]) - g_warning ("Ignoring additional argument %s", argv[0]); + GVariant *parameters = g_value_get_variant (value); + GVariant *v; + gsize n_parameters; + + if (parameters == NULL) + return; + + n_parameters = g_variant_n_children (parameters); + if (n_parameters == 0) + return; + + g_variant_get_child (parameters, 0, "v", &v); + + if (!g_variant_is_of_type (v, G_VARIANT_TYPE_DICTIONARY)) + g_warning ("Wrong type for the first argument GVariant, expected 'a{sv}' but got '%s'", + (gchar *)g_variant_get_type (v)); + else if (g_variant_n_children (v) > 0) + g_warning ("Ignoring additional flags"); + + g_variant_unref (v); + + if (n_parameters > 1) + g_warning ("Ignoring additional parameters"); + break; } default: @@ -208,12 +229,13 @@ | G_PARAM_CONSTRUCT_ONLY); g_object_class_install_property (object_class, PROP_SHELL, pspec); - pspec = g_param_spec_boxed ("argv", - "Argument vector", - "Additional arguments passed on the command line", - G_TYPE_STRV, - G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS); - g_object_class_install_property (object_class, PROP_ARGV, pspec); + pspec = g_param_spec_variant ("parameters", + "Structured parameters", + "Additional parameters passed externally (ie. command line, dbus activation)", + G_VARIANT_TYPE ("av"), + NULL, + G_PARAM_WRITABLE); + g_object_class_install_property (object_class, PROP_PARAMETERS, pspec); } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-4.2.0/shell/cc-shell.c new/cinnamon-control-center-4.2.1/shell/cc-shell.c --- old/cinnamon-control-center-4.2.0/shell/cc-shell.c 2019-06-14 13:49:05.000000000 +0200 +++ new/cinnamon-control-center-4.2.1/shell/cc-shell.c 2019-07-10 11:51:47.000000000 +0200 @@ -172,7 +172,8 @@ /** * cc_shell_set_active_panel_from_id: * @shell: A #CcShell - * @id: the ID of the panel to set as active + * @id: The ID of the panel to set as active + * @parameters: A #GVariant with additional parameters * @error: A #GError * * Find a panel corresponding to the specified id and set it as active. @@ -182,7 +183,7 @@ gboolean cc_shell_set_active_panel_from_id (CcShell *shell, const gchar *id, - const gchar **argv, + GVariant *parameters, GError **error) { CcShellClass *class; @@ -201,7 +202,7 @@ } else { - return class->set_active_panel_from_id (shell, id, argv, error); + return class->set_active_panel_from_id (shell, id, parameters, error); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-4.2.0/shell/cc-shell.h new/cinnamon-control-center-4.2.1/shell/cc-shell.h --- old/cinnamon-control-center-4.2.0/shell/cc-shell.h 2019-06-14 13:49:05.000000000 +0200 +++ new/cinnamon-control-center-4.2.1/shell/cc-shell.h 2019-07-10 11:51:47.000000000 +0200 @@ -86,7 +86,7 @@ /* vfuncs */ gboolean (*set_active_panel_from_id) (CcShell *shell, const gchar *id, - const gchar **argv, + GVariant *parameters, GError **error); GtkWidget * (*get_toplevel) (CcShell *shell); void (*embed_widget_in_header) (CcShell *shell, @@ -100,7 +100,7 @@ CcPanel *panel); gboolean cc_shell_set_active_panel_from_id (CcShell *shell, const gchar *id, - const gchar **argv, + GVariant *parameters, GError **error); GtkWidget * cc_shell_get_toplevel (CcShell *shell); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-4.2.0/shell/cinnamon-control-center.c new/cinnamon-control-center-4.2.1/shell/cinnamon-control-center.c --- old/cinnamon-control-center-4.2.0/shell/cinnamon-control-center.c 2019-06-14 13:49:05.000000000 +0200 +++ new/cinnamon-control-center-4.2.1/shell/cinnamon-control-center.c 2019-07-10 11:51:47.000000000 +0200 @@ -178,7 +178,7 @@ static gboolean activate_panel (CinnamonControlCenter *shell, const gchar *id, - const gchar **argv, + GVariant *parameters, const gchar *desktop_file, const gchar *name, GIcon *gicon) @@ -236,7 +236,7 @@ } /* create the panel plugin */ - priv->current_panel = g_object_new (panel_type, "shell", shell, "argv", argv, NULL); + priv->current_panel = g_object_new (panel_type, "shell", shell, "parameters", parameters, NULL); cc_shell_set_active_panel (CC_SHELL (shell), CC_PANEL (priv->current_panel)); gtk_widget_show (priv->current_panel); @@ -967,7 +967,7 @@ static gboolean _shell_set_active_panel_from_id (CcShell *shell, const gchar *start_id, - const gchar **argv, + GVariant *parameters, GError **err) { GtkTreeIter iter; @@ -978,10 +978,10 @@ CinnamonControlCenterPrivate *priv = CINNAMON_CONTROL_CENTER (shell)->priv; GtkWidget *old_panel; - /* When loading the same panel again, just set the argv */ + /* When loading the same panel again, just set its parameters */ if (g_strcmp0 (priv->current_panel_id, start_id) == 0) { - g_object_set (G_OBJECT (priv->current_panel), "argv", argv, NULL); + g_object_set (G_OBJECT (priv->current_panel), "parameters", parameters, NULL); return TRUE; } @@ -1035,7 +1035,7 @@ { g_warning ("Could not find settings panel \"%s\"", start_id); } - else if (activate_panel (CINNAMON_CONTROL_CENTER (shell), start_id, argv, desktop, + else if (activate_panel (CINNAMON_CONTROL_CENTER (shell), start_id, parameters, desktop, name, gicon) == FALSE) { /* Failed to activate the panel for some reason */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-control-center-4.2.0/shell/control-center.c new/cinnamon-control-center-4.2.1/shell/control-center.c --- old/cinnamon-control-center-4.2.0/shell/control-center.c 2019-06-14 13:49:05.000000000 +0200 +++ new/cinnamon-control-center-4.2.1/shell/control-center.c 2019-07-10 11:51:47.000000000 +0200 @@ -128,15 +128,22 @@ { const char *start_id; GError *err = NULL; + GVariant *parameters; + GVariantBuilder *builder; + int i; start_id = start_panels[0]; if (start_panels[1]) - g_debug ("Extra argument: %s", start_panels[1]); + g_debug ("Extra argument: %s", start_panels[1]); else - g_debug ("No extra argument"); + g_debug ("No extra argument"); - if (!cc_shell_set_active_panel_from_id (CC_SHELL (shell), start_id, (const gchar**)start_panels+1, &err)) + builder = g_variant_builder_new (G_VARIANT_TYPE ("av")); + for (i = 1; start_panels[i] != NULL; i++) + g_variant_builder_add (builder, "v", g_variant_new_string (start_panels[i])); + parameters = g_variant_builder_end (builder); + if (!cc_shell_set_active_panel_from_id (CC_SHELL (shell), start_id, parameters, &err)) { g_warning ("Could not load setting panel \"%s\": %s", start_id, (err) ? err->message : "Unknown error");