r35775 - in /desktop/unstable/gnome-control-center/debian: changelog patches/11_escape_wallpaper_filename_before_display.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Sep 22 18:09:52 2012
New Revision: 35775

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35775
Log:
debian/patches/11_escape_wallpaper_filename_before_display.patch: Escape
wallpaper filename before display. Patch cherry-picked from upstream Git.

Added:
    desktop/unstable/gnome-control-center/debian/patches/11_escape_wallpaper_filename_before_display.patch
Modified:
    desktop/unstable/gnome-control-center/debian/changelog
    desktop/unstable/gnome-control-center/debian/patches/series

Modified: desktop/unstable/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/changelog?rev=35775&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/changelog [utf-8] Sat Sep 22 18:09:52 2012
@@ -5,6 +5,8 @@
 
   [ Michael Biebl ]
   * Rebuild with xz compression. Closes: #687279
+  * debian/patches/11_escape_wallpaper_filename_before_display.patch: Escape
+    wallpaper filename before display. Patch cherry-picked from upstream Git.
 
  -- Josselin Mouette <joss at debian.org>  Fri, 06 Jul 2012 11:43:52 +0200
 

Added: desktop/unstable/gnome-control-center/debian/patches/11_escape_wallpaper_filename_before_display.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/11_escape_wallpaper_filename_before_display.patch?rev=35775&op=file
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/11_escape_wallpaper_filename_before_display.patch (added)
+++ desktop/unstable/gnome-control-center/debian/patches/11_escape_wallpaper_filename_before_display.patch [utf-8] Sat Sep 22 18:09:52 2012
@@ -1,0 +1,26 @@
+commit ae5b16f873869bce935cfaafad1964340f47e7d3
+Author: Jon McCann <jmccann at redhat.com>
+Date:   Wed Mar 28 15:10:32 2012 -0400
+
+    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);
+ 

Modified: desktop/unstable/gnome-control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/series?rev=35775&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/patches/series [utf-8] Sat Sep 22 18:09:52 2012
@@ -2,5 +2,6 @@
 02_no_assert_on_null_streams.patch
 06_handle_passwd_with_ldap.patch
 10_optional_wacom_support.patch
+11_escape_wallpaper_filename_before_display.patch
 90_force_fallback.patch
 revert_git_datetime_port.patch