[Goodies-commits] r2379 - in xfce4-xmms-plugin/trunk: . panel-plugin

[Kemal Eroglu]

Author: ilgar
Date: 2007-01-16 15:46:32 +0000 (Tue, 16 Jan 2007)
New Revision: 2379

Modified:
   xfce4-xmms-plugin/trunk/ChangeLog
   xfce4-xmms-plugin/trunk/configure.in.in
   xfce4-xmms-plugin/trunk/panel-plugin/popupmenu.c
   xfce4-xmms-plugin/trunk/panel-plugin/xmms_plugin.c
Log:
Version 0.5.1, hopefully ready for XFCE 4.4.0

Modified: xfce4-xmms-plugin/trunk/ChangeLog
===================================================================
--- xfce4-xmms-plugin/trunk/ChangeLog	2007-01-16 14:31:46 UTC (rev 2378)
+++ xfce4-xmms-plugin/trunk/ChangeLog	2007-01-16 15:46:32 UTC (rev 2379)
@@ -1,3 +1,8 @@
+2007-01-16  Kemal Ilgar Eroglu <kieroglu at math.washington.edu
+	* Bump version to 0.5.1 (hopefully) final for XFCE 4.4.0
+	* Applied Martti Kuparinen's patch to the configure script.
+	* Applied Dan Kao's patches (song # fix and + Open/Add file dialogs.
+
 2006-09-23 gaso <ganchang_mrlbr at ybb.ne.jp>
 
 	* split panel-plugin/xmms_plugin.c into panel-plugin/xmms_plugin.c and

Modified: xfce4-xmms-plugin/trunk/configure.in.in
===================================================================
--- xfce4-xmms-plugin/trunk/configure.in.in	2007-01-16 14:31:46 UTC (rev 2378)
+++ xfce4-xmms-plugin/trunk/configure.in.in	2007-01-16 15:46:32 UTC (rev 2379)
@@ -64,7 +64,7 @@
 dnl check for player
 dnl AC_MSG_CHECKING([what player to link with])
 dnl AC_ARG_WITH([player], [  --with-player=xmms/beep Specify player to link with [default=xmms]])
-dnl if test x"$with_player" == x"beep"; then
+dnl if test x"$with_player" = x"beep"; then
 dnl   AC_MSG_RESULT([Beep media player])
 dnl   XDT_CHECK_PACKAGE([PLAYER], [beep], [0.9.6.0])
 dnl 
@@ -73,7 +73,7 @@
 dnl   AC_MSG_RESULT([XMMS media player])
 dnl 
 dnl   AC_CHECK_PROGS([XMMS_CONFIG], [xmms-config], [no])
-dnl   if test x"$XMMS_CONFIG" == x"no"; then
+dnl   if test x"$XMMS_CONFIG" = x"no"; then
 dnl     AC_MSG_ERROR([*** XMMS not found. Please install XMMS first. ***])
 dnl   fi
 dnl 

Modified: xfce4-xmms-plugin/trunk/panel-plugin/popupmenu.c
===================================================================
--- xfce4-xmms-plugin/trunk/panel-plugin/popupmenu.c	2007-01-16 14:31:46 UTC (rev 2378)
+++ xfce4-xmms-plugin/trunk/panel-plugin/popupmenu.c	2007-01-16 15:46:32 UTC (rev 2379)
@@ -102,13 +102,13 @@
 	gtk_widget_show(dialog);
 }
 
-/*
+
 static void show_open_file(GtkWidget *widget, gpointer data) {
 	plugin_data *pd = (plugin_data *) data;
 	pd->pctrl->player_eject(pd->xmms_session);
 }
-*/
 
+
 /**
  * open xmms preference window
  */
@@ -248,8 +248,12 @@
 	g_signal_connect(G_OBJECT(menu), "selection-done",
 			G_CALLBACK(destroy_popupmenu), NULL);
 
+	// open files button
+	add_image_item_from_stock(menu, _("_Open files"), GTK_STOCK_OPEN,
+			G_CALLBACK(show_open_file), pd);
+
 	// add files button
-	add_image_item_from_stock(menu, _("_Add files"), GTK_STOCK_OPEN,
+	add_image_item_from_stock(menu, _("_Add files"), GTK_STOCK_ADD,
 			G_CALLBACK(show_file_chooser), pd);
 
 	// jtf button (audacious 1.1)

Modified: xfce4-xmms-plugin/trunk/panel-plugin/xmms_plugin.c
===================================================================
--- xfce4-xmms-plugin/trunk/panel-plugin/xmms_plugin.c	2007-01-16 14:31:46 UTC (rev 2378)
+++ xfce4-xmms-plugin/trunk/panel-plugin/xmms_plugin.c	2007-01-16 15:46:32 UTC (rev 2379)
@@ -291,7 +291,7 @@
 		if (pd->simple_title)
 			tooltip = g_strdup_printf("%s", title);
 		else
-			tooltip = g_strdup_printf("%d: %s (%d:%02d)", pos, title, time/60, time%60);
+			tooltip = g_strdup_printf("%d: %s (%d:%02d)", pos+1, title, time/60, time%60);
 	}
 	else
 		tooltip = g_strdup_printf(TITLE_STRING);
@@ -336,7 +336,14 @@
 	}
 
 	/* update progress bar */
-	if (playing) play_time = pd->pctrl->player_get_output_time(pd->xmms_session) / 1000;
+       if (playing) {
+               play_time = pd->pctrl->player_get_output_time(pd->xmms_session) / 1000;
+               /* make sure title gets updated when new files are loaded */
+               if (!play_time) {
+                       pd->title_scroll_position = 0;
+                       set_song_title(pd);
+               }
+       }	
 	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar), (gdouble) play_time / time);
 
 	/* scroll song title */