Index: gnome-utils/gnome-screenshot/screenshot-xfer.c
===================================================================
--- gnome-utils/gnome-screenshot/screenshot-xfer.c	(revision 7470)
+++ gnome-utils/gnome-screenshot/screenshot-xfer.c	(working copy)
@@ -170,7 +170,7 @@
   GtkWidget *dialog;
   gint response;
   gint need_timeout;
-
+  gchar *target_name = g_filename_from_uri (progress_info->target_name, NULL, NULL);
   need_timeout = (transfer_info->timeout_id > 0);
   remove_timeout (transfer_info);
 
@@ -183,7 +183,8 @@
 
   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/gnome-dictionary/libgdict/gdict-client-context.c
===================================================================
--- gnome-utils/gnome-dictionary/libgdict/gdict-client-context.c	(revision 7470)
+++ gnome-utils/gnome-dictionary/libgdict/gdict-client-context.c	(working copy)
@@ -2092,7 +2092,7 @@
   
   cmd = gdict_command_new (CMD_DEFINE);
   cmd->database = g_strdup ((database != NULL ? database : GDICT_DEFAULT_DATABASE));
-  cmd->word = g_strdup (word);
+  cmd->word = g_utf8_normalize (word, -1, G_NORMALIZE_NFC);
   
   return gdict_client_context_push_command (client_ctx, cmd);
 }
@@ -2127,7 +2127,7 @@
   cmd = gdict_command_new (CMD_MATCH);
   cmd->database = g_strdup ((database != NULL ? database : GDICT_DEFAULT_DATABASE));
   cmd->strategy = g_strdup ((strategy != NULL ? strategy : GDICT_DEFAULT_STRATEGY));
-  cmd->word = g_strdup (word);
+  cmd->word = g_utf8_normalize (word, -1, G_NORMALIZE_NFC);
   
   return gdict_client_context_push_command (client_ctx, cmd);
 }
