Hello community, here is the log from the commit of package gnome-control-center.1352 for openSUSE:12.1:Update checked in at 2013-02-25 09:55:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update/gnome-control-center.1352 (Old) and /work/SRC/openSUSE:12.1:Update/.gnome-control-center.1352.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-control-center.1352", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-09 11:18:20.872010756 +0100 +++ /work/SRC/openSUSE:12.1:Update/.gnome-control-center.1352.new/gnome-control-center.changes 2013-02-25 09:55:53.000000000 +0100 @@ -0,0 +1,3146 @@ +------------------------------------------------------------------- +Sat Feb 16 17:28:09 UTC 2013 - mike.catanz...@gmail.com + +- Add gnome-control-center-minimal-password-dialog.patch + + Remove the random password generator, which cannot work in 12.1 + since it calls apg, which we do not package (bnc#779414) + + Remove password "hint to nowhere" that gdm no longer displays + (bnc#796932) +- Add gnome-control-center-remove-password-options.patch + + For 12.1, remove 'choose password at next login' and 'log in + without password' options as these conflict with our PAM and + make it impossible to log in (bnc#796932). +- Add gnome-control-center-remove-password-options.patch + + Disallow setting password to be the same as it used to be, to + avoid a hang (bnc#779413). + +------------------------------------------------------------------- +Fri Dec 23 04:29:04 UTC 2011 - g...@suse.com + +- add gnome-control-center-private-connections-by-default.patch to + create the private connections by default (bnc#731812) + +------------------------------------------------------------------- +Tue Nov 15 09:57:30 UTC 2011 - g...@suse.com + +- Add gnome-control-center-probe-radius-server-cert.patch to probe + the RADIUS server certificate (bnc#574266) + +------------------------------------------------------------------- +Thu Oct 20 08:25:40 UTC 2011 - vu...@opensuse.org + +- Add gnome-control-center-hide-region-system-tab.patch: hide + system tab in region panel until we really use the same files as + systemd for setting the system-wide locale configuration. See + bnc#703833 for more details. +- Really drop + gnome-control-center-network-allocate-nm-connection.patch. + +------------------------------------------------------------------- +Mon Oct 17 18:10:24 CEST 2011 - dims...@opensuse.org + +- Update to version 3.2.1: + + Common: + - Always collect locales from the directory (bgo#660725) + + Color: + - After removing a profile select the device so the UI is + correct (bgo#661658) + + Date & time: + - Fix showing actual clock format on panel open + + Info: + - Use new GtkAppChooserButton API (bgo#658693) + - Use x-content/unix-software as mime for the Software combobox + + Network: + - Allocate nm-connection for nma-wireless-dialog (bgo#648174) + - Show wireless dialog even if there is no active AP + (bgo#661526) + + Printers: + - Check state of CUPS after start (bgo#659721) + - Fix build on systems without LC_PAPER (bgo#660692) + - Don't hide address entry + - Disable remove button if no printer is selected (bgo#659724) + - Hide spinner after search (bgo#659753) + - Make +/- buttons insensitive when can not connect to CUPS + + Region: + - Hide system tab if no localed + - Simplify getting the current Locale + - Implement copying layouts (bgo#659300) + - Fix build on systems without LC_MEASUREMENT (bgo#660787) + - Only show locales for languages that have translations + + Screen: + - Never set gnome-session's idle-delay to 1 + + Shell: + - Use gtk_widget_show instead of _show_all in + gnome_control_center_show + - Show the label for the category sections + - Make sure we gtk_widget_show the search view + - Make Ctrl+Q work outside the overview + - Give focus to the search entry when showing the overview page + - Don't crash when loading the icon fails (bgo#660513) + + Updated translations. +- Drop gnome-control-center-setup-wpa-eap-no-active-ap.patch: fixed + upstream. +- Drop gnome-control-center-network-allocate-nm-connection.patch: + fixed upstream. + +------------------------------------------------------------------- +Wed Oct 12 08:49:59 UTC 2011 - g...@suse.com + +- Add gnome-control-center-setup-wpa-eap-no-active-ap.patch: show + the wireless setup dialog regardless of whether there is an + active AP or not (bgo#661526). + +------------------------------------------------------------------- +Tue Oct 11 18:09:05 UTC 2011 - vu...@opensuse.org + +- Add gnome-control-center-allow-yast-in-shell.patch: allow the + launch of the YaST shell from the gnome-control-center shell. We + need a special case as the gnome-control-center shell only + supports internal panels, but we want an exception for the YaST + shell. +- Add gnome-control-center-shell-no-crash.patch: fix crash on + search when a .desktop file has no comment. +- Split /etc/xdg/menus/gnomecc.menu in a branding-upstream + subpackage, so that we can have a branding-openSUSE package that + will add YaST to the control center shell. +- Add a Requires on gnome-control-center-branding to the main + subpackage, to make sure we always have a menu definition for the + shell. + +------------------------------------------------------------------- +Thu Oct 6 04:27:50 UTC 2011 - g...@suse.com + +- Add gnome-control-center-network-allocate-nm-connection.patch: + allocate nm-connection for nma-wireless-dialog so that the user + can configure the wireless conection settings (bgo#648174). + +------------------------------------------------------------------- +Mon Oct 3 07:36:56 UTC 2011 - vu...@opensuse.org + +- Remove usage of %mime_database_{post,postun} macros as there is + no MIME definition installed. +- Do not pass --disable-update-mimedb to configure since it's not + useful anymore. + +------------------------------------------------------------------- +Mon Sep 26 19:41:43 UTC 2011 - vu...@opensuse.org + +- Update to version 3.2.0: + + System info: + - Don't crash when systemd isn't used (bgo#659367) + - Don't warn if PackageKit isn't around + - Continue on filesystem query info (bgo#654563) + + Wacom: + - Show "stand-by" page when Wacom not available (bgo#657424) + + Updated translations. + +------------------------------------------------------------------- +Tue Sep 20 08:32:23 UTC 2011 - vu...@opensuse.org + +- Update to version 3.1.92: + + Color: + - Fix help links for gnome-help 3.1* + - Don't assert if the user double clicks the delete profile + button + - Fix spawning of gcm-viewer + - Do not allow the user to choose profiles owned by other users + - Do not allow the user to set default a profile they cannot + access + - Disable 'View details' button if gcm-viewer is not installed + - Escape profile titles that have markup in the titles + (bgo#659127) + - Pack the left and right button groups into two GtkBox + containers (bgo#659273) + + Common: + - Add a way for panels to receive additional arguments + (bgo#657093) + - Bump GTK+ deps + - Tell the actual required version for NM + + Display: + - Remove duplicate/unused translations + + Info: + - Don't warn when the hostname is empty + - Do fallback correctly when reading hostnames + - Split the hostname setting + + Keyboard: + - Link directly to the layouts page + + Network: + - Show wireless dialogs when asked (bgo#657093) + - Fix memleak when argv changes + - A segfault was introduced when assigning to args (bgo#658670) + - Bind HTTP host entry to the 'host' setting in GSettings + + Printers: + - Match lower-case properly + + Region: + - Add ability to switch pages + - Fix display of layouts on the system tab + - Only offer to copy settings if they are different + + Screen: + - Don't fill up the space + - Fix resulting top-padding (bgo#657606) + - Remove indent on "Turn off..." label + + Shell: + - Replace window sizing code (bgo#658068) + + Sound: + - Put the level bar at 0 when muting (bgo#644537) + - Allow switching tabs from the command-line + + Universal access: + - Fix sensitivity of keyboard a11y (bgo#649452) + - Add context for text sizes (bgo#645729) + - Set contrast combo on startup (bgo#658990) + + User accounts: + - Hide old message when enrolling + + Wacom: + - Add a left-handed switch (bgo#657810) + - Improve alignment of lines and widgets (bgo#657425) + - Make string as translatable + + Updated translations. ++++ 2949 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.1:Update/.gnome-control-center.1352.new/gnome-control-center.changes New: ---- gnome-control-center-3.2.1.tar.bz2 gnome-control-center-allow-yast-in-shell.patch gnome-control-center-hide-region-system-tab.patch gnome-control-center-minimal-password-dialog.patch gnome-control-center-password-must-change.patch gnome-control-center-private-connections-by-default.patch gnome-control-center-probe-radius-server-cert.patch gnome-control-center-remove-password-options.patch gnome-control-center-shell-no-crash.patch gnome-control-center-system-proxy-configuration.patch gnome-control-center.changes gnome-control-center.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-control-center.spec ++++++ # # spec file for package gnome-control-center # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # 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/ # Name: gnome-control-center BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel BuildRequires: intltool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: pkgconfig(cheese-gtk) BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gnome-desktop-3.0) BuildRequires: pkgconfig(gnome-settings-daemon) >= 2.91.94 BuildRequires: pkgconfig(goa-1.0) BuildRequires: pkgconfig(goa-backend-1.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gtk+-3.0) >= 3.1.19 BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libgnome-menu-3.0) BuildRequires: pkgconfig(libgnomekbd) BuildRequires: pkgconfig(libgnomekbdui) BuildRequires: pkgconfig(libgtop-2.0) BuildRequires: pkgconfig(libnm-glib) >= 0.8.992 BuildRequires: pkgconfig(libnm-gtk) >= 0.8.992 BuildRequires: pkgconfig(libnotify) >= 0.7.3 BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse-mainloop-glib) BuildRequires: pkgconfig(libsocialweb-client) BuildRequires: pkgconfig(libxklavier) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(polkit-gobject-1) >= 0.97 BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xi) Obsoletes: acme Obsoletes: fontilus Obsoletes: themus Provides: acme Provides: fontilus Provides: themus Version: 3.2.1 Release: 0 # FIXME: in 12.2 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) Summary: The GNOME Control Center License: GPL-2.0+ Group: System/GUI/GNOME Source: http://download.gnome.org/sources/gnome-control-center/3.2/%{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE gnome-control-center-allow-yast-in-shell.patch vu...@opensuse.org -- Allow the launch of the yast shell from the g-c-c shell; it's quite ugly, but on the other hand, we don't want to change the behavior of the shell except for yast... Patch0: gnome-control-center-allow-yast-in-shell.patch # PATCH-FIX-UPSTREAM gnome-control-center-shell-no-crash.patch vu...@opensuse.org -- Do not crash on search when a .desktop has no Comment Patch1: gnome-control-center-shell-no-crash.patch # PATCH-HACK-OPENSUSE gnome-control-center-hide-region-system-tab.patch vu...@opensuse.org -- Hide system tab in region panel until we really use the right files for system settings (see bnc#703833) Patch2: gnome-control-center-hide-region-system-tab.patch # PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE) Patch14: gnome-control-center-system-proxy-configuration.patch # PATCH-FIX-UPSTREAM gnome-control-center-probe-radius-server-cert.patch bnc#574266 g...@suse.com -- Probe the RADIUS server certificate Patch15: gnome-control-center-probe-radius-server-cert.patch # PATCH-FIX-OPENSUSE gnome-control-center-private-connections-by-default.patch bnc#731812 g...@suse.com -- Create the private connections by default Patch16: gnome-control-center-private-connections-by-default.patch # PATCH-FIX-OPENSUSE bnc#779413 bgo#691265 mike.catanz...@gmail.com -- Don't allow nonsensical password change that will cause a hang, trying to get this upstream Patch17: gnome-control-center-password-must-change.patch # PATCH-FIX-OPENSUSE bnc#779414 bnc#796932 mike.catanz...@gmail.com -- Hide random password and password hint options Patch18: gnome-control-center-minimal-password-dialog.patch # PATCH-HACK-OPENSUSE bnc#779408 mike.catanz...@gmail.com -- These conflict with our current PAM policy Patch19: gnome-control-center-remove-password-options.patch Url: http://www.gnome.org Requires: %{name}-branding = %{version} # needed for printers panel Requires: cups-pk-helper # needed for /usr/bin/glxinfo, used by System info panel Requires: freeglut Requires: gnome-menus Requires: gnome-settings-daemon # needed for universal access panel Requires: gnome-themes-accessibility Requires: gnome-version Requires: iso-codes Requires: nautilus Recommends: %{name}-lang Recommends: %{name}-user-faces Recommends: apg # the printers panel can use the dbus service Recommends: system-config-printer-dbus-service Provides: control-center2 = 2.22.1 Obsoletes: control-center2 < 2.22.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires %description The control center is GNOME's main interface for configuration of various aspects of your desktop. %package branding-upstream Summary: The GNOME Control Center -- Upstream Definition of Shell Content Group: System/GUI/GNOME Requires: %{name} = %{version} Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) Supplements: packageand(%{name}:branding-upstream) BuildArch: noarch #BRAND: This package contains the definitions of the content appearing #BRAND: in the shell (/etc/xdg/menus/gnomecc.menu). %description branding-upstream The control center is GNOME's main interface for configuration of various aspects of your desktop. This package provides the upstream definition of what appears in the control center. %package user-faces Summary: Login Managers user avatars Group: System/GUI/GNOME %description user-faces This package provides user avatars to be used by display managers %package -n libgnome-control-center1 Summary: Shared library used by GNOME control center Group: System/GUI/GNOME %description -n libgnome-control-center1 Shared library used by GNOME control center %package devel Summary: Header files for the GNOME Control Center Group: Development/Libraries/GNOME Requires: %{name} = %{version} Requires: libgnome-control-center1 = %{version} Provides: control-center2-devel = 2.22.1 Obsoletes: control-center2-devel < 2.22.1 %description devel The control center is GNOME's main interface for configuration of various aspects of your desktop. %lang_package %prep %setup -q translation-update-upstream %patch0 -p1 %patch1 -p1 %patch2 -p1 #NEEDS-REBASE #%patch14 -p1 %patch15 -p1 %patch16 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh %endif %build %configure --with-pic\ --with-libsocialweb\ --disable-static\ --disable-scrollkeeper\ --disable-maintainer-mode make %{?jobs:-j%jobs} V=1 %install %makeinstall %if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name}-2.0 %{?no_lang_C} %find_lang %{name}-2.0-timezones %{name}-2.0.lang # help files %find_lang control-center %{?no_lang_C} %{name}-2.0.lang %suse_update_desktop_file gnome-control-center %suse_update_desktop_file gnome-sound-applet # capplets %suse_update_desktop_file gnome-background-panel X-SuSE-ControlCenter-LookAndFeel %suse_update_desktop_file gnome-color-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-datetime-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-display-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-info-panel X-SuSE-ControlCenter-Personal %suse_update_desktop_file gnome-keyboard-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-media-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-mouse-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-network-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-online-accounts-panel X-SuSE-ControlCenter-Personal %suse_update_desktop_file gnome-power-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-printers-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-region-panel X-SuSE-ControlCenter-Personal %suse_update_desktop_file gnome-screen-panel X-SuSE-ControlCenter-LookAndFeel %suse_update_desktop_file gnome-sound-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-universal-access-panel X-SuSE-ControlCenter-Personal %suse_update_desktop_file gnome-user-accounts-panel X-SuSE-ControlCenter-Personal %suse_update_desktop_file gnome-wacom-panel X-SuSE-ControlCenter-Hardware %fdupes $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %post %glib2_gsettings_schema_post %desktop_database_post %icon_theme_cache_post %postun %glib2_gsettings_schema_postun %desktop_database_postun %icon_theme_cache_postun %post -n libgnome-control-center1 -p /sbin/ldconfig %postun -n libgnome-control-center1 -p /sbin/ldconfig %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %dir %{_datadir}/gnome/ %dir %{_datadir}/gnome/help/ %dir %{_datadir}/gnome/help/control-center/ %doc %{_datadir}/gnome/help/control-center/C/ %dir %{_datadir}/omf/ %dir %{_datadir}/omf/control-center/ %doc %{_datadir}/omf/control-center/control-center-C.omf %{_bindir}/* %{_sysconfdir}/xdg/autostart/*.desktop %{_libdir}/control-center-1/ %{_datadir}/applications/*.desktop %{_datadir}/desktop-directories/*.directory %{_datadir}/gnome-control-center/ %{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/icons/hicolor/*/*/*.svg %dir %{_datadir}/sounds/gnome %dir %{_datadir}/sounds/gnome/default %dir %{_datadir}/sounds/gnome/default/alerts %{_datadir}/sounds/gnome/default/alerts/*.ogg %files branding-upstream %defattr (-, root, root) %{_sysconfdir}/xdg/menus/gnomecc.menu %files lang -f %{name}-2.0.lang %files user-faces %defattr (-, root, root) %{_datadir}/pixmaps/faces/ %files -n libgnome-control-center1 %defattr (-, root, root) %{_libdir}/libgnome-control-center.so.1* %files devel %defattr (-, root, root) %{_datadir}/pkgconfig/gnome-keybindings.pc %{_libdir}/*.so %changelog ++++++ gnome-control-center-allow-yast-in-shell.patch ++++++ Index: gnome-control-center-3.2.0/shell/gnome-control-center.c =================================================================== --- gnome-control-center-3.2.0.orig/shell/gnome-control-center.c +++ gnome-control-center-3.2.0/shell/gnome-control-center.c @@ -110,6 +110,39 @@ get_icon_name_from_g_icon (GIcon *gicon) } static void +suse_activate_desktop (GnomeControlCenter *shell, + const gchar *id, + const gchar *desktop_file) +{ + GDesktopAppInfo *appinfo; + GdkAppLaunchContext *context; + GdkScreen *screen; + GdkDisplay *display; + GError *error; + + appinfo = g_desktop_app_info_new_from_filename (desktop_file); + + screen = gtk_widget_get_screen (shell->priv->window); + display = gdk_screen_get_display (screen); + context = gdk_display_get_app_launch_context (display); + gdk_app_launch_context_set_screen (context, screen); + gdk_app_launch_context_set_timestamp (context, gtk_get_current_event_time ()); + + error = NULL; + g_app_info_launch_uris (G_APP_INFO (appinfo), NULL, + (GAppLaunchContext *) context, + &error); + + if (error) { + g_printerr ("Could not launch '%s': %s\n", id, error->message); + g_clear_error (&error); + } + + g_object_unref (context); + g_object_unref (appinfo); +} + +static void activate_panel (GnomeControlCenter *shell, const gchar *id, const gchar **argv, @@ -127,6 +160,12 @@ activate_panel (GnomeControlCenter *shel if (!desktop_file) return; + if (g_strcmp0 (id, "YaST.desktop") == 0) + { + suse_activate_desktop (shell, id, desktop_file); + return; + } + if (id) { ++++++ gnome-control-center-hide-region-system-tab.patch ++++++ Index: gnome-control-center-3.2.1/panels/region/gnome-region-panel-system.c =================================================================== --- gnome-control-center-3.2.1.orig/panels/region/gnome-region-panel-system.c +++ gnome-control-center-3.2.1/panels/region/gnome-region-panel-system.c @@ -415,7 +415,8 @@ setup_system (GtkBuilder *dialog) GDBusConnection *bus; GtkWidget *button; - localed_permission = polkit_permission_new_sync ("org.freedesktop.locale1.set-locale", NULL, NULL, NULL); + //localed_permission = polkit_permission_new_sync ("org.freedesktop.locale1.set-locale", NULL, NULL, NULL); + localed_permission = NULL; if (localed_permission == NULL) { GtkWidget *tab_widget, *notebook; int num; ++++++ gnome-control-center-minimal-password-dialog.patch ++++++ ++++ 860 lines (skipped) ++++++ gnome-control-center-password-must-change.patch ++++++ >From 14f04443bb8f0ddb3bc080d275114743f15be06f Mon Sep 17 00:00:00 2001 From: Michael Catanzaro <mike.catanz...@gmail.com> Date: Sun, 6 Jan 2013 21:47:48 -0600 Subject: [PATCH] Don't allow setting password to old password It hangs if you do this. bnc#779413 --- panels/user-accounts/um-password-dialog.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/panels/user-accounts/um-password-dialog.c b/panels/user-accounts/um-password-dialog.c index c825749..ef0a8ce 100644 --- a/panels/user-accounts/um-password-dialog.c +++ b/panels/user-accounts/um-password-dialog.c @@ -265,6 +265,11 @@ update_sensitivity (UmPasswordDialog *um) tooltip = _("The current password is not correct"); } } + else if (strcmp (password, old_password) == 0) { + /* not localized */ + can_change = FALSE; + tooltip = NULL; + } else { can_change = TRUE; tooltip = NULL; -- 1.7.10.4 ++++++ gnome-control-center-private-connections-by-default.patch ++++++ diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c index ca31b0d..424ae38 100644 --- a/panels/network/cc-network-panel.c +++ b/panels/network/cc-network-panel.c @@ -2687,8 +2687,10 @@ wireless_ap_changed_cb (GtkComboBox *combo_box, CcNetworkPanel *panel) NetObject *object; NMConnection *connection; NMConnection *connection_activate = NULL; + NMConnection *partial; NMDevice *device; NMSettingWireless *setting_wireless; + NMSettingConnection *setting_con; if (panel->priv->updating_device) goto out; @@ -2757,8 +2759,12 @@ wireless_ap_changed_cb (GtkComboBox *combo_box, CcNetworkPanel *panel) /* create one, as it's missing */ g_debug ("no existing connection found for %s, creating", ssid_target); + partial = nm_connection_new (); + setting_con = nm_setting_connection_new (); + nm_connection_add_setting (partial, NM_SETTING (setting_con)); + nm_setting_connection_add_permission (setting_con, "user", g_get_user_name(), NULL); nm_client_add_and_activate_connection (panel->priv->client, - NULL, + partial, device, object_path, connection_add_activate_cb, panel); out: @@ -3010,6 +3016,7 @@ start_shared_connection (CcNetworkPanel *panel) "id", "Hotspot", "autoconnect", FALSE, NULL); + nm_setting_connection_add_permission (sc, "user", g_get_user_name(), NULL); nm_connection_add_setting (c, (NMSetting *)sc); sw = (NMSettingWireless *)nm_setting_wireless_new (); diff --git a/panels/network/network-dialogs.c b/panels/network/network-dialogs.c index efe1704..f8419e5 100644 --- a/panels/network/network-dialogs.c +++ b/panels/network/network-dialogs.c @@ -293,6 +293,7 @@ cc_network_panel_connect_to_8021x_network (CcNetworkPanel *panel, uuid = nm_utils_uuid_generate (); g_object_set (s_con, NM_SETTING_CONNECTION_UUID, uuid, NULL); g_free (uuid); + nm_setting_connection_add_permission (s_con, "user", g_get_user_name(), NULL); nm_connection_add_setting (connection, NM_SETTING (s_con)); s_wifi = (NMSettingWireless *) nm_setting_wireless_new (); @@ -393,6 +394,10 @@ cdma_mobile_wizard_done (NMAMobileWizard *wizard, NULL); g_free (uuid); g_free (id); + nm_setting_connection_add_permission ((NMSettingConnection *)setting, + "user", + g_get_user_name(), + NULL); nm_connection_add_setting (connection, setting); } @@ -456,6 +461,10 @@ gsm_mobile_wizard_done (NMAMobileWizard *wizard, NULL); g_free (uuid); g_free (id); + nm_setting_connection_add_permission ((NMSettingConnection *)setting, + "user", + g_get_user_name(), + NULL); nm_connection_add_setting (connection, setting); } ++++++ gnome-control-center-probe-radius-server-cert.patch ++++++ diff --git a/panels/network/network-dialogs.c b/panels/network/network-dialogs.c index 0e5aae1..43fc119 100644 --- a/panels/network/network-dialogs.c +++ b/panels/network/network-dialogs.c @@ -153,6 +153,11 @@ wireless_dialog_response_cb (GtkDialog *foo, g_assert (connection); g_assert (device); + if (nma_wireless_dialog_need_cert_probe (dialog)) { + nma_wireless_dialog_probe_cert (dialog); + return; + } + /* Find a similar connection and use that instead */ all = nm_remote_settings_list_connections (closure->settings); for (iter = all; iter; iter = g_slist_next (iter)) { ++++++ gnome-control-center-remove-password-options.patch ++++++ >From ac24c1f64364a8f955319c83767092a96d57a8ec Mon Sep 17 00:00:00 2001 From: Michael Catanzaro <mike.catanz...@gmail.com> Date: Sat, 16 Feb 2013 11:23:34 -0600 Subject: [PATCH] Remove password options These options conflict with our PAM policy and selecting them will cause a user to accidentally make the account unusable. We need to remove them for now. --- panels/user-accounts/data/password-dialog.ui | 8 -------- 1 file changed, 8 deletions(-) diff --git a/panels/user-accounts/data/password-dialog.ui b/panels/user-accounts/data/password-dialog.ui index 660c499..db3a6a6 100644 --- a/panels/user-accounts/data/password-dialog.ui +++ b/panels/user-accounts/data/password-dialog.ui @@ -14,14 +14,6 @@ <col id="1">0</col> </row> <row> - <col id="0" translatable="yes">Choose password at next login</col> - <col id="1">1</col> - </row> - <row> - <col id="0" translatable="yes">Log in without a password</col> - <col id="1">2</col> - </row> - <row> <col id="0" translatable="yes">Disable this account</col> <col id="1">3</col> </row> -- 1.7.10.4 ++++++ gnome-control-center-shell-no-crash.patch ++++++ commit 59fe530504a4359f66d9a112050970a52fe46281 Author: Vincent Untz <vu...@gnome.org> Date: Tue Oct 11 22:51:42 2011 +0200 shell: Avoid crash when searching if a .desktop has no comment The code doing the search assumes the description column is set, which might not be the case. https://bugzilla.gnome.org/show_bug.cgi?id=661494 diff --git a/shell/shell-search-renderer.c b/shell/shell-search-renderer.c index 0667bc0..6032af8 100644 --- a/shell/shell-search-renderer.c +++ b/shell/shell-search-renderer.c @@ -154,12 +154,15 @@ shell_search_renderer_set_layout (ShellSearchRenderer *cell, GtkWidget *widget) needle = g_utf8_casefold (priv->search_string, -1); else needle = NULL; - haystack = g_utf8_casefold (full_string, -1); + if (full_string != NULL) + haystack = g_utf8_casefold (full_string, -1); + else + haystack = NULL; /* clear any previous attributes */ pango_layout_set_attributes (priv->layout, NULL); - if (priv->search_string && priv->title + if (priv->search_string && priv->search_target && priv->title && (strstr (haystack, needle))) { gchar *start; ++++++ gnome-control-center-system-proxy-configuration.patch ++++++ >From 067cc33aba6eeaffd4efe1d8a8e838aa1a89476a Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero <feder...@novell.com> Date: Mon, 25 May 2009 14:38:52 -0500 Subject: [PATCH] Integrate openSUSE's network proxy configuration with GNOME's. This is documented in http://en.opensuse.org/GNOME/Proxy_configuration We basically add a "use system settings" proxy mode. When it is active, gnome-settings-daemon will read /etc/sysconfig/proxy and mirror its values into GNOME's GConf space. Signed-off-by: Federico Mena Quintero <feder...@novell.com> --- capplets/network/gnome-network-properties.c | 164 +++++++++++++++++------ capplets/network/gnome-network-properties.glade | 24 +++- 2 files changed, 143 insertions(+), 45 deletions(-) diff --git a/capplets/network/gnome-network-properties.c b/capplets/network/gnome-network-properties.c index f6ea0e6..0ea9945 100644 --- a/capplets/network/gnome-network-properties.c +++ b/capplets/network/gnome-network-properties.c @@ -32,19 +32,11 @@ #include "capplet-util.h" #include "gconf-property-editor.h" -enum ProxyMode -{ - PROXYMODE_NONE, - PROXYMODE_MANUAL, - PROXYMODE_AUTO -}; - -static GEnumValue proxytype_values[] = { - { PROXYMODE_NONE, "PROXYMODE_NONE", "none"}, - { PROXYMODE_MANUAL, "PROXYMODE_MANUAL", "manual"}, - { PROXYMODE_AUTO, "PROXYMODE_AUTO", "auto"}, - { 0, NULL, NULL } -}; +/* Novell extension */ +#define KEY_USE_SYSTEM_SETTINGS "/system/proxy/use_system_settings" /* string */ +#define VAL_USE_SYSTEM_SETTINGS_ONLY_IF_NOT_SET "only_if_mode_not_set" +#define VAL_USE_SYSTEM_SETTINGS_SYSTEM_VALUES "system_values" +#define VAL_USE_SYSTEM_SETTINGS_USER_VALUES "user_values" enum { COL_NAME, @@ -1019,36 +1011,58 @@ extract_proxy_host (GConfPropertyEditor *peditor, const GConfValue *orig) } static void +set_sensitivity_based_on_active_radiobutton (GladeXML *dialog, GtkWidget *active_radio) +{ + gboolean manual_box_sensitive, auto_box_sensitive; + + g_assert (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (active_radio))); + + manual_box_sensitive = auto_box_sensitive = FALSE; + + if (active_radio == WID ("manual_radiobutton")) + manual_box_sensitive = TRUE; + else if (active_radio == WID ("auto_radiobutton")) + auto_box_sensitive = TRUE; + + gtk_widget_set_sensitive (WID ("manual_box"), manual_box_sensitive); + gtk_widget_set_sensitive (WID ("same_proxy_checkbutton"), manual_box_sensitive); + gtk_widget_set_sensitive (WID ("auto_box"), auto_box_sensitive); +} + +static void proxy_mode_radiobutton_clicked_cb (GtkWidget *widget, GladeXML *dialog) { - GSList *mode_group; - int mode; - GConfClient *client; + GConfClient *client; - if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget))) - return; - - mode_group = g_slist_copy (gtk_radio_button_get_group - (GTK_RADIO_BUTTON (WID ("none_radiobutton")))); - mode_group = g_slist_reverse (mode_group); - mode = g_slist_index (mode_group, widget); - g_slist_free (mode_group); - - gtk_widget_set_sensitive (WID ("manual_box"), - mode == PROXYMODE_MANUAL); - gtk_widget_set_sensitive (WID ("same_proxy_checkbutton"), - mode == PROXYMODE_MANUAL); - gtk_widget_set_sensitive (WID ("auto_box"), - mode == PROXYMODE_AUTO); + if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget))) + return; + client = gconf_client_get_default (); - gconf_client_set_bool (client, USE_PROXY_KEY, - mode == PROXYMODE_AUTO || mode == PROXYMODE_MANUAL, NULL); - g_object_unref (client); + + if (widget == WID ("system_radiobutton")) { + gconf_client_set_string (client, KEY_USE_SYSTEM_SETTINGS, VAL_USE_SYSTEM_SETTINGS_SYSTEM_VALUES, NULL); + } else if (widget == WID ("none_radiobutton")) { + gconf_client_set_string (client, KEY_USE_SYSTEM_SETTINGS, VAL_USE_SYSTEM_SETTINGS_USER_VALUES, NULL); + gconf_client_set_string (client, PROXY_MODE_KEY, "none", NULL); + gconf_client_set_bool (client, USE_PROXY_KEY, FALSE, NULL); + } else if (widget == WID ("manual_radiobutton")) { + gconf_client_set_string (client, KEY_USE_SYSTEM_SETTINGS, VAL_USE_SYSTEM_SETTINGS_USER_VALUES, NULL); + gconf_client_set_string (client, PROXY_MODE_KEY, "manual", NULL); + gconf_client_set_bool (client, USE_PROXY_KEY, TRUE, NULL); + } else if (widget == WID ("auto_radiobutton")) { + gconf_client_set_string (client, KEY_USE_SYSTEM_SETTINGS, VAL_USE_SYSTEM_SETTINGS_USER_VALUES, NULL); + gconf_client_set_string (client, PROXY_MODE_KEY, "auto", NULL); + gconf_client_set_bool (client, USE_PROXY_KEY, TRUE, NULL); + } + + set_sensitivity_based_on_active_radiobutton (dialog, widget); + + g_object_unref (client); } static void -connect_sensitivity_signals (GladeXML *dialog, GSList *mode_group) +connect_mode_radiobuttons (GladeXML *dialog, GSList *mode_group) { for (; mode_group != NULL; mode_group = mode_group->next) { @@ -1058,20 +1072,85 @@ connect_sensitivity_signals (GladeXML *dialog, GSList *mode_group) } } +static GtkWidget * +get_radio_for_mode (GladeXML *dialog, const char *mode_str) +{ + if (!mode_str) + return WID ("none_radiobutton"); + else if (strcmp (mode_str, "none") == 0) + return WID ("none_radiobutton"); + else if (strcmp (mode_str, "manual") == 0) + return WID ("manual_radiobutton"); + else if (strcmp (mode_str, "auto") == 0) + return WID ("auto_radiobutton"); + else + return WID ("none_radiobutton"); +} + +static void +mode_set_initial_value (GladeXML *dialog, GConfClient *client) +{ + char *use_system_settings; + GConfValue *mode_value; + gboolean use_system_if_mode_not_set; + gboolean use_mode; + GtkWidget *radiobutton; + + radiobutton = NULL; + + use_system_settings = gconf_client_get_string (client, KEY_USE_SYSTEM_SETTINGS, NULL); + mode_value = gconf_client_get_without_default (client, PROXY_MODE_KEY, NULL); + + use_system_if_mode_not_set = FALSE; + use_mode = FALSE; + + if (!use_system_settings) + use_system_if_mode_not_set = TRUE; + else { + if (strcmp (use_system_settings, VAL_USE_SYSTEM_SETTINGS_ONLY_IF_NOT_SET) == 0) + use_system_if_mode_not_set = TRUE; + else if (strcmp (use_system_settings, VAL_USE_SYSTEM_SETTINGS_SYSTEM_VALUES) == 0) + radiobutton = WID ("system_radiobutton"); + else if (strcmp (use_system_settings, VAL_USE_SYSTEM_SETTINGS_USER_VALUES) == 0) + use_mode = TRUE; + + g_free (use_system_settings); + } + + if (use_system_if_mode_not_set) { + if (mode_value) + use_mode = TRUE; + else + radiobutton = WID ("system_radiobutton"); + } + + if (use_mode) { + if (!mode_value || mode_value->type != GCONF_VALUE_STRING) + radiobutton = WID ("none_radiobutton"); + else + radiobutton = get_radio_for_mode (dialog, gconf_value_get_string (mode_value)); + } + + if (radiobutton) { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton), TRUE); + set_sensitivity_based_on_active_radiobutton (dialog, radiobutton); + } + + if (mode_value) + gconf_value_free (mode_value); +} + static void setup_dialog (GladeXML *dialog) { GConfPropertyEditor *peditor; GSList *mode_group; - GType mode_type = 0; GConfClient *client; gint port_value; GtkWidget *location_box; GtkCellRenderer *location_renderer; GtkListStore *store; - mode_type = g_enum_register_static ("NetworkPreferencesProxyType", - proxytype_values); /* There's a bug in peditors that cause them to not initialize the entry * correctly. */ @@ -1100,17 +1179,16 @@ setup_dialog (GladeXML *dialog) "style", COL_STYLE, NULL); /* Hackety hack */ + gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("system_radiobutton"))->child), TRUE); gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("none_radiobutton"))->child), TRUE); gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("manual_radiobutton"))->child), TRUE); gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("auto_radiobutton"))->child), TRUE); /* Mode */ - mode_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (WID ("none_radiobutton"))); - connect_sensitivity_signals (dialog, mode_group); + mode_set_initial_value (dialog, client); + mode_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (WID ("system_radiobutton"))); + connect_mode_radiobuttons (dialog, mode_group); - peditor = GCONF_PROPERTY_EDITOR (gconf_peditor_new_select_radio_with_enum (NULL, - PROXY_MODE_KEY, mode_group, mode_type, - TRUE, NULL)); /* Use same proxy for all protocols */ peditor = GCONF_PROPERTY_EDITOR (gconf_peditor_new_boolean (NULL, diff --git a/capplets/network/gnome-network-properties.glade b/capplets/network/gnome-network-properties.glade index 656acb5..1147f17 100644 --- a/capplets/network/gnome-network-properties.glade +++ b/capplets/network/gnome-network-properties.glade @@ -130,6 +130,25 @@ <property name="spacing">18</property> <child> + <widget class="GtkRadioButton" id="system_radiobutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes"><b>Use the s_ystem's proxy settings</b></property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> <widget class="GtkRadioButton" id="none_radiobutton"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -140,6 +159,7 @@ <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> + <property name="group">system_radiobutton</property> </widget> <packing> <property name="padding">0</property> @@ -171,7 +191,7 @@ <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <property name="group">none_radiobutton</property> + <property name="group">system_radiobutton</property> </widget> <packing> <property name="padding">0</property> @@ -714,7 +734,7 @@ <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <property name="group">none_radiobutton</property> + <property name="group">system_radiobutton</property> </widget> <packing> <property name="padding">0</property> -- 1.6.0.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org