SF.net SVN: geany:[3259] trunk

[ntrel at users.sourceforge.net]

Revision: 3259
          http://geany.svn.sourceforge.net/geany/?rev=3259&view=rev
Author:   ntrel
Date:     2008-11-20 17:01:02 +0000 (Thu, 20 Nov 2008)

Log Message:
-----------
Fix reloading sometimes changing the symbol list sort order.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-11-20 16:52:46 UTC (rev 3258)
+++ trunk/ChangeLog	2008-11-20 17:01:02 UTC (rev 3259)
@@ -2,6 +2,8 @@
 
  * src/documentprivate.h, src/symbols.c:
    Use radio buttons for symbol list popup menu sort items.
+ * src/symbols.c:
+   Fix reloading sometimes changing the symbol list sort order.
 
 
 2008-11-19  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c	2008-11-20 16:52:46 UTC (rev 3258)
+++ trunk/src/symbols.c	2008-11-20 17:01:02 UTC (rev 3259)
@@ -1147,7 +1147,6 @@
 gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode)
 {
 	GList *tags;
-	static gint prev_sort_mode = SYMBOLS_SORT_BY_NAME;
 
 	g_return_val_if_fail(doc != NULL, FALSE);
 
@@ -1171,9 +1170,7 @@
 	hide_empty_rows(doc->priv->tag_store);
 
 	if (sort_mode == SYMBOLS_SORT_USE_PREVIOUS)
-		sort_mode = prev_sort_mode;
-	else
-		prev_sort_mode = sort_mode;
+		sort_mode = doc->priv->symbol_list_sort_mode;
 
 	sort_tree(doc->priv->tag_store, sort_mode == SYMBOLS_SORT_BY_NAME);
 	doc->priv->symbol_list_sort_mode = sort_mode;


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