# HG changeset patch
# User nenolod
# Date 1154670897 25200
# Node ID ded11c19cc0a47fe06332ce97af70089bd592730
# Parent  df4b1ed6b7176ae0e9b3527d93dfbdb875988ab7
[svn] - do things in a less hackish way

diff -r df4b1ed6b717 -r ded11c19cc0a ChangeLog
--- a/ChangeLog	Thu Aug 03 22:54:05 2006 -0700
+++ b/ChangeLog	Thu Aug 03 22:54:57 2006 -0700
@@ -1,3 +1,12 @@
+2006-08-04 05:54:05 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1892]
+  - use tuples (and build tuples if they aren't there :P)
+  
+
+  Changes:        Modified:
+  +12 -1          trunk/Plugins/General/notify/notify.c  
+
+
 2006-08-04 05:32:07 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1890]
   - add libnotify plugin
diff -r df4b1ed6b717 -r ded11c19cc0a Plugins/General/notify/notify.c
--- a/Plugins/General/notify/notify.c	Thu Aug 03 22:54:05 2006 -0700
+++ b/Plugins/General/notify/notify.c	Thu Aug 03 22:54:57 2006 -0700
@@ -58,15 +58,15 @@
 	if (pos != notify_playlist_pos)
 	{
 		gchar *tmpbuf;
+		TitleInput *tuple;
 
-		/* XXX: this is arguably wrong, but works -nenolod */
-		if (playlist_position->tuple == NULL)
-			playlist_get_tuple(pos);
+		tuple = playlist_get_tuple(pos);
 
 		tmpbuf = g_strdup_printf("<b>%s</b>\n<i>%s</i>\n%s",
-			playlist_position->tuple->performer,
-			playlist_position->tuple->album_name,
-			playlist_position->tuple->track_name);
+			tuple->performer,
+			tuple->album_name,
+			tuple->track_name);
+
 		do_notification("Audacious", tmpbuf, DATA_DIR "/pixmaps/audacious.png");
 		g_free(tmpbuf);
 	}