rpms/gnome-utils/devel gnome-screenshot-hideous-uri.patch, NONE, 1.1 gnome-utils.spec, 1.160, 1.161

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv727

Modified Files:
	gnome-utils.spec 
Added Files:
	gnome-screenshot-hideous-uri.patch 
Log Message:
don't show hideous uris


gnome-screenshot-hideous-uri.patch:

--- NEW FILE gnome-screenshot-hideous-uri.patch ---
diff -up gnome-utils-2.20.0.1/gnome-screenshot/screenshot-xfer.c.hideous-uri gnome-utils-2.20.0.1/gnome-screenshot/screenshot-xfer.c
--- gnome-utils-2.20.0.1/gnome-screenshot/screenshot-xfer.c.hideous-uri	2008-04-23 11:42:25.000000000 -0400
+++ gnome-utils-2.20.0.1/gnome-screenshot/screenshot-xfer.c	2008-04-23 11:42:35.000000000 -0400
@@ -170,6 +170,7 @@ handle_transfer_overwrite (const GnomeVF
   GtkWidget *dialog;
   gint response;
   gint need_timeout;
+  char *target_name;
 
   need_timeout = (transfer_info->timeout_id > 0);
   remove_timeout (transfer_info);
@@ -181,9 +182,11 @@ handle_transfer_overwrite (const GnomeVF
 				   GTK_BUTTONS_NONE,
 				   _("File already exists"));
 
+  target_name = gnome_vfs_format_uri_for_display (progress_info->target_name);  
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
 					    _("The file \"%s\" already exists.  Would you like to replace it?"), 
-					    progress_info->target_name);
+					    target_name);
+  g_free (target_name);
   gtk_dialog_add_button (GTK_DIALOG (dialog),
 			 GTK_STOCK_CANCEL,
 			 GTK_RESPONSE_CANCEL);


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- gnome-utils.spec	19 Feb 2008 22:38:45 -0000	1.160
+++ gnome-utils.spec	23 Apr 2008 16:12:16 -0000	1.161
@@ -10,7 +10,7 @@
 
 Name:           gnome-utils
 Version:        2.20.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -26,6 +26,8 @@
 Patch2:		logview-versions-crash.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=497490
 Patch3:		logview-versions-format.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=529560
+Patch4:		gnome-screenshot-hideous-uri.patch
 
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: 	glib2-devel >= %{glib2_version}
@@ -83,6 +85,7 @@
 %patch1 -p1 -b .logview-scroll
 %patch2 -p1 -b .versions-crash
 %patch3 -p1 -b .versions-format
+%patch4 -p1 -b .hideous-uri
 
 # Hide from menus
 pushd gsearchtool
@@ -242,6 +245,9 @@
 
 
 %changelog
+* Wed Apr 23 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0.0.1-5
+- Fix ugly display of URIs in screenshot replace dialog (#443769)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:2.20.0.1-4
 - Autorebuild for GCC 4.3