sound-juicer r2059 - in trunk: . src

[rburton svn gnome org]

Author: rburton
Date: Thu Feb 21 13:51:13 2008
New Revision: 2059
URL: http://svn.gnome.org/viewvc/sound-juicer?rev=2059&view=rev

Log:
2008-02-21  Ross Burton  <ross burtonini com>

	* src/sj-main.c:
	When editing the album artist, if there is a sortable artist name
	set then unset it (#397416).


Modified:
   trunk/ChangeLog
   trunk/src/sj-main.c

Modified: trunk/src/sj-main.c
==============================================================================
--- trunk/src/sj-main.c	(original)
+++ trunk/src/sj-main.c	Thu Feb 21 13:51:13 2008
@@ -1403,6 +1403,12 @@
 
   g_return_if_fail (current_album != NULL);
   
+  /* Unset the sortable artist field, as we can't change it automatically */
+  if (current_album->artist_sortname) {
+    g_free (current_album->artist_sortname);
+    current_album->artist_sortname = NULL;
+  }
+
   if (current_album->artist) {
     former_album_artist = current_album->artist;
   }
@@ -1419,10 +1425,16 @@
     /* Change track artist if it matched album artist before the change */
     if ((strcasecmp (current_track_artist, former_album_artist) == 0) || (strcasecmp (current_track_artist, current_album->artist) == 0)) {
       gtk_tree_model_get (GTK_TREE_MODEL (track_store), &iter, COLUMN_DETAILS, &track, -1);
+      
       g_free (track->artist);
       track->artist = g_strdup (current_album->artist);
+      
+      if (track->artist_sortname) {
+        g_free (track->artist_sortname);
+        track->artist_sortname = NULL;
+      }
+      
       gtk_list_store_set (track_store, &iter, COLUMN_ARTIST, track->artist, -1);
-      gtk_tree_model_get (GTK_TREE_MODEL (track_store), &iter, COLUMN_ARTIST, &current_track_artist, -1);
     }
   } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (track_store), &iter));