Hello community, here is the log from the commit of package gnome-control-center for openSUSE:Factory checked in at 2013-04-05 17:27:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-control-center (Old) and /work/SRC/openSUSE:Factory/.gnome-control-center.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-control-center", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes 2013-03-01 07:20:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center.changes 2013-04-05 17:27:45.000000000 +0200 @@ -1,0 +2,392 @@ +Sat Mar 30 14:38:16 UTC 2013 - [email protected] + +- Rebase gnome-control-center-allow-yast-in-shell.patch: allow + YaST to be added to the gnome-control-center again. + +------------------------------------------------------------------- +Tue Mar 26 10:24:50 UTC 2013 - [email protected] + +- Update to version 3.8.0: + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 19 19:52:48 UTC 2013 - [email protected] + +- Update to version 3.7.92: + + Online Accounts: + - Scroll to the account in question when it was requested from + an external application. + + Printers: + - Ensure that all the types of printers are discovered. + + Region: + - Make sure that engines we don't have locale information for + end up in the "Other" row. + - Prevent the window getting too tall with many input sources. + - Improve explanation when there are no input sources. + - Make sure the "None" input source row gets removed when + adding a new one. + - Display the current locale country in formats if the setting + is empty. + - Translate the restart notification in the target language. + - Fix possible crashes when leaving the panel. + - Only show a restart notification if strictly needed. + - Improve matching when searching language names with accents + or different case. + - Add separators to the language list and formats chooser. + - Use the "view-more-symbolic" icon instead of the + unclear "...". + - Ensure that labels are centered when adding the tick mark. + + Shell: + - Fix resized back button depending on the panel selected. + + User Accounts: + - Fix crash when changing the password. + - Fix empty panel when going back to it. + + Updated translations. +- Drop gnome-control-center-libgd.patch: fixed upstream. + +------------------------------------------------------------------- +Sun Mar 17 15:42:15 UTC 2013 - [email protected] + +- Disable gnome-control-center-allow-yast-in-shell.patch: the + rebase is not fully completed; currently, this patch makes the + build fail. + +------------------------------------------------------------------- +Wed Mar 13 21:55:09 UTC 2013 - [email protected] + +- Rebase gnome-control-center-allow-yast-in-shell.patch and + reenable the patch. + +------------------------------------------------------------------- +Tue Mar 5 14:52:01 UTC 2013 - [email protected] + +- Update to version 3.7.91: + + Fix titlebar bug. + + Use the new GdStack widget to switch panels. + + Don't prelight icons in the icon view. + + Make search be "and" instead of "or" by default. + + Make it possible to look for multiple keywords in the search. + + Background: + - Monitor the Pictures and the cache directory for new files. + + Online accounts: + - Nicer error states. + - Add a new "Other" providers page. + + Printers: + - Don't crash after changing an option. + + Region & Language: + - Center the text in the language and format choosers. + + Search: + - Fix folder names in non-ASCII languages. + + Search provider: + - Escape the description passed to gnome-shell. + + Sharing: + - Check if SSH is available before showing it in the UI. + + User accounts: + - Make login history dialog title translatable. +- Add gnome-control-center-libgd.patch: Fix brp error for implicit + declaration of strcmp. + +------------------------------------------------------------------- +Tue Feb 26 23:59:59 UTC 2013 - [email protected] + +- Update to version 3.7.90: + + Use header bar to show the current panel's name. + + Add sound and user-accounts panels to the command-line + completion, and ensure the completion is sorted by default. + + Update man page. + + Do not forcibly suppress debug messages if --verbose not set. + + Add GNOME Shell search provider and remove unused menu + definition. + + Update descriptions for all the panels. + + Use a back arrow in the header bar, and go back to the previous + panel if navigated from one. + + Color: + - Bump the required colord version. + - Don't stretch the device switch. + - Add widget relations for accessibility, and make all buttons + keyboard accessible. + - When calibrating inhibit logout, switching users and + suspending. + - Expand profiles assigned to the device when single clicked. + + Details: + - Remove fallback from keywords. + + Keyboard: + - Be more specific in input source switch label. + + Network: + - Require newly released NetworkManager 0.9.8. + - Disable the Hotspot button if the device does not support it. + - Add support for newer versions of ModemManager. + - Try to guess the operator name for WWAN connections. + - Fix warnings when virtual connections exist. + - Display "device state reason" to show, eg., locked modems. + - Fix some alignment, spacing problems. + - Make symbolic icons sharper. + - Add widget relations for accessibility. + - Avoid all access points being named after the shared + connection in some cases. + - Fix connection editor's apply button not working. + - Plug some memory leaks. + + Notifications: + - Fix some spacing problems. + + Mouse: + - Fix possible bad state when reopening the mouse panel. + + Online Accounts: + - Don't use GOA specific warning macro. + + Power: + - Update idle time and suspend idle time ranges. + - Fix layout of the automatic suspend dialogue. + - Better label for the idle-delay selection. + - Add widget relations for accessibility. + + Printers: + - Visual improvements of driver selection dialog. + - Search for samba printers in new printer dialog. + - Add authentication dialog for samba printers. + - Disable building the printers panel if libsmbclient isn't + available. + + Privacy: + - Clarify "Lock Screen After" string. + - Remove redundant option from the recent files combobox. + + Region & Language: + - Update design based. + + Search: + - Don't make the settings search configurable. + + Sharing: + - Start or stop Rygel when Media Sharing is enabled or disabled + - Add a master switch to disable all the services. + + Sound: + - Show a different icon for different input/output ports. + + User Accounts: + - Add widget relations for accessibility. + - Don't reject passwords that pwquality says are ok. + - Remove password hints feature from the UI as they are not + implemented in GDM. +- Add pkgconfig(mm-glib) and pkgconfig(smbclient) BuildRequires: + new dependencies for the network panel and printer panel. +- Add pkgconfig(gobject-introspection-1.0) BuildRequires: + dependency for egg-list-box. +- Build the new submodule egg-list-box. +- Add gnome-control-center-nma-nialog.patch: Fix some missing + includes. A more complete patch, taking care of removing + deprecates is already pushed upstream. + +------------------------------------------------------------------- +Tue Feb 26 23:50:00 UTC 2013 - [email protected] + +- Update to version 3.7.5.1: + + Color: + - Make medium quality the default. + + Network + - Allow compiling against NetworkManager 0.9.6. + - Disable 'Apply' until things have changed. + - Use symbolic icons consistently. + +------------------------------------------------------------------- +Tue Feb 26 23:40:00 UTC 2013 - [email protected] + +- Update to version 3.7.5: + + Background: + - Sort Pictures in order of most recently modified. + - Update for gnome-shell Screenshot API changes. + + Color: + - Allow the user to remove automatically added profiles. + - Show a summary page when running on a LiveCD. + - Show sRGB and AdobeRGB profiles when selecting a profile for + a display. + - Use a EggListBox for the main device display to match the new + mockups. + - Use colord-session to calibrate the display. ++++ 195 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes ++++ and /work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center.changes Old: ---- gnome-control-center-3.6.3.tar.xz New: ---- g-c-c-online-accounts.patch gnome-control-center-3.8.0.tar.xz gnome-control-center-build.patch gnome-control-center-nma-nialog.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-control-center.spec ++++++ --- /var/tmp/diff_new_pack.5afOwq/_old 2013-04-05 17:27:48.000000000 +0200 +++ /var/tmp/diff_new_pack.5afOwq/_new 2013-04-05 17:27:48.000000000 +0200 @@ -24,24 +24,28 @@ %define with_ibus 0 Name: gnome-control-center -Version: 3.6.3 +Version: 3.8.0 Release: 0 # FIXME: in 12.3 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 Url: http://www.gnome.org -Source: http://download.gnome.org/sources/gnome-control-center/3.6/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-control-center/3.8/%{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE gnome-control-center-allow-yast-in-shell.patch [email protected] -- 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-HACK-OPENSUSE gnome-control-center-hide-region-system-tab.patch [email protected] -- Hide system tab in region panel until we really use the right files for system settings (see bnc#703833) +# PATCH-NEEDS-REBASE PATCH-HACK-OPENSUSE gnome-control-center-hide-region-system-tab.patch [email protected] -- 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-FIX-UPSTREAM gnome-control-center-fine-grained-tz-polkit.patch bgo#646185 bnc#749453 [email protected] -- Allow changing timezone without requiring privileges to change time Patch3: gnome-control-center-fine-grained-tz-polkit.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 gcc-private-connection.patch bnc#751211 bgo#646187 [email protected] -- network: create private connections if the user if not authorized +# PATCH-NEEDS-REBASE PATCH-FIX-UPSTREAM gcc-private-connection.patch bnc#751211 bgo#646187 [email protected] -- network: create private connections if the user if not authorized Patch15: gcc-private-connection.patch +# PATCH-FIX-UPSTREAM gnome-control-center-build.patch [email protected] -- Fix build with stable NM branch. Patch from distributors mailinglist. +Patch17: gnome-control-center-build.patch +# PATCH-FIX-UPSTREAM gnome-control-center-nma-nialog.patch [email protected] -- Fix includes. More complete rewrite already in git. +Patch18: gnome-control-center-nma-nialog.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -50,47 +54,54 @@ BuildRequires: krb5-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +BuildRequires: pkgconfig(accountsservice) >= 0.6.30 BuildRequires: pkgconfig(cheese) BuildRequires: pkgconfig(cheese-gtk) >= 3.3.91 BuildRequires: pkgconfig(clutter-gtk-1.0) -BuildRequires: pkgconfig(colord) +BuildRequires: pkgconfig(colord) >= 0.1.29 +BuildRequires: pkgconfig(colord-gtk) >= 0.1.24 BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) -BuildRequires: pkgconfig(glib-2.0) >= 2.31.0 +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glib-2.0) >= 2.35.1 +BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.5.5 -BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.5.91 -BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.6.0 +BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.7.5 +BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.7.3 BuildRequires: pkgconfig(goa-1.0) >= 3.5.90 BuildRequires: pkgconfig(goa-backend-1.0) -BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.5.91 +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.7.2.2 BuildRequires: pkgconfig(gstreamer-1.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.5.13 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.7.7 %if %{with_ibus} BuildRequires: pkgconfig(ibus-1.0) >= 1.4.99 %endif -BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libgnome-menu-3.0) BuildRequires: pkgconfig(libgtop-2.0) -BuildRequires: pkgconfig(libnm-glib) >= 0.8.992 -BuildRequires: pkgconfig(libnm-gtk) >= 0.8.992 +BuildRequires: pkgconfig(libnm-glib) >= 0.9.8 +BuildRequires: pkgconfig(libnm-glib-vpn) >= 0.9.8 +BuildRequires: pkgconfig(libnm-gtk) >= 0.9.8 BuildRequires: pkgconfig(libnotify) >= 0.7.3 BuildRequires: pkgconfig(libpulse) >= 2.0 BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0 %if %{with_systemd} BuildRequires: pkgconfig(libsystemd-login) %endif -BuildRequires: pkgconfig(libwacom) >= 0.6 +BuildRequires: pkgconfig(libwacom) >= 0.7 BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(mm-glib) BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103 BuildRequires: pkgconfig(pwquality) +BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xi) >= 1.2 -Requires: %{name}-branding = %{version} # needed for glxinfo, used by System info panel Requires: Mesa-demo-x # needed for printers panel @@ -121,24 +132,6 @@ 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} -Supplements: packageand(%{name}:branding-upstream) -Provides: %{name}-branding = %{version} -Conflicts: otherproviders(%{name}-branding) -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 @@ -162,19 +155,24 @@ %setup -q translation-update-upstream %patch0 -p1 -%patch2 -p1 +#Needs rebase +#patch2 -p1 %patch3 -p1 #NEEDS-REBASE -#%patch14 -p1 -%patch15 -p1 - -%if 0%{?BUILD_FROM_VCS} -[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh -%else -NOCONFIGURE=1 gnome-autogen.sh -%endif +#patch14 -p1 +#patch15 -p1 +%patch17 -p1 +%patch18 -p1 %build +ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh + +# Build egg-list-box +pushd egg-list-box +%configure +make %{?_smp_mflags} +popd + %configure --with-pic\ %if %{with_systemd} --enable-systemd\ @@ -197,7 +195,6 @@ %find_lang %{name}-2.0 %{?no_lang_C} %find_lang %{name}-2.0-timezones %{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 @@ -206,12 +203,10 @@ %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-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 @@ -233,16 +228,19 @@ %files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README TODO +%doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/* -%{_sysconfdir}/xdg/autostart/*.desktop -%{_libdir}/control-center-1/ %{_datadir}/applications/*.desktop -%{_datadir}/desktop-directories/*.directory +%{_datadir}/bash-completion/completions/gnome-control-center +%{_datadir}/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service %{_datadir}/gnome-control-center/ +%dir %{_datadir}/gnome-shell/ +%dir %{_datadir}/gnome-shell/search-providers/ +%{_datadir}/gnome-shell/search-providers/gnome-control-center-search-provider.ini %{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/icons/hicolor/*/*/*.svg %{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy +%{_datadir}/polkit-1/actions/org.gnome.controlcenter.remote-login-helper.policy %{_datadir}/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy # We do not package gnome-control-center.rules #{_datadir}/polkit-1/rules.d/gnome-control-center.rules @@ -250,11 +248,10 @@ %dir %{_datadir}/sounds/gnome/default %dir %{_datadir}/sounds/gnome/default/alerts %{_datadir}/sounds/gnome/default/alerts/*.ogg -%{_mandir}/man1/gnome-control-center.1%{?ext_man} +%{_libexecdir}/cc-remote-login-helper +%{_libexecdir}/gnome-control-center-search-provider -%files branding-upstream -%defattr (-, root, root) -%{_sysconfdir}/xdg/menus/gnomecc.menu +%{_mandir}/man1/gnome-control-center.1%{?ext_man} %files lang -f %{name}-2.0.lang ++++++ g-c-c-online-accounts.patch ++++++ diff --git a/panels/online-accounts/cc-online-accounts-panel.c b/panels/online-accounts/cc-online-accounts-panel.c index 5b0028d..9078008 100644 --- a/panels/online-accounts/cc-online-accounts-panel.c +++ b/panels/online-accounts/cc-online-accounts-panel.c @@ -35,6 +35,7 @@ #include "cc-online-accounts-add-account-dialog.h" #include "cc-online-accounts-model.h" +#include "cc-online-accounts-resources.h" typedef struct _CcGoaPanelClass CcGoaPanelClass; ++++++ gcc-private-connection.patch ++++++ --- /var/tmp/diff_new_pack.5afOwq/_old 2013-04-05 17:27:49.000000000 +0200 +++ /var/tmp/diff_new_pack.5afOwq/_new 2013-04-05 17:27:49.000000000 +0200 @@ -16,11 +16,11 @@ panels/network/network-dialogs.c | 16 ++++++++ 4 files changed, 91 insertions(+), 2 deletions(-) -Index: gnome-control-center-3.6.1/configure.ac +Index: gnome-control-center-3.7.1/configure.ac =================================================================== ---- gnome-control-center-3.6.1.orig/configure.ac -+++ gnome-control-center-3.6.1/configure.ac -@@ -136,7 +136,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO +--- gnome-control-center-3.7.1.orig/configure.ac ++++ gnome-control-center-3.7.1/configure.ac +@@ -125,7 +125,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES) PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) @@ -30,10 +30,10 @@ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 gnome-settings-daemon >= $GSD_REQUIRED_VERSION) -Index: gnome-control-center-3.6.1/panels/network/cc-network-panel.c +Index: gnome-control-center-3.7.1/panels/network/cc-network-panel.c =================================================================== ---- gnome-control-center-3.6.1.orig/panels/network/cc-network-panel.c -+++ gnome-control-center-3.6.1/panels/network/cc-network-panel.c +--- gnome-control-center-3.7.1.orig/panels/network/cc-network-panel.c ++++ gnome-control-center-3.7.1/panels/network/cc-network-panel.c @@ -23,6 +23,8 @@ #include <glib/gi18n.h> #include <stdlib.h> @@ -43,7 +43,7 @@ #include "cc-network-panel.h" #include "nm-remote-settings.h" -@@ -74,6 +76,9 @@ struct _CcNetworkPanelPrivate +@@ -76,6 +78,9 @@ struct _CcNetworkPanelPrivate gchar *arg_device; gchar *arg_access_point; gboolean operation_done; @@ -53,7 +53,7 @@ }; enum { -@@ -1099,6 +1104,9 @@ cc_network_panel_init (CcNetworkPanel *p +@@ -1182,6 +1187,9 @@ cc_network_panel_init (CcNetworkPanel *p GtkTreeSelection *selection; GtkWidget *widget; GtkWidget *toplevel; @@ -63,7 +63,7 @@ panel->priv = NETWORK_PANEL_PRIVATE (panel); -@@ -1185,6 +1193,28 @@ cc_network_panel_init (CcNetworkPanel *p +@@ -1268,6 +1276,28 @@ cc_network_panel_init (CcNetworkPanel *p /* add kill switch widgets when dialog activated */ panel->priv->add_header_widgets_idle = g_idle_add (network_add_shell_header_widgets_cb, panel); @@ -92,7 +92,7 @@ } void -@@ -1195,3 +1225,9 @@ cc_network_panel_register (GIOModule *mo +@@ -1278,3 +1308,9 @@ cc_network_panel_register (GIOModule *mo CC_TYPE_NETWORK_PANEL, "network", 0); } @@ -102,23 +102,23 @@ +{ + return panel->priv->default_private; +} -Index: gnome-control-center-3.6.1/panels/network/cc-network-panel.h +Index: gnome-control-center-3.7.1/panels/network/cc-network-panel.h =================================================================== ---- gnome-control-center-3.6.1.orig/panels/network/cc-network-panel.h -+++ gnome-control-center-3.6.1/panels/network/cc-network-panel.h -@@ -67,6 +67,8 @@ GType cc_network_panel_get_type (void) G +--- gnome-control-center-3.7.1.orig/panels/network/cc-network-panel.h ++++ gnome-control-center-3.7.1/panels/network/cc-network-panel.h +@@ -69,6 +69,8 @@ void cc_network_panel_register (GIOModu - void cc_network_panel_register (GIOModule *module); + GPtrArray *cc_network_panel_get_devices (CcNetworkPanel *panel); +gboolean cc_network_panel_get_default_private (CcNetworkPanel *panel); + G_END_DECLS #endif /* _CC_NETWORK_PANEL_H */ -Index: gnome-control-center-3.6.1/panels/network/network-dialogs.c +Index: gnome-control-center-3.7.1/panels/network/network-dialogs.c =================================================================== ---- gnome-control-center-3.6.1.orig/panels/network/network-dialogs.c -+++ gnome-control-center-3.6.1/panels/network/network-dialogs.c +--- gnome-control-center-3.7.1.orig/panels/network/network-dialogs.c ++++ gnome-control-center-3.7.1/panels/network/network-dialogs.c @@ -42,6 +42,7 @@ typedef struct { NMClient *client; NMRemoteSettings *settings; @@ -184,10 +184,10 @@ caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device)); if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) { -Index: gnome-control-center-3.6.1/panels/network/net-device-wifi.c +Index: gnome-control-center-3.7.1/panels/network/net-device-wifi.c =================================================================== ---- gnome-control-center-3.6.1.orig/panels/network/net-device-wifi.c -+++ gnome-control-center-3.6.1/panels/network/net-device-wifi.c +--- gnome-control-center-3.7.1.orig/panels/network/net-device-wifi.c ++++ gnome-control-center-3.7.1/panels/network/net-device-wifi.c @@ -1082,6 +1082,9 @@ wireless_try_to_connect (NetDeviceWifi * NMSettingWireless *setting_wireless; NMRemoteSettings *remote_settings; ++++++ gnome-control-center-3.6.3.tar.xz -> gnome-control-center-3.8.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center-3.6.3.tar.xz /work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center-3.8.0.tar.xz differ: char 25, line 1 ++++++ gnome-control-center-allow-yast-in-shell.patch ++++++ --- /var/tmp/diff_new_pack.5afOwq/_old 2013-04-05 17:27:49.000000000 +0200 +++ /var/tmp/diff_new_pack.5afOwq/_new 2013-04-05 17:27:49.000000000 +0200 @@ -1,25 +1,51 @@ -Index: gnome-control-center-3.5.90/shell/gnome-control-center.c +Index: gnome-control-center-3.8.0/shell/cc-panel-loader.c =================================================================== ---- gnome-control-center-3.5.90.orig/shell/gnome-control-center.c -+++ gnome-control-center-3.5.90/shell/gnome-control-center.c -@@ -172,6 +172,39 @@ get_icon_name_from_g_icon (GIcon *gicon) +--- gnome-control-center-3.8.0.orig/shell/cc-panel-loader.c ++++ gnome-control-center-3.8.0/shell/cc-panel-loader.c +@@ -102,6 +102,7 @@ static struct { + #ifdef BUILD_WACOM + PANEL_TYPE("wacom", cc_wacom_panel_get_type ), + #endif ++ PANEL_TYPE("YaST", NULL ), + }; + + GList * +@@ -160,8 +161,11 @@ cc_panel_loader_fill_model (CcShellModel + char *desktop_name; + int category; + +- desktop_name = g_strconcat ("gnome-", all_panels[i].name, +- "-panel.desktop", NULL); ++ if (g_strcmp0 (all_panels[i].name, "YaST") == 0) ++ desktop_name = g_strconcat (all_panels[i].name, ".desktop", NULL); ++ else ++ desktop_name = g_strconcat ("gnome-", all_panels[i].name, ++ "-panel.desktop", NULL); + app = g_desktop_app_info_new (desktop_name); + + if (app == NULL) +Index: gnome-control-center-3.8.0/shell/cc-window.c +=================================================================== +--- gnome-control-center-3.8.0.orig/shell/cc-window.c ++++ gnome-control-center-3.8.0/shell/cc-window.c +@@ -134,6 +134,38 @@ get_icon_name_from_g_icon (GIcon *gicon) return NULL; } +static void -+suse_activate_desktop (GnomeControlCenter *shell, -+ const gchar *id, -+ const gchar *desktop_file) ++suse_activate_desktop (const gchar *name) +{ + GDesktopAppInfo *appinfo; -+ GdkAppLaunchContext *context; ++ const gchar *desktop_file; + GdkScreen *screen; + GdkDisplay *display; ++ GdkAppLaunchContext *context; + GError *error; + -+ appinfo = g_desktop_app_info_new_from_filename (desktop_file); ++ desktop_file = g_strconcat (name, ".desktop", NULL); ++ appinfo = g_desktop_app_info_new (desktop_file); + -+ screen = gtk_widget_get_screen (shell->priv->window); ++ screen = gdk_screen_get_default(); + display = gdk_screen_get_display (screen); + context = gdk_display_get_app_launch_context (display); + gdk_app_launch_context_set_screen (context, screen); @@ -28,10 +54,9 @@ + error = NULL; + g_app_info_launch_uris (G_APP_INFO (appinfo), NULL, + (GAppLaunchContext *) context, -+ &error); -+ ++ &error); + if (error) { -+ g_printerr ("Could not launch '%s': %s\n", id, error->message); ++ g_printerr ("Could not launch '%s': %s\n", name, error->message); + g_clear_error (&error); + } + @@ -40,18 +65,18 @@ +} + static gboolean - activate_panel (GnomeControlCenter *shell, + activate_panel (CcWindow *self, const gchar *id, -@@ -195,6 +228,12 @@ activate_panel (GnomeControlCenter *shel +@@ -148,6 +180,12 @@ activate_panel (CcWindow *self if (!id) return FALSE; -+ if (g_strcmp0 (id, "YaST.desktop") == 0) -+ { -+ suse_activate_desktop (shell, id, desktop_file); -+ return TRUE; -+ } -+ - for (l = panels; l != NULL; l = l->next) - { - GIOExtension *extension; ++ if (g_strcmp0 (id, "YaST") == 0) ++ { ++ suse_activate_desktop (name); ++ return TRUE; ++ } ++ + priv->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, argv)); + cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (priv->current_panel)); + gtk_widget_show (priv->current_panel); ++++++ gnome-control-center-build.patch ++++++ >From 38a7a3fbe6cd5dba7cfd7ad706d03cccaa05823a Mon Sep 17 00:00:00 2001 From: Matthias Clasen <[email protected]> Date: Fri, 26 Oct 2012 10:27:32 -0400 Subject: [PATCH] network: Fix the build with nma 0.9.6.2 This is a temporary bandaid until 0.9.6.4 is released. --- panels/network/network-dialogs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/panels/network/network-dialogs.c b/panels/network/network-dialogs.c index f9be79d..e6b0774 100644 --- a/panels/network/network-dialogs.c +++ b/panels/network/network-dialogs.c @@ -30,7 +30,7 @@ #include <nm-device-wifi.h> #include "network-dialogs.h" -#include "nm-wifi-dialog.h" +#include "nm-wireless-dialog.h" #include "nm-mobile-wizard.h" typedef struct { @@ -108,7 +108,7 @@ nag_dialog_response_cb (GtkDialog *nag_dialog, gint response, gpointer user_data) { - NMAWifiDialog *wireless_dialog = NMA_WIFI_DIALOG (user_data); + NMAWirelessDialog *wireless_dialog = NMA_WIRELESS_DIALOG (user_data); if (response == GTK_RESPONSE_NO) { /* user opted not to correct the warning */ nma_wifi_dialog_set_nag_ignored (wireless_dialog, TRUE); @@ -121,7 +121,7 @@ wireless_dialog_response_cb (GtkDialog *foo, gint response, gpointer user_data) { - NMAWifiDialog *dialog = NMA_WIFI_DIALOG (foo); + NMAWirelessDialog *dialog = NMA_WIRELESS_DIALOG (foo); WirelessDialogClosure *closure = user_data; NMConnection *connection, *fuzzy_match = NULL; NMDevice *device; -- 1.7.12.1 ++++++ gnome-control-center-fine-grained-tz-polkit.patch ++++++ --- /var/tmp/diff_new_pack.5afOwq/_old 2013-04-05 17:27:49.000000000 +0200 +++ /var/tmp/diff_new_pack.5afOwq/_new 2013-04-05 17:27:49.000000000 +0200 @@ -15,11 +15,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646185 -diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c -index d229e94..378e0cb 100644 ---- a/panels/datetime/cc-datetime-panel.c -+++ b/panels/datetime/cc-datetime-panel.c -@@ -86,6 +86,7 @@ struct _CcDateTimePanelPrivate +Index: gnome-control-center-3.7.3/panels/datetime/cc-datetime-panel.c +=================================================================== +--- gnome-control-center-3.7.3.orig/panels/datetime/cc-datetime-panel.c ++++ gnome-control-center-3.7.3/panels/datetime/cc-datetime-panel.c +@@ -88,6 +88,7 @@ struct _CcDateTimePanelPrivate GCancellable *cancellable; GPermission *permission; @@ -27,7 +27,7 @@ }; static void update_time (CcDateTimePanel *self); -@@ -164,6 +165,12 @@ cc_date_time_panel_dispose (GObject *object) +@@ -166,6 +167,12 @@ cc_date_time_panel_dispose (GObject *obj priv->permission = NULL; } @@ -40,7 +40,7 @@ G_OBJECT_CLASS (cc_date_time_panel_parent_class)->dispose (object); } -@@ -806,19 +813,33 @@ on_permission_changed (GPermission *permission, +@@ -818,19 +825,33 @@ on_permission_changed (GPermission *perm gpointer data) { CcDateTimePanelPrivate *priv = CC_DATE_TIME_PANEL (data)->priv; @@ -76,7 +76,7 @@ update_ntp_switch_from_system (CcDateTimePanel *self) { CcDateTimePanelPrivate *priv = self->priv; -@@ -1103,6 +1124,18 @@ cc_date_time_panel_init (CcDateTimePanel *self) +@@ -1134,4 +1155,16 @@ cc_date_time_panel_init (CcDateTimePanel g_signal_connect (priv->permission, "notify", G_CALLBACK (on_permission_changed), self); on_permission_changed (priv->permission, NULL, self); @@ -93,5 +93,3 @@ + G_CALLBACK (on_permission_tz_changed), self); + on_permission_tz_changed (priv->permission_tz, NULL, self); } - - void ++++++ gnome-control-center-nma-nialog.patch ++++++ Index: gnome-control-center-3.7.90/panels/network/network-dialogs.c =================================================================== --- gnome-control-center-3.7.90.orig/panels/network/network-dialogs.c +++ gnome-control-center-3.7.90/panels/network/network-dialogs.c @@ -29,6 +29,7 @@ #include <nm-device-wifi.h> #include "network-dialogs.h" +#include "nm-wifi-dialog.h" #include "nm-wireless-dialog.h" #include "nm-mobile-wizard.h" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
