glib r6370 - trunk/gio

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Jan 25 06:10:29 2008
New Revision: 6370
URL: http://svn.gnome.org/viewvc/glib?rev=6370&view=rev

Log:
String fixes


Modified:
   trunk/gio/ChangeLog
   trunk/gio/gbufferedinputstream.c
   trunk/gio/ginputstream.c
   trunk/gio/glocalfile.c
   trunk/gio/goutputstream.c

Modified: trunk/gio/gbufferedinputstream.c
==============================================================================
--- trunk/gio/gbufferedinputstream.c	(original)
+++ trunk/gio/gbufferedinputstream.c	Fri Jan 25 06:10:29 2008
@@ -480,7 +480,8 @@
 					   callback,
 					   user_data,
 					   G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-					   _("Too large count value passed to g_input_stream_read_async"));
+					   _("Too large count value passed to %s"),
+					   G_GNUC_PRETTY_FUNCTION);
       return;
     }
   

Modified: trunk/gio/ginputstream.c
==============================================================================
--- trunk/gio/ginputstream.c	(original)
+++ trunk/gio/ginputstream.c	Fri Jan 25 06:10:29 2008
@@ -183,7 +183,8 @@
   if (((gssize) count) < 0)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-		   _("Too large count value passed to g_input_stream_read"));
+		   _("Too large count value passed to %s"), 
+                   G_GNUC_PRETTY_FUNCTION);
       return -1;
     }
 
@@ -315,7 +316,8 @@
   if (((gssize) count) < 0)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-		   _("Too large count value passed to g_input_stream_skip"));
+		   _("Too large count value passed to %s"),
+		   G_GNUC_PRETTY_FUNCTION);
       return -1;
     }
   
@@ -556,7 +558,8 @@
 					   callback,
 					   user_data,
 					   G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-					   _("Too large count value passed to g_input_stream_read_async"));
+					   _("Too large count value passed to %s"),
+					   G_GNUC_PRETTY_FUNCTION);
       return;
     }
 
@@ -680,7 +683,8 @@
 					   callback,
 					   user_data,
 					   G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-					   _("Too large count value passed to g_input_stream_skip_async"));
+					   _("Too large count value passed to %s"),
+					   G_GNUC_PRETTY_FUNCTION);
       return;
     }
 

Modified: trunk/gio/glocalfile.c
==============================================================================
--- trunk/gio/glocalfile.c	(original)
+++ trunk/gio/glocalfile.c	Fri Jan 25 06:10:29 2008
@@ -1626,7 +1626,7 @@
       
       g_set_error (error, G_IO_ERROR,
 		   g_io_error_from_errno (errno),
-		   _("Unable to create trashed file: %s"),
+		   _("Unable to create trashing info file: %s"),
 		   g_strerror (errno));
       return FALSE;
     }

Modified: trunk/gio/goutputstream.c
==============================================================================
--- trunk/gio/goutputstream.c	(original)
+++ trunk/gio/goutputstream.c	Fri Jan 25 06:10:29 2008
@@ -190,7 +190,8 @@
   if (((gssize) count) < 0)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-		   _("Too large count value passed to g_output_stream_write"));
+		   _("Too large count value passed to %s"),
+		   G_GNUC_PRETTY_FUNCTION);
       return -1;
     }
 
@@ -644,7 +645,8 @@
 					   callback,
 					   user_data,
 					   G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-					   _("Too large count value passed to g_output_stream_write_async"));
+					   _("Too large count value passed to %s"),
+					   G_GNUC_PRETTY_FUNCTION);
       return;
     }