[Goodies-commits] r6899 - in xfmpc/trunk: . src

[Mike Massonnet]

Author: mmassonnet
Date: 2009-03-14 12:02:52 +0000 (Sat, 14 Mar 2009)
New Revision: 6899

Modified:
   xfmpc/trunk/ChangeLog
   xfmpc/trunk/src/interface.c
Log:
Better fix for previous commit

Modified: xfmpc/trunk/ChangeLog
===================================================================
--- xfmpc/trunk/ChangeLog	2009-03-14 09:20:14 UTC (rev 6898)
+++ xfmpc/trunk/ChangeLog	2009-03-14 12:02:52 UTC (rev 6899)
@@ -1,5 +1,11 @@
 2009-03-14	Mike Massonnet <mmassonnet at xfce.org>
 
+Better fix for previous commit
+	* src/mpdclient.c(xfmpc_interface_init):
+	  - Better fix than the previous commit
+
+2009-03-14	Mike Massonnet <mmassonnet at xfce.org>
+
 Title not refreshed at first run
 	* src/mpdclient.c(xfmpc_interface_init):
 	  - Set refresh_title to TRUE (bug #4975)

Modified: xfmpc/trunk/src/interface.c
===================================================================
--- xfmpc/trunk/src/interface.c	2009-03-14 09:20:14 UTC (rev 6898)
+++ xfmpc/trunk/src/interface.c	2009-03-14 12:02:52 UTC (rev 6899)
@@ -111,7 +111,6 @@
   gtk_container_set_border_width (GTK_CONTAINER (interface), BORDER);
   interface->preferences = xfmpc_preferences_get ();
   interface->mpdclient = xfmpc_mpdclient_get ();
-  priv->refresh_title = TRUE; /* bug #4975 */
 
   /* === Interface widgets === */
   GtkWidget *image = gtk_image_new_from_stock (GTK_STOCK_MEDIA_PREVIOUS, GTK_ICON_SIZE_BUTTON);
@@ -381,6 +380,13 @@
   if (G_UNLIKELY (xfmpc_mpdclient_connect (interface->mpdclient) == FALSE))
     return TRUE;
 
+  /* Refresh title/subtitle (bug #4975) */
+  interface->priv->refresh_title = TRUE;
+  if (xfmpc_mpdclient_is_playing (interface->mpdclient))
+    cb_song_changed (interface);
+  else
+    cb_stopped (interface);
+
   /* Return FALSE to kill the reconnection timeout and start a refresh timeout */
   g_timeout_add (1000, (GSourceFunc)xfmpc_interface_refresh, interface);
   return FALSE;