SF.net SVN: geany:[3174] branches/symbol-tree

[ntrel at users.sourceforge.net]

Revision: 3174
          http://geany.svn.sourceforge.net/geany/?rev=3174&view=rev
Author:   ntrel
Date:     2008-11-05 12:58:53 +0000 (Wed, 05 Nov 2008)

Log Message:
-----------
Fix sorting tags with missing parents by line if the names and
scopes are identical.

Modified Paths:
--------------
    branches/symbol-tree/ChangeLog
    branches/symbol-tree/src/symbols.c

Modified: branches/symbol-tree/ChangeLog
===================================================================
--- branches/symbol-tree/ChangeLog	2008-11-05 12:50:29 UTC (rev 3173)
+++ branches/symbol-tree/ChangeLog	2008-11-05 12:58:53 UTC (rev 3174)
@@ -2,6 +2,9 @@
 
  * src/symbols.c:
    Replace macro with static function.
+ * src/symbols.c:
+   Fix sorting tags with missing parents by line if the names and
+   scopes are identical.
 
 
 2008-11-04  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: branches/symbol-tree/src/symbols.c
===================================================================
--- branches/symbol-tree/src/symbols.c	2008-11-05 12:50:29 UTC (rev 3173)
+++ branches/symbol-tree/src/symbols.c	2008-11-05 12:58:53 UTC (rev 3174)
@@ -1105,8 +1105,11 @@
 			cmp = strcmp(astr, bstr);
 
 			/* sort duplicate 'ScopeName::OverloadedTagName' items by line as well */
-			if ((!sort_by_name || cmp == 0) && tag_a && tag_b)
-				cmp = compare_symbol_lines(tag_a, tag_b);
+			if (tag_a && tag_b)
+				if (!sort_by_name ||
+					(utils_str_equal(tag_a->name, tag_b->name) &&
+						utils_str_equal(tag_a->atts.entry.scope, tag_b->atts.entry.scope)))
+					cmp = compare_symbol_lines(tag_a, tag_b);
 		}
 		g_free(astr);
 		g_free(bstr);


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