20904N/A--- gnome-control-center-3.4.1/configure.ac-orig 2012-05-09 16:32:37.913852566 -0500

20904N/A+++ gnome-control-center-3.4.1/configure.ac 2012-05-09 16:41:12.639884956 -0500

20904N/A@@ -96,24 +96,70 @@ PKG_CHECK_MODULES(BACKGROUND_PANEL, $COM

20784N/A gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)

20904N/A PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES

20904N/A gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION

20784N/A- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION

20784N/A gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)

20784N/A+

20784N/A+PKG_CHECK_MODULES(POLKIT,

20784N/A+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,

20784N/A+ have_polkit=yes,

20784N/A+ have_polkit=no)

20784N/A+if test "x$have_polkit" = "xyes" ; then

20784N/A+ AC_DEFINE(BUILD_INFO_PANEL, [], [Define if we have polkit])

20784N/A+ AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])

20784N/A+fi

20784N/A+AM_CONDITIONAL(HAVE_POLKIT, test x$have_polkit = xyes)

20784N/A+AC_SUBST(HAVE_POLKIT)

20784N/A+AM_CONDITIONAL(BUILD_INFO_PANEL, test x$have_polkit = xyes)

20784N/A+AC_SUBST(BUILD_INFO_PANEL)

20784N/A+AC_SUBST(POLKIT_CFLAGS)

20784N/A+AC_SUBST(POLKIT_LIBS)

20784N/A+

20904N/A PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES gnome-desktop-3.0 >= 3.1.0)

20784N/A-PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0

20784N/A- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)

20784N/A+PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0)

20904N/A PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMON_MODULES x11)

20784N/A PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)

20784N/A PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2

20784N/A gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)

20784N/A PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)

20784N/A-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0)

20824N/A-PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1

20824N/A- gnome-settings-daemon >= $GSD_REQUIRED_VERSION)

20784N/A-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)

20904N/A-PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES

20784N/A- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)

20784N/A+

20784N/A+PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL,

20904N/A+ $COMMON_MODULES goa-1.0 goa-backend-1.0,

20784N/A+ have_goa=yes,

20784N/A+ have_goa=no)

20784N/A+if test "x$have_goa" = "xyes" ; then

20784N/A+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS_PANEL, [], [Define if we have goa])

20784N/A+fi

20784N/A+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS_PANEL, test x$have_goa = xyes)

20784N/A+AC_SUBST(BUILD_HAVE_ONLINE_ACCOUNTS_PANEL)

20784N/A+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)

20784N/A+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)

20784N/A+

20784N/A+PKG_CHECK_MODULES(POWER_PANEL,

20784N/A+ $COMMON_MODULES upower-glib >= 0.9.1,

20784N/A+ have_upower_glib=yes,

20784N/A+ have_upower_glib=no)

20784N/A+if test "x$have_upower_glib" = "xyes" ; then

20784N/A+ AC_DEFINE(BUILD_POWER_PANEL, [], [Define if we have upower_glib])

20784N/A+fi

20784N/A+AM_CONDITIONAL(BUILD_POWER_PANEL, test x$have_upower_glib = xyes)

20784N/A+AC_SUBST(HAVE_POWER_PANEL)

20784N/A+AC_SUBST(POWER_PANEL_CFLAGS)

20784N/A+AC_SUBST(POWER_PANEL_LIBS)

20784N/A+

20784N/A+PKG_CHECK_MODULES(COLOR_PANEL,

20784N/A+ $COMMON_MODULES colord >= 0.1.8,

20784N/A+ have_colord=yes,

20784N/A+ have_colord=no)

20784N/A+if test "x$have_colord" = "xyes" ; then

20784N/A+ AC_DEFINE(BUILD_COLOR_PANEL, [], [Define if we have colord])

20784N/A+fi

20784N/A+AM_CONDITIONAL(BUILD_COLOR_PANEL, test x$have_colord = xyes)

20784N/A+AC_SUBST(BUILD_COLOR_PANEL)

20784N/A+AC_SUBST(COLOR_PANEL_CFLAGS)

20784N/A+AC_SUBST(COLOR_PANEL_LIBS)

20784N/A+

20904N/A+PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES)

20824N/A+

20784N/A PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91

20831N/A- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION

20784N/A libxklavier >= 5.1 libgnomekbdui >= 2.91.91)

20784N/A PKG_CHECK_MODULES(SCREEN_PANEL, $COMMON_MODULES)

20904N/A PKG_CHECK_MODULES(SOUND_PANEL, $COMMON_MODULES libxml-2.0

20904N/A@@ -123,14 +169,9 @@ PKG_CHECK_MODULES(SOUND_PANEL, $COMMON_M

20904N/A gsettings-desktop-schemas >= $SCHEMAS_REQUIRED_VERSION)

20904N/A PKG_CHECK_MODULES(UNIVERSAL_ACCESS_PANEL, $COMMON_MODULES gsettings-desktop-schemas >= $SCHEMAS_REQUIRED_VERSION)

20904N/A PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES

20784N/A- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION

20784N/A gnome-desktop-3.0

20904N/A gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION

20904N/A $SYSTEMD)

20904N/A-PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES

20904N/A- gnome-settings-daemon >= $GSD_REQUIRED_VERSION

20904N/A- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION

20904N/A- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)

20904N/A

20904N/A GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`

20904N/A AC_SUBST(GDESKTOP_PREFIX)

20904N/A--- gnome-control-center-3.4.1/panels/region/gnome-region-panel-system.c-orig 2012-05-09 16:32:50.816234726 -0500

20904N/A+++ gnome-control-center-3.4.1/panels/region/gnome-region-panel-system.c 2012-05-09 16:33:17.526645031 -0500

20831N/A@@ -25,7 +25,9 @@

20831N/A

20831N/A #include <string.h>

20831N/A

20831N/A+#if HAVE_POLKIT

20831N/A #include <polkit/polkit.h>

20831N/A+#endif

20831N/A

20831N/A #include <glib/gi18n.h>

20824N/A

20904N/A@@ -440,6 +442,7 @@ setup_system (GtkBuilder *dialog)

20862N/A GDBusConnection *bus;

20862N/A GtkWidget *button;

20831N/A

20831N/A+#if HAVE_POLKIT

20831N/A localed_permission = polkit_permission_new_sync ("org.freedesktop.locale1.set-locale", NULL, NULL, NULL);

20862N/A if (localed_permission == NULL) {

20862N/A GtkWidget *tab_widget, *notebook;

20904N/A@@ -456,6 +459,7 @@ setup_system (GtkBuilder *dialog)

20862N/A g_signal_connect (localed_permission, "notify",

20862N/A G_CALLBACK (on_permission_changed), dialog);

20862N/A on_permission_changed (localed_permission, NULL, dialog);

20831N/A+#endif

20831N/A

20862N/A

20862N/A button = WID ("copy_settings_button");

20904N/A--- gnome-control-center-3.4.1/panels/Makefile.am-orig 2012-05-09 16:31:42.353458814 -0500

20904N/A+++ gnome-control-center-3.4.1/panels/Makefile.am 2012-05-09 16:34:17.988556913 -0500

20904N/A@@ -2,19 +2,14 @@ SUBDIRS= \

20904N/A common \

20904N/A background \

20904N/A screen \

20904N/A- power \

20904N/A- color \

20904N/A display \

20904N/A mouse \

20904N/A- online-accounts \

20904N/A region \

20904N/A- info \

20904N/A sound \

20904N/A keyboard \

20904N/A universal-access \

20904N/A user-accounts \

20904N/A- datetime \

20904N/A- wacom

20904N/A+ datetime

20904N/A

20904N/A if BUILD_PRINTERS

20904N/A SUBDIRS += printers

20904N/A@@ -28,4 +23,20 @@ if BUILD_BLUETOOTH

20904N/A SUBDIRS += bluetooth

20904N/A endif

20904N/A

20904N/A+if BUILD_POWER_PANEL

20904N/A+SUBDIRS += printers

20904N/A+endif

20904N/A+

20904N/A+if BUILD_COLOR_PANEL

20904N/A+SUBDIRS += color

20904N/A+endif

20904N/A+

20904N/A+if BUILD_ONLINE_ACCOUNTS_PANEL

20904N/A+SUBDIRS += online-accounts

20904N/A+endif

20904N/A+

20904N/A+if BUILD_INFO_PANEL

20904N/A+SUBDIRS += info

20904N/A+endif

20904N/A+

20904N/A -include $(top_srcdir)/git.mk

20904N/A--- gnome-control-center-3.4.1/panels/printers/pp-new-printer-dialog.c-orig 2012-05-09 16:31:57.064203558 -0500

20904N/A+++ gnome-control-center-3.4.1/panels/printers/pp-new-printer-dialog.c 2012-05-09 16:33:17.508751889 -0500

20904N/A@@ -22,6 +22,7 @@

20904N/A

20904N/A #include <unistd.h>

20904N/A #include <stdlib.h>

20904N/A+#include <locale.h>

20904N/A #include <sys/types.h>

20904N/A #include <sys/wait.h>

20904N/A

20904N/A--- gnome-control-center-3.4.1/panels/user-accounts/um-user-panel.c-orig 2012-05-09 16:32:21.774110208 -0500

20904N/A+++ gnome-control-center-3.4.1/panels/user-accounts/um-user-panel.c 2012-05-09 16:35:20.217482883 -0500

20904N/A@@ -31,7 +31,9 @@

20904N/A #include <glib.h>

20904N/A #include <glib/gi18n.h>

20904N/A #include <gtk/gtk.h>

20904N/A+#if HAVE_POLKIT

20904N/A #include <polkit/polkit.h>

20904N/A+#endif

20904N/A

20904N/A #ifdef HAVE_CHEESE

20904N/A #include <gst/gst.h>

20904N/A@@ -1213,10 +1215,12 @@ setup_main_window (UmUserPanelPrivate *d

20904N/A g_signal_connect (button, "clicked",

20904N/A G_CALLBACK (change_fingerprint), d);

20904N/A

20904N/A+#ifdef HAVE_POLKIT

20904N/A d->permission = (GPermission *)polkit_permission_new_sync ("org.freedesktop.accounts.user-administration", NULL, NULL, NULL);

20904N/A g_signal_connect (d->permission, "notify",

20904N/A G_CALLBACK (on_permission_changed), d);

20904N/A on_permission_changed (d->permission, NULL, d);

20904N/A+#endif

20904N/A

20904N/A button = get_widget (d, "add-user-toolbutton");

20904N/A names[0] = "changes-allow-symbolic";

20904N/A--- gnome-control-center-3.4.1/panels/user-accounts/um-utils.c-orig 2012-05-09 16:32:30.608736900 -0500

20904N/A+++ gnome-control-center-3.4.1/panels/user-accounts/um-utils.c 2012-05-09 16:33:17.521907119 -0500

20904N/A@@ -445,6 +445,7 @@ down_arrow (GtkStyleContext *context,

20904N/A }

20904N/A

20904N/A

20904N/A+# define UT_NAMESIZE 32

20904N/A #define MAXNAMELEN (UT_NAMESIZE - 1)

20904N/A

20904N/A static gboolean

20904N/A--- gnome-control-center-3.4.1/panels/datetime/cc-datetime-panel.c-orig 2012-05-09 16:31:31.282312544 -0500

20904N/A+++ gnome-control-center-3.4.1/panels/datetime/cc-datetime-panel.c 2012-05-09 16:33:50.026738532 -0500

20904N/A@@ -34,7 +34,9 @@

20904N/A #include <libintl.h>

20904N/A

20904N/A #include <libgnome-desktop/gnome-wall-clock.h>

20904N/A+#if HAVE_POLKIT

20904N/A #include <polkit/polkit.h>

20904N/A+#endif

20904N/A

20904N/A /* FIXME: This should be "Etc/GMT" instead */

20904N/A #define DEFAULT_TZ "Europe/London"

20904N/A@@ -1091,6 +1093,7 @@ cc_date_time_panel_init (CcDateTimePanel

20904N/A }

20904N/A /* We ignore UTC <--> LocalRTC changes at the moment */

20904N/A

20904N/A+#ifdef HAVE_POLKIT

20904N/A /* add the lock button */

20904N/A priv->permission = polkit_permission_new_sync ("org.gnome.controlcenter.datetime.configure", NULL, NULL, NULL);

20904N/A if (priv->permission == NULL)

20904N/A@@ -1103,6 +1106,7 @@ cc_date_time_panel_init (CcDateTimePanel

20904N/A g_signal_connect (priv->permission, "notify",

20904N/A G_CALLBACK (on_permission_changed), self);

20904N/A on_permission_changed (priv->permission, NULL, self);

20904N/A+#endif

20904N/A }

20904N/A

20904N/A void

20904N/A--- gnome-control-center-3.4.1/panels/printers/cc-printers-panel.c-orig 2012-05-09 17:57:45.172168535 -0500

20904N/A+++ gnome-control-center-3.4.1/panels/printers/cc-printers-panel.c 2012-05-09 17:58:59.686709206 -0500

20904N/A@@ -24,7 +24,9 @@

20904N/A #include <string.h>

20904N/A #include <glib/gi18n-lib.h>

20904N/A #include <glib/gstdio.h>

20904N/A+#ifdef HAVE_POLKIT

20904N/A #include <polkit/polkit.h>

20904N/A+#endif

20904N/A #include <gdesktop-enums.h>

20904N/A

20904N/A #include <cups/cups.h>

20904N/A@@ -2664,9 +2666,14 @@ cc_printers_panel_init (CcPrintersPanel

20904N/A cc_editable_entry_set_selectable (CC_EDITABLE_ENTRY (widget), TRUE);

20904N/A

20904N/A

20904N/A+#if HAVE_POLKIT

20904N/A /* Add unlock button */

20904N/A priv->permission = (GPermission *)polkit_permission_new_sync (

20904N/A "org.opensuse.cupspkhelper.mechanism.all-edit", NULL, NULL, NULL);

20904N/A+#else

20904N/A+ priv->permission = NULL;

20904N/A+#endif

20904N/A+

20904N/A if (priv->permission != NULL)

20904N/A {

20904N/A g_signal_connect (priv->permission, "notify",