[Goodies-commits] r4109 - xfce4-mpc-plugin/trunk/panel-plugin

[Landry Breuil]

Author: landry
Date: 2008-03-24 16:09:36 +0000 (Mon, 24 Mar 2008)
New Revision: 4109

Modified:
   xfce4-mpc-plugin/trunk/panel-plugin/xfce4-mpc-plugin.c
Log:
Fix tooltip:
- use filename when title is null
- split in two lines : status and current playing song


Modified: xfce4-mpc-plugin/trunk/panel-plugin/xfce4-mpc-plugin.c
===================================================================
--- xfce4-mpc-plugin/trunk/panel-plugin/xfce4-mpc-plugin.c	2008-03-24 16:02:06 UTC (rev 4108)
+++ xfce4-mpc-plugin/trunk/panel-plugin/xfce4-mpc-plugin.c	2008-03-24 16:09:36 UTC (rev 4109)
@@ -341,10 +341,12 @@
          break;
    }
    song = mpd_playlist_get_current_song(mpc->mo);
-   if (song && song->id != -1)
-      g_sprintf(str,"%s - [%s - %s] -/- (#%s) %s", str, song->artist, song->album, song->track, song->title);
+   if (song && song->id != -1 && song->title)
+      g_sprintf(str,"%s\n%s - %s -/- (#%s) %s", str, song->artist, song->album, song->track, song->title);
    else if (!song)
-      g_sprintf(str,"%s - Failed to get song info ?", str);
+      g_sprintf(str,"%s\nFailed to get song info ?", str);
+   else if (!song->title)
+      g_sprintf(str,"%s\n%s", str, song->file);
 
    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mpc->random), mpd_player_get_random(mpc->mo));
    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mpc->repeat), mpd_player_get_repeat(mpc->mo));