[gedit] Fix the build with GCC 4.6

[cosimoc src gnome org]

commit 117c070c54bcff4222831daab93e344bf3cd0be4
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Feb 2 08:25:09 2011 -0500

    Fix the build with GCC 4.6

 gedit/gedit-dbus.c              |   20 ++++++++------------
 gedit/gedit-documents-panel.c   |    3 +--
 gedit/gedit-message-bus.c       |    2 --
 gedit/gedit-progress-info-bar.c |   19 -------------------
 gedit/gedit-tab.c               |    6 +-----
 gedit/gedit-window.c            |    3 +--
 6 files changed, 11 insertions(+), 42 deletions(-)
---
diff --git a/gedit/gedit-dbus.c b/gedit/gedit-dbus.c
index da8dfc7..1f5627a 100644
--- a/gedit/gedit-dbus.c
+++ b/gedit/gedit-dbus.c
@@ -771,7 +771,6 @@ static GeditDBusResult
 handle_service (GeditDBus *dbus)
 {
 	guint result;
-	GeditCommandLine *command_line;
 
 	if (activate_service (dbus, &result) == GEDIT_DBUS_RESULT_FAILED)
 	{
@@ -779,8 +778,6 @@ handle_service (GeditDBus *dbus)
 		return GEDIT_DBUS_RESULT_FAILED;
 	}
 
-	command_line = gedit_command_line_get_default ();
-
 	/* Finally, act as a slave. */
 	return handle_slave (dbus);
 }
@@ -1606,7 +1603,6 @@ name_lost_cb (GDBusConnection *connection,
 GeditDBusResult
 gedit_dbus_run (GeditDBus *dbus)
 {
-	guint id;
 	GeditCommandLine *command_line;
 
 	g_return_val_if_fail (GEDIT_IS_DBUS (dbus), GEDIT_DBUS_RESULT_PROCEED);
@@ -1631,14 +1627,14 @@ gedit_dbus_run (GeditDBus *dbus)
 		}
 	}
 
-	id = g_bus_own_name (G_BUS_TYPE_SESSION,
-	                     "org.gnome.gedit",
-	                     G_BUS_NAME_OWNER_FLAGS_NONE,
-	                     (GBusAcquiredCallback)bus_acquired_cb,
-	                     (GBusNameAcquiredCallback)name_acquired_cb,
-	                     (GBusNameLostCallback)name_lost_cb,
-	                     dbus,
-	                     NULL);
+	g_bus_own_name (G_BUS_TYPE_SESSION,
+	                "org.gnome.gedit",
+	                G_BUS_NAME_OWNER_FLAGS_NONE,
+	                (GBusAcquiredCallback)bus_acquired_cb,
+	                (GBusNameAcquiredCallback)name_acquired_cb,
+	                (GBusNameLostCallback)name_lost_cb,
+	                dbus,
+	                NULL);
 
 	dbus->priv->main_loop = g_main_loop_new (NULL, FALSE);
 	g_main_loop_run (dbus->priv->main_loop);
diff --git a/gedit/gedit-documents-panel.c b/gedit/gedit-documents-panel.c
index edb6a30..7609b83 100644
--- a/gedit/gedit-documents-panel.c
+++ b/gedit/gedit-documents-panel.c
@@ -740,7 +740,7 @@ menu_position (GtkMenu             *menu,
 {
 	GtkTreePath *path;
 	GdkRectangle rect;
-	gint wx, wy;
+	gint wy;
 	GtkRequisition requisition;
 	GtkWidget *w;
 	GtkAllocation allocation;
@@ -756,7 +756,6 @@ menu_position (GtkMenu             *menu,
 				     NULL,
 				     &rect);
 
-	wx = rect.x;
 	wy = rect.y;
 
 	gdk_window_get_origin (gtk_widget_get_window (w), x, y);
diff --git a/gedit/gedit-message-bus.c b/gedit/gedit-message-bus.c
index 9536018..6882255 100644
--- a/gedit/gedit-message-bus.c
+++ b/gedit/gedit-message-bus.c
@@ -637,7 +637,6 @@ gedit_message_bus_register (GeditMessageBus *bus,
 			    ...)
 {
 	gchar *identifier;
-	gpointer data;
 	va_list var_args;
 	GeditMessageType *message_type;
 
@@ -651,7 +650,6 @@ gedit_message_bus_register (GeditMessageBus *bus,
 	}
 
 	identifier = gedit_message_type_identifier (object_path, method);
-	data = g_hash_table_lookup (bus->priv->types, identifier);
 	
 	va_start (var_args, num_optional);
 	message_type = gedit_message_type_new_valist (object_path, 
diff --git a/gedit/gedit-progress-info-bar.c b/gedit/gedit-progress-info-bar.c
index c21347f..8fb65c5 100644
--- a/gedit/gedit-progress-info-bar.c
+++ b/gedit/gedit-progress-info-bar.c
@@ -91,31 +91,12 @@ gedit_progress_info_bar_set_property (GObject      *object,
 	}
 }
 
-static void
-gedit_progress_info_bar_get_property (GObject      *object,
-				      guint         prop_id,
-				      GValue       *value,
-				      GParamSpec   *pspec)
-{
-	GeditProgressInfoBar *bar;
-
-	bar = GEDIT_PROGRESS_INFO_BAR (object);
-
-	switch (prop_id)
-	{
-		default:
-			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-			break;
-	}
-}
-
 static void 
 gedit_progress_info_bar_class_init (GeditProgressInfoBarClass *klass)
 {
 	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
 	gobject_class->set_property = gedit_progress_info_bar_set_property;
-	gobject_class->get_property = gedit_progress_info_bar_get_property;
 
 	g_object_class_install_property (gobject_class,
 					 PROP_HAS_CANCEL_BUTTON,
diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c
index dc51748..b67bc67 100644
--- a/gedit/gedit-tab.c
+++ b/gedit/gedit-tab.c
@@ -978,15 +978,11 @@ document_loaded (GeditDocument *document,
 	if (error != NULL &&
 	    (error->domain != GEDIT_DOCUMENT_ERROR || error->code != GEDIT_DOCUMENT_ERROR_CONVERSION_FALLBACK))
 	{
-		const GeditEncoding *encoding;
-
 		if (tab->priv->state == GEDIT_TAB_STATE_LOADING)
 			gedit_tab_set_state (tab, GEDIT_TAB_STATE_LOADING_ERROR);
 		else
 			gedit_tab_set_state (tab, GEDIT_TAB_STATE_REVERTING_ERROR);
 
-		encoding = gedit_document_get_encoding (document);
-
 		if (error->domain == G_IO_ERROR &&
 		    error->code == G_IO_ERROR_CANCELLED)
 		{
@@ -2406,7 +2402,7 @@ _gedit_tab_save_as (GeditTab                     *tab,
 	                        encoding,
 	                        newline_type,
 	                        compression_type,
-	                        tab->priv->save_flags);
+	                        save_flags);
 }
 
 #define GEDIT_PAGE_SETUP_KEY "gedit-page-setup-key"
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index 2fccbf8..0e5cd33 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -3215,7 +3215,6 @@ fullscreen_controls_build (GeditWindow *window)
 {
 	GeditWindowPrivate *priv = window->priv;
 	GtkWidget *toolbar;
-	GtkWidget *toolbar_recent_menu;
 	GtkAction *action;
 
 	if (priv->fullscreen_controls != NULL)
@@ -3235,7 +3234,7 @@ fullscreen_controls_build (GeditWindow *window)
 					      "LeaveFullscreen");
 	g_object_set (action, "is-important", TRUE, NULL);
 	
-	toolbar_recent_menu = setup_toolbar_open_button (window, toolbar);
+	setup_toolbar_open_button (window, toolbar);
 
 	gtk_container_foreach (GTK_CONTAINER (toolbar),
 			       (GtkCallback)set_non_homogeneus,