gedit r6752 - branches/message_system/plugins/filebrowser

[jessevdk svn gnome org]

Author: jessevdk
Date: Mon Dec 29 16:06:46 2008
New Revision: 6752
URL: http://svn.gnome.org/viewvc/gedit?rev=6752&view=rev

Log:
Fixed bug in expand state on finalization. Fixed correct filter return value

Modified:
   branches/message_system/plugins/filebrowser/gedit-file-browser-messages.c
   branches/message_system/plugins/filebrowser/gedit-file-browser-view.c

Modified: branches/message_system/plugins/filebrowser/gedit-file-browser-messages.c
==============================================================================
--- branches/message_system/plugins/filebrowser/gedit-file-browser-messages.c	(original)
+++ branches/message_system/plugins/filebrowser/gedit-file-browser-messages.c	Mon Dec 29 16:06:46 2008
@@ -338,7 +338,7 @@
 	gedit_message_bus_send_message_sync (wdata->bus, data->message);
 	gedit_message_get (data->message, "filter", &filter, NULL);
 	
-	return filter;
+	return !filter;
 }
 
 static void

Modified: branches/message_system/plugins/filebrowser/gedit-file-browser-view.c
==============================================================================
--- branches/message_system/plugins/filebrowser/gedit-file-browser-view.c	(original)
+++ branches/message_system/plugins/filebrowser/gedit-file-browser-view.c	Mon Dec 29 16:06:46 2008
@@ -125,7 +125,10 @@
 		gtk_tree_path_free (obj->priv->hover_path);
 
 	if (obj->priv->expand_state)
+	{
 		g_hash_table_destroy (obj->priv->expand_state);
+		obj->priv->expand_state = NULL;
+	}
 
 	gdk_cursor_unref (obj->priv->busy_cursor);
 
@@ -143,7 +146,11 @@
 		return;
 
 	file = g_file_new_for_uri (uri);
-	g_hash_table_insert (view->priv->expand_state, file, file);
+	
+	if (view->priv->expand_state)
+		g_hash_table_insert (view->priv->expand_state, file, file);
+	else
+		g_object_unref (file);
 }
 
 static void
@@ -156,7 +163,10 @@
 		return;
 
 	file = g_file_new_for_uri (uri);
-	g_hash_table_remove (view->priv->expand_state, file);
+	
+	if (view->priv->expand_state)
+		g_hash_table_remove (view->priv->expand_state, file);
+
 	g_object_unref (file);
 }