[seahorse-plugins] Bug 595676 - Bad encoding in gpg check sign notify

[Adam Schreiber <sadam src gnome org>]

commit e2fb8c2ff2dd6f4e1563670750e8b331a5cef424
Author: Adam Schreiber <sadam gnome org>
Date:   Sat Feb 13 09:37:29 2010 -0500

    Bug 595676 - Bad encoding in gpg check sign notify
    
    URI's need to be unescaped before presenting them to the user.

 libseahorse/seahorse-notification.c |    5 +++--
 plugins/nautilus/seahorse-tool.c    |    6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/libseahorse/seahorse-notification.c b/libseahorse/seahorse-notification.c
index edb3db2..5660bf7 100644
--- a/libseahorse/seahorse-notification.c
+++ b/libseahorse/seahorse-notification.c
@@ -675,8 +675,9 @@ seahorse_notify_signatures (const gchar* data, gpgme_verify_result_t status)
     }
     
     if (data) {
-        data = seahorse_util_uri_get_last (data);
-        title = g_strdup_printf ("%s: %s", data, title); 
+        gchar *unesc_uri = g_uri_unescape_string (seahorse_util_uri_get_last (data), NULL);
+        title = g_strdup_printf ("%s: %s", unesc_uri, title);
+        g_free (unesc_uri); 
     } else {
         title = g_strdup (title);
     }
diff --git a/plugins/nautilus/seahorse-tool.c b/plugins/nautilus/seahorse-tool.c
index b099731..87968ff 100644
--- a/plugins/nautilus/seahorse-tool.c
+++ b/plugins/nautilus/seahorse-tool.c
@@ -554,7 +554,7 @@ verify_start (SeahorseToolMode *mode, const gchar *uri, gpgme_data_t uridata,
 {
     gpgme_data_t plain;
     gpgme_error_t gerr;
-    gchar *original;
+    gchar *original, *unesc_uri;
 
     /* File to decrypt to */
     original = seahorse_util_remove_suffix (uri, NULL);
@@ -565,8 +565,9 @@ verify_start (SeahorseToolMode *mode, const gchar *uri, gpgme_data_t uridata,
         GtkWidget *dialog;
         gchar *t;
         
+        unesc_uri = g_uri_unescape_string (seahorse_util_uri_get_last (uri), NULL);
         t = g_strdup_printf (_("Choose Original File for '%s'"), 
-                             seahorse_util_uri_get_last (uri));
+                             unesc_uri);
             
         dialog = gtk_file_chooser_dialog_new (t, 
                                 NULL, GTK_FILE_CHOOSER_ACTION_OPEN, 
@@ -574,6 +575,7 @@ verify_start (SeahorseToolMode *mode, const gchar *uri, gpgme_data_t uridata,
                                 GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
                                 NULL);
             
+        g_free (unesc_uri);        
         g_free (t);
 
         gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (dialog), original);