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

[Mike Massonnet]

Author: mmassonnet
Date: 2009-07-20 18:18:07 +0000 (Mon, 20 Jul 2009)
New Revision: 7749

Modified:
   xfmpc/trunk/ChangeLog
   xfmpc/trunk/IDEAS
   xfmpc/trunk/src/main-window.vala
Log:
Small fixes with Xfmpc.Statusbar

Modified: xfmpc/trunk/ChangeLog
===================================================================
--- xfmpc/trunk/ChangeLog	2009-07-19 20:57:42 UTC (rev 7748)
+++ xfmpc/trunk/ChangeLog	2009-07-20 18:18:07 UTC (rev 7749)
@@ -1,3 +1,11 @@
+2009-07-20	Mike Massonnet <mmassonnet at xfce.org>
+
+Small fixes with Xfmpc.Statusbar
+
+Drop casting need by changing Gtk.Widget against Xfmpc.Statusbar, it is easier
+to handle objects in Vala source code this way.
+Add a check "if statusbar != null" before setting the text property.
+
 2009-07-16	Vincent Legout <vincent at legout.info>
 
 Update the title of the interface when the playlist has changed

Modified: xfmpc/trunk/IDEAS
===================================================================
--- xfmpc/trunk/IDEAS	2009-07-19 20:57:42 UTC (rev 7748)
+++ xfmpc/trunk/IDEAS	2009-07-20 18:18:07 UTC (rev 7749)
@@ -1,7 +1,3 @@
-Next release
-
-  - Rewrite in Vala
-
 Unpredictable future
 
   - Reorder a song in the playlist (with DnD)

Modified: xfmpc/trunk/src/main-window.vala
===================================================================
--- xfmpc/trunk/src/main-window.vala	2009-07-19 20:57:42 UTC (rev 7748)
+++ xfmpc/trunk/src/main-window.vala	2009-07-20 18:18:07 UTC (rev 7749)
@@ -31,8 +31,8 @@
 
 		private Gtk.VBox vbox;
 		private Gtk.ActionGroup action_group;
-		private Gtk.Widget statusbar;
 		private Gtk.UIManager ui_manager;
+		private Xfmpc.Statusbar statusbar;
 
 		private const Gtk.ToggleActionEntry[] toggle_action_entries = {
 			{ "view-statusbar", null, "", null, null, action_statusbar, false }
@@ -129,7 +129,8 @@
 			} else {
 				this.interface.clean ();
 				this.mpdclient.reload ();
-				((Xfmpc.Statusbar) this.statusbar).text = "";
+				if (this.statusbar != null)
+					this.statusbar.text = "";
 				this.mpdclient.connect ();
 				if (this.mpdclient.is_connected ())
 					this.interface.update_title ();
@@ -237,7 +238,7 @@
 			else
 				text.append_printf (_("%d songs, %d minutes"), length, (seconds / 60) % 60);
 
-			((Xfmpc.Statusbar) this.statusbar).text = text.str;
+			this.statusbar.text = text.str;
 		}
 
 		private void cb_playlist_changed () {