SF.net SVN: geany:[3999] trunk

[ntrel at users.sourceforge.net]

Revision: 3999
          http://geany.svn.sourceforge.net/geany/?rev=3999&view=rev
Author:   ntrel
Date:     2009-07-20 15:46:35 +0000 (Mon, 20 Jul 2009)

Log Message:
-----------
Fix showing project name for documents list files with no
subdirectory (oops).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/treeviews.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-07-20 15:37:02 UTC (rev 3998)
+++ trunk/ChangeLog	2009-07-20 15:46:35 UTC (rev 3999)
@@ -13,6 +13,9 @@
  * src/utils.c, src/utils.h, src/document.c:
    Remove relative/untidy path elements when opening documents (closes
    #2823998).
+ * src/treeviews.c:
+   Fix showing project name for documents list files with no
+   subdirectory (oops).
 
 
 2009-07-19  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/treeviews.c
===================================================================
--- trunk/src/treeviews.c	2009-07-20 15:37:02 UTC (rev 3998)
+++ trunk/src/treeviews.c	2009-07-20 15:46:35 UTC (rev 3999)
@@ -325,8 +325,9 @@
 		gsize len = strlen(project_base_path);
 		const gchar *rest;
 
-		/* check whether the dir name uses the project base path */
-		setptr(project_base_path, g_strconcat(project_base_path, G_DIR_SEPARATOR_S, NULL));
+		/* check whether the dir name matches or uses the project base path */
+		if (!utils_str_equal(project_base_path, tmp_dirname))
+			setptr(project_base_path, g_strconcat(project_base_path, G_DIR_SEPARATOR_S, NULL));
 		if (g_str_has_prefix(tmp_dirname, project_base_path))
 		{
 			rest = tmp_dirname + len;


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