r14553 - gnucash/branches/2.0 - Correctly set column sort orders from gconf. Fixes #348248.

[Andreas Köhler]

Author: andi5
Date: 2006-07-24 07:06:55 -0400 (Mon, 24 Jul 2006)
New Revision: 14553
Trac: http://svn.gnucash.org/trac/changeset/14553

Modified:
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/src/gnome-utils/gnc-tree-view.c
Log:
Correctly set column sort orders from gconf. Fixes #348248.

Merge r14552.


Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog	2006-07-23 11:43:12 UTC (rev 14552)
+++ gnucash/branches/2.0/ChangeLog	2006-07-24 11:06:55 UTC (rev 14553)
@@ -1,3 +1,8 @@
+2006-07-24  Andreas Köhler  <andi5.py at gmx.net>
+
+	* src/gnome-utils/gnc-tree-view.c: Correctly set column sort
+	  orders from gconf. Fixes #348248.
+
 2006-07-21  Christian Stimming <stimming at tuhh.de>
 
 	* accounts/de_DE/Makefile.am: Removed acctchrt_skr03.gnucash-xea

Modified: gnucash/branches/2.0/src/gnome-utils/gnc-tree-view.c
===================================================================
--- gnucash/branches/2.0/src/gnome-utils/gnc-tree-view.c	2006-07-23 11:43:12 UTC (rev 14552)
+++ gnucash/branches/2.0/src/gnome-utils/gnc-tree-view.c	2006-07-24 11:06:55 UTC (rev 14553)
@@ -903,7 +903,7 @@
     return;
   order = gnc_enum_from_nick(GTK_TYPE_SORT_TYPE, name, GTK_SORT_ASCENDING);
   if (!gtk_tree_sortable_get_sort_column_id(GTK_TREE_SORTABLE(s_model),
-					    &current, &order))
+					    &current, NULL))
       current = GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID;
   g_signal_handler_block(s_model, priv->sort_column_changed_cb_id);
   gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(s_model),