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

[Mike Massonnet]

Author: mmassonnet
Date: 2009-03-26 10:50:33 +0000 (Thu, 26 Mar 2009)
New Revision: 6998

Modified:
   xfmpc/trunk/ChangeLog
   xfmpc/trunk/src/main-window.c
Log:
Fiddle with the statusbar

Modified: xfmpc/trunk/ChangeLog
===================================================================
--- xfmpc/trunk/ChangeLog	2009-03-25 23:25:32 UTC (rev 6997)
+++ xfmpc/trunk/ChangeLog	2009-03-26 10:50:33 UTC (rev 6998)
@@ -1,3 +1,11 @@
+2009-03-26	Mike Massonnet <mmassonnet at xfce.org>
+
+Fiddle with the statusbar
+	* src/main-window.c(action_statusbar):
+	  - No space around the statusbar
+	* src/main-window.c(xfmpc_main_window_update_statusbar):
+	  - Verify if there is an existing connection
+
 2009-03-25	Mike Massonnet <mmassonnet at xfce.org>
 
 Polish the application name and the song info

Modified: xfmpc/trunk/src/main-window.c
===================================================================
--- xfmpc/trunk/src/main-window.c	2009-03-25 23:25:32 UTC (rev 6997)
+++ xfmpc/trunk/src/main-window.c	2009-03-26 10:50:33 UTC (rev 6998)
@@ -372,7 +372,7 @@
     {
       priv->statusbar = xfmpc_statusbar_new ();
       gtk_widget_show (priv->statusbar);
-      gtk_box_pack_start (GTK_BOX (priv->vbox), priv->statusbar, FALSE, FALSE, 2);
+      gtk_box_pack_start (GTK_BOX (priv->vbox), priv->statusbar, FALSE, FALSE, 0);
     }
 }
 
@@ -386,6 +386,9 @@
   if (G_UNLIKELY (priv->statusbar == NULL))
     return;
 
+  if (!xfmpc_mpdclient_is_connected (window->mpdclient))
+    return;
+
   length = xfmpc_mpdclient_playlist_get_length (window->mpdclient);
   seconds = xfmpc_mpdclient_playlist_get_total_time (window->mpdclient);
 
@@ -401,11 +404,6 @@
 static void
 cb_playlist_changed (XfmpcMainWindow *window)
 {
-  XfmpcMainWindowPrivate *priv = XFMPC_MAIN_WINDOW (window)->priv;
-
-  if (priv->statusbar == NULL)
-    return;
-
   xfmpc_main_window_update_statusbar (window);
 }