SF.net SVN: geany: [2074] trunk

[eht16 at users.sourceforge.net]

Revision: 2074
          http://geany.svn.sourceforge.net/geany/?rev=2074&view=rev
Author:   eht16
Date:     2007-11-29 09:56:36 -0800 (Thu, 29 Nov 2007)

Log Message:
-----------
Fix display of double slash in path entry.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/plugins/filebrowser.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-11-29 17:52:24 UTC (rev 2073)
+++ trunk/ChangeLog	2007-11-29 17:56:36 UTC (rev 2074)
@@ -3,6 +3,7 @@
  * geany.glade, doc/geany.html, geany.txt, src/editor.c,
    src/interface.c: Improve usage of "Unfold all children" option and
                     add some basic documentation for folding support.
+ * plugins/filebrowser.c: Fix display of double slash in path entry.
 
 
 2007-11-27  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/plugins/filebrowser.c
===================================================================
--- trunk/plugins/filebrowser.c	2007-11-29 17:52:24 UTC (rev 2073)
+++ trunk/plugins/filebrowser.c	2007-11-29 17:56:36 UTC (rev 2074)
@@ -246,14 +246,16 @@
 
 	for (item = list; item != NULL; item = g_list_next(item))
 	{
-		gchar *name, *fname;
+		gchar *name, *fname, *dir_sep = G_DIR_SEPARATOR_S;
 
 		treepath = (GtkTreePath*) item->data;
 		gtk_tree_model_get_iter(model, &iter, treepath);
 		gtk_tree_model_get(model, &iter, FILEVIEW_COLUMN_NAME, &name, -1);
 
 		setptr(name, utils->get_locale_from_utf8(name));
-		fname = g_strconcat(current_dir, G_DIR_SEPARATOR_S, name, NULL);
+		if (utils->str_equal(current_dir, G_DIR_SEPARATOR_S))
+			dir_sep = "";
+		fname = g_strconcat(current_dir, dir_sep, name, NULL);
 		g_free(name);
 
 		if (dir_found)


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