pool/gnome-control-center
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 129831 from GNOME:Factory

Browse Source 
Various changes submitted to openSUSE:12.2, but not to G:F (forwarded request 129828 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/129831
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=81
This commit is contained in:
Stephan Kulow 2012-08-04 11:07:27 +00:00 committed by Git OBS Bridge
commit 92fd57beb6
7 changed files with 278 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gnome-control-center-allow-wallpapers-with-weird-names.patch Normal file
View File

@ -0,0 +1,27 @@
From ae5b16f873869bce935cfaafad1964340f47e7d3 Mon Sep 17 00:00:00 2001
From: Jon McCann <jmccann@redhat.com>
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

44
gnome-control-center-fix-crash-on-hidden-ssid.patch Normal file
View File

@ -0,0 +1,44 @@
commit 8631717b3d1cb85bf21b0e0d648b784e8e7c3f8f
Author: Dan Williams <dcbw@redhat.com>
Date: Fri Apr 20 11:48:17 2012 -0500
network: don't crash on hidden SSIDs
APs that don't broadcast their SSID will return NULL from
nm_access_point_get_ssid() (since that's easier to check in C
using an if statement than returning a zero-length GByteArray).
Thus the code shouldn't try to dereference the SSID byte array
since it could be NULL.
But in fact, the panel shouldn't be showing hidden APs anywhere
in the UI, since the user needs to manually enter the SSID to
connect to it anyway. So just ignore hidden APs like nm-applet
does.
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: Richard Hughes <richard@hughsie.com>
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index c8cbd78..d5ab951 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -1124,13 +1124,19 @@ panel_get_strongest_unique_aps (const GPtrArray *aps)
if (aps != NULL)
for (i = 0; i < aps->len; i++) {
ap = NM_ACCESS_POINT (g_ptr_array_index (aps, i));
+
+ /* Hidden SSIDs don't get shown in the list */
ssid = nm_access_point_get_ssid (ap);
+ if (!ssid)
+ continue;
+
add_ap = TRUE;
/* get already added list */
for (j=0; j<aps_unique->len; j++) {
ap_tmp = NM_ACCESS_POINT (g_ptr_array_index (aps_unique, j));
ssid_tmp = nm_access_point_get_ssid (ap_tmp);
+ g_assert (ssid_tmp);
/* is this the same type and data? */
if (nm_utils_same_ssid (ssid, ssid_tmp, TRUE)) {

84
gnome-control-center-fix-screen-brightness.patch Normal file
View File

@ -0,0 +1,84 @@
From 570478bcae6c872a4903118fdae25cb72cb5a027 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
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;

16
gnome-control-center-probe-radius-server-cert.patch Normal file
View File

@ -0,0 +1,16 @@
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)) {

68
gnome-control-center-shortcut-assignment-fixes.patch Normal file
View File

@ -0,0 +1,68 @@
From 8560cf39a214d973e24667fcc82a192fd18251c4 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
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 <hadess@hadess.net>
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

24
gnome-control-center.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Thu Aug 2 13:50:51 UTC 2012 - badshah400@gmail.com
- 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.
-------------------------------------------------------------------
Wed Jul 18 06:04:12 UTC 2012 - glin@suse.com
- Add gnome-control-center-probe-radius-server-cert.patch to probe
the certificate of the RADIUS server (bnc#574266, bnc#771185)
- Add gnome-control-center-fix-crash-on-hidden-ssid.patch to fix
crash when the network panel receives a hidden ssid.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jul 1 18:54:43 UTC 2012 - dimstar@opensuse.org Sun Jul 1 18:54:43 UTC 2012 - dimstar@opensuse.org

15
gnome-control-center.spec
View File

@ -39,6 +39,16 @@ Patch3: gnome-control-center-fine-grained-tz-polkit.patch
Patch14: gnome-control-center-system-proxy-configuration.patch Patch14: gnome-control-center-system-proxy-configuration.patch
# PATCH-FIX-UPSTREAM gcc-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- network: create private connections if the user if not authorized. # PATCH-FIX-UPSTREAM gcc-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- network: create private connections if the user if not authorized.
Patch15: gcc-private-connection.patch Patch15: gcc-private-connection.patch
# PATCH-FIX-UPSTREAM gnome-control-center-probe-radius-server-cert.patch bnc#574266 glin@suse.com -- network: Probe the RADIUS server certificate
Patch16: gnome-control-center-probe-radius-server-cert.patch
# PATCH-FIX-UPSTREAM gnome-control-center-fix-crash-on-hidden-ssid.patch glin@suse.com -- 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 badshah400@gmail.com -- 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 badshah400@gmail.com -- 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 badshah400@gmail.com -- 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: cups-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: fdupes BuildRequires: fdupes
@ -162,6 +172,11 @@ translation-update-upstream
#NEEDS-REBASE #NEEDS-REBASE
#%patch14 -p1 #%patch14 -p1
%patch15 -p1 %patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%if 0%{?BUILD_FROM_VCS} %if 0%{?BUILD_FROM_VCS}
[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh