Hello community,

here is the log from the commit of package gnome-control-center for 
openSUSE:12.2 checked in at 2012-08-04 13:07:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/gnome-control-center (Old)
 and      /work/SRC/openSUSE:12.2/.gnome-control-center.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnome-control-center", Maintainer is "[email protected]"

Changes:
--------
--- /work/SRC/openSUSE:12.2/gnome-control-center/gnome-control-center.changes   
2012-07-31 14:04:45.000000000 +0200
+++ 
/work/SRC/openSUSE:12.2/.gnome-control-center.new/gnome-control-center.changes  
    2012-08-04 13:08:04.000000000 +0200
@@ -1,0 +2,16 @@
+Thu Aug  2 13:50:51 UTC 2012 - [email protected]
+
+- Add gnome-control-center-fix-screen-brightness.patch to fix
+  screen brightness slider not picking up the right value when
+  brightness is changed by some other means, e.g., Function keys
+  (bgo#662117, bnc#774190); patch came from upstream git and was
+  rebased to current version
+- Add gnome-control-center-shortcut-assignment-fixes.patch to fix
+  user not being able to re-assign previously assigned shortcuts
+  like Ctrl+Q, etc (bgo#675475, bgo#671448); patch came from
+  upstream git
+- Add gnome-control-center-allow-wallpapers-with-weird-names.patch
+  to allow setting wallpapers with weird names involving special
+  characters (bgo#673015); patch came from upstream git.
+
+-------------------------------------------------------------------

New:
----
  gnome-control-center-allow-wallpapers-with-weird-names.patch
  gnome-control-center-fix-screen-brightness.patch
  gnome-control-center-shortcut-assignment-fixes.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-control-center.spec ++++++
--- /var/tmp/diff_new_pack.EQRkBc/_old  2012-08-04 13:08:38.000000000 +0200
+++ /var/tmp/diff_new_pack.EQRkBc/_new  2012-08-04 13:08:38.000000000 +0200
@@ -43,6 +43,12 @@
 Patch16:        gnome-control-center-probe-radius-server-cert.patch
 # PATCH-FIX-UPSTREAM gnome-control-center-fix-crash-on-hidden-ssid.patch 
[email protected] -- network: don't crash on hidden ssid
 Patch17:        gnome-control-center-fix-crash-on-hidden-ssid.patch
+# PATCH-FIX-UPSTREAM gnome-control-center-fix-screen-brightness.patch 
bgo#662117 bnc#774190 [email protected] -- Fix brightness slider not picking 
up right brightness settings values; patch came from upstream git
+Patch18:        gnome-control-center-fix-screen-brightness.patch
+# PATCH-FIX-UPSTREAM gnome-control-center-shortcut-assignment-fixes.patch 
bgo#675475 bgo#671448 [email protected] -- Fix not being able to assign odd 
keyboard shortcuts (Ctrl+Q, etc); patch came from upstream git
+Patch19:        gnome-control-center-shortcut-assignment-fixes.patch
+# PATCH-FIX-UPSTREAM 
gnome-control-center-allow-wallpapers-with-weird-names.patch bgo#673015 
[email protected] -- Wallpapers with weird names involving special 
characters; patch came from upstream git
+Patch20:        gnome-control-center-allow-wallpapers-with-weird-names.patch
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
@@ -168,6 +174,9 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %if 0%{?BUILD_FROM_VCS}
 [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh


++++++ gnome-control-center-allow-wallpapers-with-weird-names.patch ++++++
>From ae5b16f873869bce935cfaafad1964340f47e7d3 Mon Sep 17 00:00:00 2001
From: Jon McCann <[email protected]>
Date: Wed, 28 Mar 2012 19:10:32 +0000
Subject: background: Escape wallpaper filename before display

https://bugzilla.gnome.org/show_bug.cgi?id=673015
---
diff --git a/panels/background/cc-background-panel.c 
b/panels/background/cc-background-panel.c
index 1ec9188..47a920e 100644
--- a/panels/background/cc-background-panel.c
+++ b/panels/background/cc-background-panel.c
@@ -340,8 +340,12 @@ update_preview (CcBackgroundPanelPrivate *priv,
   if (priv->current_background)
     {
       GdkColor pcolor, scolor;
+      char *escaped;
+
+      escaped = g_markup_escape_text (cc_background_item_get_name 
(priv->current_background), -1);
+      markup = g_strdup_printf ("<b>%s</b>", escaped);
+      g_free (escaped);
 
-      markup = g_strdup_printf ("<b>%s</b>", cc_background_item_get_name 
(priv->current_background));
       gtk_label_set_markup (GTK_LABEL (WID ("background-label")), markup);
       g_free (markup);
 
--
cgit v0.9.0.2
++++++ gnome-control-center-fix-screen-brightness.patch ++++++
>From 570478bcae6c872a4903118fdae25cb72cb5a027 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <[email protected]>
Date: Fri, 08 Jun 2012 21:01:10 +0000
Subject: screen: Fix for gnome-settings-daemon changes

g-s-d changed its DBus interface, and that made all
external changes to brightness invisible to the panel. Update
accordingly.

https://bugzilla.gnome.org/show_bug.cgi?id=662117
---
Index: gnome-control-center-3.4.2/panels/screen/cc-screen-panel.c
===================================================================
--- gnome-control-center-3.4.2.orig/panels/screen/cc-screen-panel.c
+++ gnome-control-center-3.4.2/panels/screen/cc-screen-panel.c
@@ -169,33 +169,6 @@ cc_screen_panel_class_finalize (CcScreen
 }
 
 static void
-on_signal (GDBusProxy *proxy,
-           gchar      *sender_name,
-           gchar      *signal_name,
-           GVariant   *parameters,
-           gpointer    user_data)
-{
-  CcScreenPanel *self = CC_SCREEN_PANEL (user_data);
-
-  if (g_strcmp0 (signal_name, "BrightnessChanged") == 0)
-    {
-      guint brightness;
-      GtkRange *range;
-
-      /* changed, but ignoring */
-      if (self->priv->setting_brightness)
-        return;
-
-      /* update the bar */
-      g_variant_get (parameters,
-                     "(u)",
-                     &brightness);
-      range = GTK_RANGE (WID ("screen_brightness_hscale"));
-      gtk_range_set_value (range, brightness);
-    }
-}
-
-static void
 set_brightness_cb (GObject *source_object, GAsyncResult *res, gpointer 
user_data)
 {
   GError *error = NULL;
@@ -276,6 +249,34 @@ get_brightness_cb (GObject *source_objec
 }
 
 static void
+on_signal (GDBusProxy *proxy,
+           gchar      *sender_name,
+           gchar      *signal_name,
+           GVariant   *parameters,
+           gpointer    user_data)
+{
+  CcScreenPanel *self = CC_SCREEN_PANEL (user_data);
+
+  if (g_strcmp0 (signal_name, "Changed") == 0)
+    {
+      /* changed, but ignoring */
+      if (self->priv->setting_brightness)
+        return;
+
+      /* retrieve the value again from g-s-d */
+      g_dbus_proxy_call (self->priv->proxy,
+                         "GetPercentage",
+                         NULL,
+                         G_DBUS_CALL_FLAGS_NONE,
+                         200, /* we don't want to randomly move the bar */
+                         self->priv->cancellable,
+                         get_brightness_cb,
+                         user_data);
+    }
+}
+
+
+static void
 got_power_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer 
user_data)
 {
   GError *error = NULL;
++++++ gnome-control-center-shortcut-assignment-fixes.patch ++++++
>From 8560cf39a214d973e24667fcc82a192fd18251c4 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <[email protected]>
Date: Mon, 16 Jul 2012 16:03:36 +0000
Subject: shell: Fix not being able to assign Ctrl+Q to a shortcut

Because the shell window was capturing it before the key editing
cell had a change to get to it.

s/g_signal_connect/g_signal_connect_after/

https://bugzilla.gnome.org/show_bug.cgi?id=671448
---
diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c
index b1c66b3..d046033 100644
--- a/shell/gnome-control-center.c
+++ b/shell/gnome-control-center.c
@@ -1115,8 +1115,8 @@ gnome_control_center_init (GnomeControlCenter *self)
   /* connect various signals */
   priv->window = W (priv->builder, "main-window");
   g_signal_connect_swapped (priv->window, "delete-event", G_CALLBACK 
(g_object_unref), self);
-  g_signal_connect (priv->window, "key_press_event",
-                    G_CALLBACK (window_key_press_event), self);
+  g_signal_connect_after (priv->window, "key_press_event",
+                          G_CALLBACK (window_key_press_event), self);
 
   priv->notebook = W (priv->builder, "notebook");
   priv->scrolled_window = W (priv->builder, "scrolledwindow1");
--
cgit v0.9.0.2

>From e5bfcb23d31310e73dc73c2af5a6230e772d115f Mon Sep 17 00:00:00 2001
From: Bastien Nocera <[email protected]>
Date: Mon, 16 Jul 2012 17:05:04 +0000
Subject: shell: Don't handle shortcuts with excess modifiers

Ctrl+Alt+W shouldn't be handled the same way as Ctrl+W.

https://bugzilla.gnome.org/show_bug.cgi?id=675475
---
diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c
index d046033..195a0a1 100644
--- a/shell/gnome-control-center.c
+++ b/shell/gnome-control-center.c
@@ -1058,12 +1058,20 @@ window_key_press_event (GtkWidget          *win,
                        GdkEventKey        *event,
                        GnomeControlCenter *self)
 {
+  GdkKeymap *keymap;
   gboolean retval;
+  GdkModifierType state;
+
+  if (event->state == 0)
+    return FALSE;
 
   retval = FALSE;
+  state = event->state;
+  keymap = gdk_keymap_get_default ();
+  gdk_keymap_add_virtual_modifiers (keymap, &state);
+  state = state & gtk_accelerator_get_default_mod_mask ();
 
-  if (event->state != 0 &&
-      (event->state & GDK_CONTROL_MASK))
+  if (state == GDK_CONTROL_MASK)
     {
       switch (event->keyval)
         {
--
cgit v0.9.0.2
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to