SF.net SVN: geany-plugins:[1194] trunk/geany-plugins/treebrowser

[dimitrov-adrian at users.sourceforge.net]

Revision: 1194
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1194&view=rev
Author:   dimitrov-adrian
Date:     2010-03-21 08:26:45 +0000 (Sun, 21 Mar 2010)

Log Message:
-----------
Fix  few compile warnings with glib and unused vars, and directory opening view.

Modified Paths:
--------------
    trunk/geany-plugins/treebrowser/ChangeLog
    trunk/geany-plugins/treebrowser/src/treebrowser.c

Modified: trunk/geany-plugins/treebrowser/ChangeLog
===================================================================
--- trunk/geany-plugins/treebrowser/ChangeLog	2010-03-20 18:21:35 UTC (rev 1193)
+++ trunk/geany-plugins/treebrowser/ChangeLog	2010-03-21 08:26:45 UTC (rev 1194)
@@ -1,7 +1,12 @@
 Development release ChangeLog
 -----------------------------
 
+21-03-2010 Adrian Dimitrov 		<dimitrov.adrian at gmail.com>
+	* src/treebrowser.c
+		fix few compile warnings with glib and unused vars
+		now directory is open when it click filling for first time
 
+
 20-03-2010 	Adrian Dimitrov 	<dimitrov.adrian at gmail.com>
 
 	* src/treebrowser.c

Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c
===================================================================
--- trunk/geany-plugins/treebrowser/src/treebrowser.c	2010-03-20 18:21:35 UTC (rev 1193)
+++ trunk/geany-plugins/treebrowser/src/treebrowser.c	2010-03-21 08:26:45 UTC (rev 1194)
@@ -4,6 +4,8 @@
  *      Copyright 2010 Adrian Dimitrov <dimitrov.adrian at gmail.com>
  */
 
+#include <glib/gstdio.h>
+
 #include "geanyplugin.h"
 #include "Scintilla.h"
 
@@ -144,12 +146,9 @@
 treebrowser_browse(gchar *directory, gpointer parent, gint deep_limit)
 {
 	GtkTreeIter 	iter, *last_dir_iter = NULL;
-	gchar 			*path, *path_new, *display_name;
 	gboolean 		is_dir, expanded;
+	gchar 			*utf8_name;
 	GDir 			*dir;
-
-	const gchar 	*name, *basename;
-	gchar 			*utf8_dir, *utf8_name;
 	GSList 			*list, *node;
 
 	if (deep_limit < 1)
@@ -159,8 +158,11 @@
 
 	directory = g_strconcat(directory, G_DIR_SEPARATOR_S, NULL);
 
-	if (parent && gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), parent)))
+	if ((parent && gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), parent)))
+		|| !gtk_tree_model_iter_has_child(GTK_TREE_MODEL(treestore), parent))
+	{
 		expanded = TRUE;
+	}
 	else
 		expanded = FALSE;
 
@@ -193,7 +195,8 @@
 										TREEBROWSER_COLUMN_NAME, 	fname,
 										TREEBROWSER_COLUMN_URI, 	uri,
 										-1);
-					treebrowser_browse(uri, &iter, deep_limit);
+					if (deep_limit > 0)
+						treebrowser_browse(uri, &iter, deep_limit);
 				}
 				else
 				{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.