gvfs r1661 - in trunk: . programs

[wbolster svn gnome org]

Author: wbolster
Date: Sun Mar 16 11:17:18 2008
New Revision: 1661
URL: http://svn.gnome.org/viewvc/gvfs?rev=1661&view=rev

Log:
2008-03-16  Wouter Bolsterlee  <wbolster svn gnome org>

	* programs/gvfs-rename.c (main): Fix wording of error
	messages. Don't include "Error renaming file" since
	that's what the error->message might contain as well.


Modified:
   trunk/ChangeLog
   trunk/programs/gvfs-rename.c

Modified: trunk/programs/gvfs-rename.c
==============================================================================
--- trunk/programs/gvfs-rename.c	(original)
+++ trunk/programs/gvfs-rename.c	Sun Mar 16 11:17:18 2008
@@ -28,7 +28,7 @@
 
 static GOptionEntry entries[] = 
 {
-	{ NULL }
+  { NULL }
 };
 
 
@@ -39,11 +39,11 @@
   GError         *error;
   GFile          *file;
   GFile          *new_file;
-  
+
   setlocale (LC_ALL, "");
 
   g_type_init ();
-  
+
   error = NULL;
   context = g_option_context_new ("- rename file");
   g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
@@ -56,7 +56,7 @@
                   g_get_prgname ());
       return 1;
     }
-  
+
   file = g_file_new_for_commandline_arg (argv[1]);
 
   new_file = g_file_set_display_name (file, argv[2],
@@ -64,13 +64,13 @@
 
   if (new_file == NULL)
     {
-      g_print ("Error rename file: %s\n", error->message);
+      g_print ("Error: %s\n", error->message);
       g_error_free (error);
     }
   else
     {
       char *uri = g_file_get_uri (new_file);
-      g_print ("Success (new uri: %s)\n", uri);
+      g_print ("Rename successful. New uri: %s\n", uri);
       g_object_unref (new_file);
       g_free (uri);
     }