gedit r6746 - in trunk: . gedit

[pborelli svn gnome org]

Author: pborelli
Date: Mon Dec 29 10:58:20 2008
New Revision: 6746
URL: http://svn.gnome.org/viewvc/gedit?rev=6746&view=rev

Log:
2008-12-29  Paolo Borelli  <pborelli katamail com>

	* gedit/gedit-convert.c:
	* gedit/gedit-gio-document-saver.c:
	* gedit/gedit-tab.c:
	Fix some string format warnings in debug messages.



Modified:
   trunk/ChangeLog
   trunk/gedit/gedit-convert.c
   trunk/gedit/gedit-gio-document-saver.c
   trunk/gedit/gedit-tab.c

Modified: trunk/gedit/gedit-convert.c
==============================================================================
--- trunk/gedit/gedit-convert.c	(original)
+++ trunk/gedit/gedit-convert.c	Mon Dec 29 10:58:20 2008
@@ -89,9 +89,9 @@
 					&bytes_read, 
 					new_len,
 					&conv_error); 
-	
-	gedit_debug_message (DEBUG_UTILS, "Bytes read: %d", bytes_read);
-		
+
+	gedit_debug_message (DEBUG_UTILS, "Bytes read: %" G_GSIZE_FORMAT, bytes_read);
+
 	/* There is no way we can avoid to run 	g_utf8_validate on the converted text.
 	 *
 	 * <paolo> hmmm... but in that case g_convert should fail 
@@ -126,9 +126,10 @@
 	} 
 	else 
 	{
-		gedit_debug_message (DEBUG_UTILS, "Converted from %s to UTF-8 (newlen = %d).", 
+		gedit_debug_message (DEBUG_UTILS,
+				     "Converted from %s to UTF-8 (newlen = %" G_GSIZE_FORMAT ").", 
 				     charset, *new_len);
-	
+
 		g_return_val_if_fail (converted_contents != NULL, NULL); 
 
 		utf8_content = converted_contents;

Modified: trunk/gedit/gedit-gio-document-saver.c
==============================================================================
--- trunk/gedit/gedit-gio-document-saver.c	(original)
+++ trunk/gedit/gedit-gio-document-saver.c	Mon Dec 29 10:58:20 2008
@@ -394,9 +394,9 @@
 
 	gvsaver = async->saver;
 	bytes_written = g_output_stream_write_finish (stream, res, &error);
-	
-	gedit_debug_message (DEBUG_SAVER, "Written: %d", bytes_written);
-	
+
+	gedit_debug_message (DEBUG_SAVER, "Written: %" G_GSSIZE_FORMAT, bytes_written);
+
 	if (bytes_written == -1)
 	{
 		gedit_debug_message (DEBUG_SAVER, "Write error: %s", error->message);
@@ -432,7 +432,9 @@
 
 	gvsaver = async->saver;
 
-	gedit_debug_message (DEBUG_SAVER, "Writing next chunk: %Ld/%Ld", gvsaver->priv->bytes_written, gvsaver->priv->size);
+	gedit_debug_message (DEBUG_SAVER,
+			     "Writing next chunk: %" G_GINT64_FORMAT "/%" G_GINT64_FORMAT,
+			     gvsaver->priv->bytes_written, gvsaver->priv->size);
 
 	g_output_stream_write_async (G_OUTPUT_STREAM (gvsaver->priv->stream),
 				     async->buffer + gvsaver->priv->bytes_written,
@@ -547,10 +549,10 @@
 
 	async->buffer = buffer;
 	gvsaver->priv->size = len;
-	
-	gedit_debug_message (DEBUG_SAVER, "File contents size: %Ld", gvsaver->priv->size);
+
+	gedit_debug_message (DEBUG_SAVER, "File contents size: %" G_GINT64_FORMAT, gvsaver->priv->size);
 	gedit_debug_message (DEBUG_SAVER, "Calling replace_async");
-	
+
 	g_file_replace_async (gvsaver->priv->gfile, 
 			      NULL,
 			      FALSE,

Modified: trunk/gedit/gedit-tab.c
==============================================================================
--- trunk/gedit/gedit-tab.c	(original)
+++ trunk/gedit/gedit-tab.c	Mon Dec 29 10:58:20 2008
@@ -806,9 +806,9 @@
 {
 	if (tab->priv->message_area == NULL)
 		return;
-	
-	gedit_debug_message (DEBUG_TAB, "%Ld/%Ld", size, total_size);
-	
+
+	gedit_debug_message (DEBUG_TAB, "%" G_GUINT64_FORMAT "/%" G_GUINT64_FORMAT, size, total_size);
+
 	g_return_if_fail (GEDIT_IS_PROGRESS_MESSAGE_AREA (tab->priv->message_area));
 	
 	if (total_size == 0)
@@ -844,8 +844,8 @@
 	g_return_if_fail ((tab->priv->state == GEDIT_TAB_STATE_LOADING) ||
 		 	  (tab->priv->state == GEDIT_TAB_STATE_REVERTING));
 
-	gedit_debug_message (DEBUG_TAB, "%Ld/%Ld", size, total_size);
-	
+	gedit_debug_message (DEBUG_TAB, "%" G_GUINT64_FORMAT "/%" G_GUINT64_FORMAT, size, total_size);
+
 	if (tab->priv->timer == NULL)
 	{
 		g_return_if_fail (tab->priv->times_called == 0);
@@ -1088,8 +1088,9 @@
 
 	g_return_if_fail (tab->priv->state == GEDIT_TAB_STATE_SAVING);
 
-	gedit_debug_message (DEBUG_TAB, "%Ld/%Ld", size, total_size);
-	
+	gedit_debug_message (DEBUG_TAB, "%" G_GUINT64_FORMAT "/%" G_GUINT64_FORMAT, size, total_size);
+
+
 	if (tab->priv->timer == NULL)
 	{
 		g_return_if_fail (tab->priv->times_called == 0);