r40361 - in /desktop/unstable/gnome-screenshot/debian: changelog patches/01_accented-characters.patch patches/series

[noskcaj-guest at users.alioth.debian.org]

Author: noskcaj-guest
Date: Thu Dec 19 19:44:34 2013
New Revision: 40361

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40361
Log:
Add 01_accented-characters.patch from ubuntu, fixes an issue
when displaying accented characters. LP: #1155583

Added:
    desktop/unstable/gnome-screenshot/debian/patches/01_accented-characters.patch
Modified:
    desktop/unstable/gnome-screenshot/debian/changelog
    desktop/unstable/gnome-screenshot/debian/patches/series

Modified: desktop/unstable/gnome-screenshot/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-screenshot/debian/changelog?rev=40361&op=diff
==============================================================================
--- desktop/unstable/gnome-screenshot/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-screenshot/debian/changelog	[utf-8] Thu Dec 19 19:44:34 2013
@@ -1,6 +1,8 @@
 gnome-screenshot (3.10.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Add 01_accented-characters.patch from ubuntu, fixes an issue
+    when displaying accented characters. LP: #1155583
 
  -- Jackson Doak <noskcaj at ubuntu.com>  Fri, 20 Dec 2013 06:34:00 +1100
 

Added: desktop/unstable/gnome-screenshot/debian/patches/01_accented-characters.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-screenshot/debian/patches/01_accented-characters.patch?rev=40361&op=file
==============================================================================
--- desktop/unstable/gnome-screenshot/debian/patches/01_accented-characters.patch	(added)
+++ desktop/unstable/gnome-screenshot/debian/patches/01_accented-characters.patch	[utf-8] Thu Dec 19 19:44:34 2013
@@ -0,0 +1,32 @@
+Description: Fix accented characters
+ There is an issue where the German "Umlaute" (ä, ü, etc) are not displayed
+ correctly in some cases in gnome-screenshot. This was found affecting the
+ polish of Ubuntu. It has been forwarded, but upstream gnome-shell uses its
+ own interface for this. There are no negetive effects though.
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=695903
+Origin: Ubuntu, https://bugs.launchpad.net/ubuntu/+source/gnome-screenshot/+bug/1155583
+
+---
+ src/screenshot-application.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/src/screenshot-application.c
++++ b/src/screenshot-application.c
+@@ -139,7 +139,8 @@ save_pixbuf_handle_error (ScreenshotAppl
+           !self->priv->should_overwrite)
+         {
+           gchar *folder = screenshot_dialog_get_folder (dialog);
+-          gchar *folder_name = g_path_get_basename (folder);
++          gchar *folder_uri = g_path_get_basename (folder);
++          gchar *folder_name = g_uri_unescape_string (folder_uri, NULL);
+           gchar *file_name = screenshot_dialog_get_filename (dialog);
+           gchar *detail = g_strdup_printf (_("A file named \"%s\" already exists in \"%s\""),
+                                            file_name, folder_name);
+@@ -153,6 +154,7 @@ save_pixbuf_handle_error (ScreenshotAppl
+ 
+           g_free (folder);
+           g_free (folder_name);
++          g_free (folder_uri);
+           g_free (file_name);
+           g_free (detail);
+ 

Modified: desktop/unstable/gnome-screenshot/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-screenshot/debian/patches/series?rev=40361&op=diff
==============================================================================
--- desktop/unstable/gnome-screenshot/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-screenshot/debian/patches/series	[utf-8] Thu Dec 19 19:44:34 2013
@@ -0,0 +1 @@
+01_accented-characters.patch