Revision: 1644
          http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1644&view=rev
Author:   jcsjcs
Date:     2007-07-13 20:21:32 -0700 (Fri, 13 Jul 2007)

Log Message:
-----------
        * src/display_tracks.c (tm_set_search_column,
          tm_search_equal_func): add newly added fields (bugfix).

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

Modified: gtkpod/trunk/ChangeLog_detailed
===================================================================
--- gtkpod/trunk/ChangeLog_detailed     2007-07-13 23:28:45 UTC (rev 1643)
+++ gtkpod/trunk/ChangeLog_detailed     2007-07-14 03:21:32 UTC (rev 1644)
@@ -1,10 +1,15 @@
+2007-07-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+       * src/display_tracks.c (tm_set_search_column,
+          tm_search_equal_func): add newly added fields (bugfix).
+
 2007-07-13 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-  * src/display_coverart.c
-    src/display_coverart.h
-    src/fetchcover.c
-    Added parameter to coverart_get_track_thumb so that the default
-    cover image can be provided with a default size if required.
+       * src/display_coverart.c
+         src/display_coverart.h
+         src/fetchcover.c
+         Added parameter to coverart_get_track_thumb so that the default
+         cover image can be provided with a default size if required.
 
 2007-07-13 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
@@ -29,20 +34,20 @@
 
 2007-07-04 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-  * src/details.c: tartwork_changed flag defined when a new
-    artwork file is selected from the filesystem.
+       * src/details.c: tartwork_changed flag defined when a new
+          artwork file is selected from the filesystem.
     
-  * src/fetchcover.c: tartwork_changed flag added for all
-    occurrences of artwork being changed.
+       * src/fetchcover.c: tartwork_changed flag added for all
+         occurrences of artwork being changed.
     
-  * src/display_coverart.c: reworking of the code to fix the
-    sizes of the covers according to the ipod thumbnail size.
-    When the pane is expanded, the coverart display's spacing is
-    widened rather than the individual covers being stretched.
-    Instead of the highlights, reflections and covers images
-    being redrawn as black when null, the containing items are
-    hidden. They are redisplayed when a new cover image is
-       required.
+        * src/display_coverart.c: reworking of the code to fix the
+         sizes of the covers according to the ipod thumbnail size.
+         When the pane is expanded, the coverart display's spacing is
+         widened rather than the individual covers being stretched.
+         Instead of the highlights, reflections and covers images
+         being redrawn as black when null, the containing items are
+         hidden. They are redisplayed when a new cover image is
+         required.
 
 2007-07-04  Todd Zullinger <tmzullinger at users.sourceforge.net>
 

Modified: gtkpod/trunk/src/display_tracks.c
===================================================================
--- gtkpod/trunk/src/display_tracks.c   2007-07-13 23:28:45 UTC (rev 1643)
+++ gtkpod/trunk/src/display_tracks.c   2007-07-14 03:21:32 UTC (rev 1644)
@@ -1610,7 +1610,7 @@
   Track *track1;
   gboolean cmp = 0;
   gtk_tree_model_get (model, iter, READOUT_COL, &track1, -1);
-  switch (column)
+  switch ((TM_item)column)
   {
   case TM_COLUMN_TITLE:
   case TM_COLUMN_ALBUM:
@@ -1633,10 +1633,17 @@
   case TM_COLUMN_TV_SHOW:
   case TM_COLUMN_TV_EPISODE:
   case TM_COLUMN_TV_NETWORK:
-    cmp = (compare_string_start_case_insensitive (
-         track_get_item (track1, TM_to_T (column)),
-         key) != 0);
-    break;
+  case TM_COLUMN_ALBUMARTIST:
+  case TM_COLUMN_SORT_ARTIST:
+  case TM_COLUMN_SORT_TITLE:
+  case TM_COLUMN_SORT_ALBUM:
+  case TM_COLUMN_SORT_ALBUMARTIST:
+  case TM_COLUMN_SORT_COMPOSER:
+  case TM_COLUMN_SORT_TVSHOW:
+      cmp = (compare_string_start_case_insensitive (
+                track_get_item (track1, TM_to_T (column)),
+                key) != 0);
+      break;
   case TM_COLUMN_TRACK_NR:
   case TM_COLUMN_IPOD_ID:
   case TM_COLUMN_TRANSFERRED:
@@ -1658,7 +1665,6 @@
   case TM_COLUMN_SEASON_NR:
   case TM_COLUMN_EPISODE_NR:
   case TM_NUM_COLUMNS:
-      g_warning ("Programming error: tm_search_equal_func: no sort method for 
column %d\n", column);
       break;
   }
   return cmp;
@@ -1758,7 +1764,7 @@
 }
 
 
-static void tm_set_search_column (gint newcol)
+static void tm_set_search_column (TM_item newcol)
 {
 /*     printf ("track_treeview: %p, col: %d\n", track_treeview, newcol); */
     g_return_if_fail (track_treeview);
@@ -1788,6 +1794,13 @@
     case TM_COLUMN_TV_SHOW:
     case TM_COLUMN_TV_EPISODE:
     case TM_COLUMN_TV_NETWORK:
+    case TM_COLUMN_ALBUMARTIST:
+    case TM_COLUMN_SORT_ARTIST:
+    case TM_COLUMN_SORT_TITLE:
+    case TM_COLUMN_SORT_ALBUM:
+    case TM_COLUMN_SORT_ALBUMARTIST:
+    case TM_COLUMN_SORT_COMPOSER:
+    case TM_COLUMN_SORT_TVSHOW:
        gtk_tree_view_set_enable_search (GTK_TREE_VIEW (track_treeview), TRUE);
        break;
     case TM_COLUMN_TRACK_NR:


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

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to