>From 383f018d2779b14527b4a7de8d84d2aa9ab11541 Mon Sep 17 00:00:00 2001
From: Kevin Daughtridge <kevin kdau com>
Date: Wed, 30 Dec 2009 00:15:03 -0800
Subject: [PATCH 04/04] Correct various compiler warnings.

---
 extensions/rename_series/dlg-rename-series.c |    2 +-
 gthumb/gedit-message-area.c                  |    6 +++-
 gthumb/gth-filter-editor-dialog.c            |    2 +-
 gthumb/gth-filter.c                          |    4 +-
 gthumb/gth-test-simple.c                     |    2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/extensions/rename_series/dlg-rename-series.c b/extensions/rename_series/dlg-rename-series.c
index 81e69b9..423c9c1 100644
--- a/extensions/rename_series/dlg-rename-series.c
+++ b/extensions/rename_series/dlg-rename-series.c
@@ -216,7 +216,7 @@ template_eval_cb (const GMatchInfo *info,
 	else if (strncmp (match, "#", 1) == 0) {
 		char *format;
 
-		format = g_strdup_printf ("%%0%dd", strlen (match));
+		format = g_strdup_printf ("%%0%" G_GSIZE_FORMAT "d", strlen (match));
 		r = g_strdup_printf (format, template_data->n);
 
 		g_free (format);
diff --git a/gthumb/gedit-message-area.c b/gthumb/gedit-message-area.c
index f30458d..592d98d 100644
--- a/gthumb/gedit-message-area.c
+++ b/gthumb/gedit-message-area.c
@@ -141,6 +141,7 @@ gedit_message_area_close (GeditMessageArea *message_area)
 				     GTK_RESPONSE_CANCEL);
 }
 
+/*
 static gboolean
 paint_message_area (GtkWidget      *widget,
 		    GdkEventExpose *event,
@@ -172,6 +173,7 @@ paint_message_area (GtkWidget      *widget,
 
 	return FALSE;
 }
+*/
 
 static void
 gedit_message_area_class_init (GeditMessageAreaClass *klass)
@@ -208,6 +210,7 @@ gedit_message_area_class_init (GeditMessageAreaClass *klass)
 	gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, "close", 0);
 }
 
+/*
 static void
 style_set (GtkWidget        *widget,
 	   GtkStyle         *prev_style,
@@ -219,7 +222,7 @@ style_set (GtkWidget        *widget,
 	if (message_area->priv->changing_style)
 		return;
 
-	/* This is a hack needed to use the tooltip background color */
+	// This is a hack needed to use the tooltip background color
 	window = gtk_window_new (GTK_WINDOW_POPUP);
 	gtk_widget_set_name (window, "gtk-tooltip");
 	gtk_widget_ensure_style (window);
@@ -233,6 +236,7 @@ style_set (GtkWidget        *widget,
 
 	gtk_widget_queue_draw (GTK_WIDGET (message_area));
 }
+*/
 
 static void
 gedit_message_area_init (GeditMessageArea *message_area)
diff --git a/gthumb/gth-filter-editor-dialog.c b/gthumb/gth-filter-editor-dialog.c
index 17298c8..cb19635 100644
--- a/gthumb/gth-filter-editor-dialog.c
+++ b/gthumb/gth-filter-editor-dialog.c
@@ -456,7 +456,7 @@ gth_filter_editor_dialog_set_filter (GthFilterEditorDialog *self,
 			}
 		}
 		else {
-			value = g_strdup_printf ("%lld", limit_value);
+			value = g_strdup_printf ("%" G_GOFFSET_FORMAT, limit_value);
 			gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("limit_size_entry")), value);
 			g_free (value);
 
diff --git a/gthumb/gth-filter.c b/gthumb/gth-filter.c
index 40a560e..ce6c236 100644
--- a/gthumb/gth-filter.c
+++ b/gthumb/gth-filter.c
@@ -88,7 +88,7 @@ gth_filter_real_create_element (DomDomizable *base,
 		DomElement *limit;
 		char       *value;
 
-		value = g_strdup_printf ("%lld", self->priv->limit);
+		value = g_strdup_printf ("%" G_GOFFSET_FORMAT, self->priv->limit);
 		limit = dom_document_create_element (doc, "limit",
 						     "value", value,
 						     "type", _g_enum_type_get_value (GTH_TYPE_LIMIT_TYPE, self->priv->limit_type)->value_nick,
@@ -263,7 +263,7 @@ create_control_for_files (GthFilter *filter)
 
 	filter->priv->limit_entry = gtk_entry_new ();
 	gtk_entry_set_width_chars (GTK_ENTRY (filter->priv->limit_entry), 6);
-	value = g_strdup_printf ("%lld", filter->priv->limit);
+	value = g_strdup_printf ("%" G_GOFFSET_FORMAT, filter->priv->limit);
 	gtk_entry_set_text (GTK_ENTRY (filter->priv->limit_entry), value);
 	g_free (value);
 	gtk_widget_show (filter->priv->limit_entry);
diff --git a/gthumb/gth-test-simple.c b/gthumb/gth-test-simple.c
index 8ebb937..1b023f1 100644
--- a/gthumb/gth-test-simple.c
+++ b/gthumb/gth-test-simple.c
@@ -603,7 +603,7 @@ gth_test_simple_real_create_element (DomDomizable *base,
 		if (self->priv->op != GTH_TEST_OP_NONE) {
 			if (self->priv->negative)
 				dom_element_set_attribute (element, "negative", self->priv->negative ? "true" : "false");
-			value = g_strdup_printf ("%lld", self->priv->data.i);
+			value = g_strdup_printf ("%" G_GINT64_FORMAT, self->priv->data.i);
 			dom_element_set_attribute (element, "value", value);
 			g_free (value);
 		}
-- 
1.6.5