[gedit] Misc cleanups pointed out by clang static analyzer

[Paolo Borelli <pborelli src gnome org>]

commit 2997ceca2c56b1eeca0ecb6269dfce979c66d779
Author: Paolo Borelli <pborelli gnome org>
Date:   Mon Sep 7 21:27:47 2009 +0200

    Misc cleanups pointed out by clang static analyzer

 gedit/gedit-commands-search.c                   |    5 -----
 gedit/gedit-panel.c                             |    4 ----
 plugins/filebrowser/gedit-file-browser-plugin.c |    3 ---
 plugins/filebrowser/gedit-file-browser-store.c  |   21 +++++++--------------
 plugins/spell/gedit-spell-plugin.c              |    2 --
 plugins/time/gedit-time-plugin.c                |   11 +++++++----
 6 files changed, 14 insertions(+), 32 deletions(-)
---
diff --git a/gedit/gedit-commands-search.c b/gedit/gedit-commands-search.c
index c6c228b..5a8797a 100644
--- a/gedit/gedit-commands-search.c
+++ b/gedit/gedit-commands-search.c
@@ -333,7 +333,6 @@ do_replace (GeditSearchDialog *dialog,
 	gchar *unescaped_replace_text;
 	gchar *selected_text = NULL;
 	gboolean match_case;
-	gboolean search_backwards;
 
 	doc = gedit_window_get_active_document (window);
 	if (doc == NULL)
@@ -354,7 +353,6 @@ do_replace (GeditSearchDialog *dialog,
 			   NULL);
 
 	match_case = gedit_search_dialog_get_match_case (dialog);
-	search_backwards = gedit_search_dialog_get_backwards (dialog);
 
 	if ((selected_text == NULL) ||
 	    (match_case && (strcmp (selected_text, unescaped_search_text) != 0)) || 
@@ -609,15 +607,12 @@ do_find_again (GeditWindow *window,
 	       gboolean     backward)
 {
 	GeditView *active_view;
-	GtkTextBuffer *buffer;
 	gboolean wrap_around = TRUE;
 	gpointer data;
 	
 	active_view = gedit_window_get_active_view (window);
 	g_return_if_fail (active_view != NULL);
 
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (active_view));
-
 	data = g_object_get_data (G_OBJECT (window), GEDIT_SEARCH_DIALOG_KEY);
 	
 	if (data != NULL)
diff --git a/gedit/gedit-panel.c b/gedit/gedit-panel.c
index 1a05f10..c4f2a5e 100644
--- a/gedit/gedit-panel.c
+++ b/gedit/gedit-panel.c
@@ -680,7 +680,6 @@ build_tab_label (GeditPanel  *panel,
 
 	g_object_set_data (G_OBJECT (item), "label", label);
 	g_object_set_data (G_OBJECT (item), "hbox", hbox);
-	g_object_set_data (G_OBJECT (item), "label-ebox", label_ebox);
 
 	return hbox;
 }
@@ -790,7 +789,6 @@ gedit_panel_remove_item (GeditPanel *panel,
 {
 	GeditPanelItem *data;
 	gint page_num;
-	GtkWidget *ebox;
 	
 	g_return_val_if_fail (GEDIT_IS_PANEL (panel), FALSE);
 	g_return_val_if_fail (GTK_IS_WIDGET (item), FALSE);
@@ -812,8 +810,6 @@ gedit_panel_remove_item (GeditPanel *panel,
 		           PANEL_ITEM_KEY,
 		           NULL);
 
-	ebox = g_object_get_data (G_OBJECT (item), "label-ebox");
-	
 	/* ref the item to keep it alive during signal emission */
 	g_object_ref (G_OBJECT (item));
 
diff --git a/plugins/filebrowser/gedit-file-browser-plugin.c b/plugins/filebrowser/gedit-file-browser-plugin.c
index d05df25..ba37e20 100644
--- a/plugins/filebrowser/gedit-file-browser-plugin.c
+++ b/plugins/filebrowser/gedit-file-browser-plugin.c
@@ -1190,9 +1190,6 @@ on_confirm_no_trash_cb (GeditFileBrowserWidget * widget,
 	gchar *message;
 	gchar *secondary;
 	gboolean result;
-	GeditFileBrowserPluginData *data;
-
-	data = get_plugin_data (window);
 
 	message = _("Cannot move file to trash, do you\nwant to delete permanently?");
 
diff --git a/plugins/filebrowser/gedit-file-browser-store.c b/plugins/filebrowser/gedit-file-browser-store.c
index 0cbc78c..4a67c32 100644
--- a/plugins/filebrowser/gedit-file-browser-store.c
+++ b/plugins/filebrowser/gedit-file-browser-store.c
@@ -887,15 +887,14 @@ gedit_file_browser_store_iter_parent (GtkTreeModel * tree_model,
 	FileBrowserNode *node;
 	GeditFileBrowserStore *model;
 
-	g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (tree_model),
-			      FALSE);
+	g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (tree_model), FALSE);
 	g_return_val_if_fail (child != NULL, FALSE);
 	g_return_val_if_fail (child->user_data != NULL, FALSE);
 
 	node = (FileBrowserNode *) (child->user_data);
 	model = GEDIT_FILE_BROWSER_STORE (tree_model);
 
-	if (!node_in_tree (GEDIT_FILE_BROWSER_STORE (tree_model), node))
+	if (!node_in_tree (model, node))
 		return FALSE;
 
 	if (node->parent == NULL)
@@ -1590,7 +1589,6 @@ model_recomposite_icon_real (GeditFileBrowserStore * tree_model,
 			     FileBrowserNode * node,
 			     GFileInfo * info)
 {
-	GtkIconTheme *theme;
 	GdkPixbuf *icon;
 
 	g_return_if_fail (GEDIT_IS_FILE_BROWSER_STORE (tree_model));
@@ -1599,8 +1597,6 @@ model_recomposite_icon_real (GeditFileBrowserStore * tree_model,
 	if (node->file == NULL)
 		return;
 
-	theme = gtk_icon_theme_get_default ();
-	
 	if (info) {
 		GIcon *gicon = g_file_info_get_icon (info);
 		if (gicon != NULL)
@@ -1621,12 +1617,10 @@ model_recomposite_icon_real (GeditFileBrowserStore * tree_model,
 
 		if (icon == NULL) {
 			node->icon =
-			    gdk_pixbuf_new (gdk_pixbuf_get_colorspace
-					    (node->emblem),
-					    gdk_pixbuf_get_has_alpha
-					    (node->emblem),
-					    gdk_pixbuf_get_bits_per_sample
-					    (node->emblem), icon_size,
+			    gdk_pixbuf_new (gdk_pixbuf_get_colorspace (node->emblem),
+					    gdk_pixbuf_get_has_alpha (node->emblem),
+					    gdk_pixbuf_get_bits_per_sample (node->emblem),
+					    icon_size,
 					    icon_size);
 		} else {
 			node->icon = gdk_pixbuf_copy (icon);
@@ -1651,8 +1645,7 @@ model_recomposite_icon (GeditFileBrowserStore * tree_model,
 	g_return_if_fail (iter->user_data != NULL);
 
 	model_recomposite_icon_real (tree_model,
-				     (FileBrowserNode *) (iter->
-							  user_data),
+				     (FileBrowserNode *) (iter->user_data),
 				     NULL);
 }
 
diff --git a/plugins/spell/gedit-spell-plugin.c b/plugins/spell/gedit-spell-plugin.c
index 6ef0136..0d5fe15 100644
--- a/plugins/spell/gedit-spell-plugin.c
+++ b/plugins/spell/gedit-spell-plugin.c
@@ -732,7 +732,6 @@ spell_cb (GtkAction   *action,
 	gint start, end;
 	GtkTextIter sel_start, sel_end;
 	gchar *word;
-	gboolean sel = FALSE;
 	gchar *data_dir;
 
 	gedit_debug (DEBUG_PLUGINS);
@@ -771,7 +770,6 @@ spell_cb (GtkAction   *action,
 		start = gtk_text_iter_get_offset (&sel_start);
 		end = gtk_text_iter_get_offset (&sel_end);
 		set_check_range (doc, start, end);
-		sel = TRUE;
 	}
 	else
 	{
diff --git a/plugins/time/gedit-time-plugin.c b/plugins/time/gedit-time-plugin.c
index b219208..441e2b2 100644
--- a/plugins/time/gedit-time-plugin.c
+++ b/plugins/time/gedit-time-plugin.c
@@ -719,7 +719,6 @@ get_format_from_list (GtkWidget *listview)
 	GtkTreeModel *model;
 	GtkTreeSelection *selection;
 	GtkTreeIter iter;
-        gint selected_value;
 
 	gedit_debug (DEBUG_PLUGINS);
 
@@ -731,12 +730,16 @@ get_format_from_list (GtkWidget *listview)
 
 	if (gtk_tree_selection_get_selected (selection, NULL, &iter))
 	{
+	        gint selected_value;
+
 		gtk_tree_model_get (model, &iter, COLUMN_INDEX, &selected_value, -1);
-	}
 
-	gedit_debug_message (DEBUG_PLUGINS, "Sel value: %d", selected_value);
+		gedit_debug_message (DEBUG_PLUGINS, "Sel value: %d", selected_value);
+
+	        return selected_value;
+	}
 
-        return selected_value;
+	g_return_val_if_reached (0);
 }
 
 static TimeConfigureDialog *