SF.net SVN: geany:[3926] trunk

[ntrel at users.sourceforge.net]

Revision: 3926
          http://geany.svn.sourceforge.net/geany/?rev=3926&view=rev
Author:   ntrel
Date:     2009-07-07 12:46:45 +0000 (Tue, 07 Jul 2009)

Log Message:
-----------
Fix using project name for document items that start with the
project base path but don't match it e.g. ".../geany-plugins"
instead of ".../geany" when project name is 'geany'.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-07-07 12:30:47 UTC (rev 3925)
+++ trunk/ChangeLog	2009-07-07 12:46:45 UTC (rev 3926)
@@ -7,6 +7,10 @@
    Add utils_strdupa() macro.
  * src/interface.c, geany.glade:
    Use stock Select All icon now we have >= GTK 2.8.
+ * src/treeviews.c:
+   Fix using project name for document items that start with the
+   project base path but don't match it e.g. ".../geany-plugins"
+   instead of ".../geany" when project name is 'geany'.
 
 
 2009-07-04  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/treeviews.c
===================================================================
--- trunk/src/treeviews.c	2009-07-07 12:30:47 UTC (rev 3925)
+++ trunk/src/treeviews.c	2009-07-07 12:46:45 UTC (rev 3926)
@@ -310,8 +310,10 @@
 	{
 		gsize len = strlen(project_base_path);
 		const gchar *rest;
-		/* check whether the dir name starts with the project base path */
-		if (strncmp(tmp_dirname, project_base_path, len) == 0)
+
+		/* check whether the dir name uses the project base path */
+		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;
 			dirname = g_strdup_printf("%s%s%s",


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