Revision: 1815
          http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1815&view=rev
Author:   jcsjcs
Date:     2007-12-12 07:36:40 -0800 (Wed, 12 Dec 2007)

Log Message:
-----------
        * src/display_tracks.c (tm_create_treeview)
          src/display.c (display_create):
          moved initialisation of track view sorting to after the
          entire display is set up to avoid assertion errors.

Modified Paths:
--------------
    gtkpod/trunk/ChangeLog_detailed
    gtkpod/trunk/src/display.c
    gtkpod/trunk/src/display_tracks.c

Modified: gtkpod/trunk/ChangeLog_detailed
===================================================================
--- gtkpod/trunk/ChangeLog_detailed     2007-12-11 12:53:22 UTC (rev 1814)
+++ gtkpod/trunk/ChangeLog_detailed     2007-12-12 15:36:40 UTC (rev 1815)
@@ -1,3 +1,10 @@
+2007-12-12 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+       * src/display_tracks.c (tm_create_treeview)
+         src/display.c (display_create):
+         moved initialisation of track view sorting to after the
+         entire display is set up to avoid assertion errors.
+
 2007-12-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
        * src/mp3file.c(get_mp3_info): fix integer overlow in

Modified: gtkpod/trunk/src/display.c
===================================================================
--- gtkpod/trunk/src/display.c  2007-12-11 12:53:22 UTC (rev 1814)
+++ gtkpod/trunk/src/display.c  2007-12-12 15:36:40 UTC (rev 1815)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-04-23 22:24:05 jcs>
+/* Time-stamp: <2007-12-13 00:34:53 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -76,8 +76,13 @@
 
     tm_create_treeview ();
     st_create_tabs ();
+    pm_create_treeview ();
+
+    /* initialize sorting */
+    tm_sort (prefs_get_int("tm_sortcol"), prefs_get_int("tm_sort"));
+
     st_set_default_sizes ();
-    pm_create_treeview ();
+
     /* Hide/Show the toolbar */
     display_show_hide_toolbar ();
     /* Hide/Show tooltips */

Modified: gtkpod/trunk/src/display_tracks.c
===================================================================
--- gtkpod/trunk/src/display_tracks.c   2007-12-11 12:53:22 UTC (rev 1814)
+++ gtkpod/trunk/src/display_tracks.c   2007-12-12 15:36:40 UTC (rev 1815)
@@ -2345,8 +2345,6 @@
                    G_CALLBACK (tm_sort_column_changed),
                    (gpointer)0);
 
-  /* initialize sorting */
-  tm_sort (prefs_get_int("tm_sortcol"), prefs_get_int("tm_sort"));
   /* set correct column for typeahead */
   if (prefs_get_int_value (TM_PREFS_SEARCH_COLUMN, &col))
   {


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

-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to