[Xfce4-commits] <xfce4-xmms-plugin:master> XFCE 4.8 compatibility fixes

[Kemal Ilgar Eroglu]

Updating branch refs/heads/master
         to 642450744ba6fa2f04045378781fa552fc12df46 (commit)
       from 8146d7edf4ccc67dea9a1dae505c39ca205657cb (commit)

commit 642450744ba6fa2f04045378781fa552fc12df46
Author: Kemal Ilgar Eroglu <ilgar_eroglu at yahoo.com>
Date:   Mon Jan 31 22:46:36 2011 +0200

    XFCE 4.8 compatibility fixes

 ChangeLog                  |    4 ++++
 configure.in.in            |    2 +-
 panel-plugin/xmms_plugin.c |    9 +++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7c856d1..7ebd9ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 
+2011-01-31 Kemal Ilgar Eroglu <ilgar_eroglu at yahoo.com>
+	* Version 0.5.3
+	* Xfce 4.8 compatibility fixes
+
 2008-11-20 Kemal Ilgar Eroglu <ilgar_eroglu at yahoo.com>
 	* Version 0.5.2
 	* Fix crash with invalid UTF-8 song titles (when using simple title format)
diff --git a/configure.in.in b/configure.in.in
index 150bdde..be29f1f 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -8,7 +8,7 @@ dnl 2005 Kemal Ilgar Eroglu <kieroglu at math.washington.edu>
 dnl version info
 m4_define([xfce4_xmms_version_major], [0])
 m4_define([xfce4_xmms_version_minor], [5])
-m4_define([xfce4_xmms_version_micro], [2])
+m4_define([xfce4_xmms_version_micro], [3])
 m4_define([xfce4_xmms_version_build], [@REVISION@])
 m4_define([xfce4_xmms_version_tag], [svn])
 m4_define([xfce4_xmms_version], [xfce4_xmms_version_major().xfce4_xmms_version_minor().xfce4_xmms_version_micro()ifelse(xfce4_xmms_version_tag(), [svn], [xfce4_xmms_version_tag()-xfce4_xmms_version_build()], [xfce4_xmms_version_tag()])])
diff --git a/panel-plugin/xmms_plugin.c b/panel-plugin/xmms_plugin.c
index 2e30c79..0815677 100644
--- a/panel-plugin/xmms_plugin.c
+++ b/panel-plugin/xmms_plugin.c
@@ -47,7 +47,7 @@
 #include "preferences.h"
 #include "playerctrl.h"
 
-gboolean xmms_plugin_control_new(XfcePanelPlugin *plugin);
+static void xmms_plugin_control_new(XfcePanelPlugin *plugin);
 XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(xmms_plugin_control_new);
 
 /******************/
@@ -513,7 +513,8 @@ static void new_button_with_img(GtkWidget *box, gchar *filename, gpointer cb, gp
 /******************************/
 /* creates the plugin widgets */
 /******************************/
-gboolean xmms_plugin_control_new(XfcePanelPlugin *plugin) {
+/* Change type to static void, else doesn't work in Xfce 4.8 */
+static void xmms_plugin_control_new(XfcePanelPlugin *plugin) {
 	GtkWidget *button, *box, *boxV, *boxMain, *pbar, *vol_pbar, *viewport, *eventbox, *label, *menu_btn,*image;
 	plugin_data *pd;
 	gchar *title = TITLE_STRING" +++ "TITLE_STRING" +++ ";
@@ -564,7 +565,7 @@ gboolean xmms_plugin_control_new(XfcePanelPlugin *plugin) {
 		pango_attribute_destroy(pd->labelattr);
 		g_free(pd);
 		gtk_widget_destroy(GTK_WIDGET(plugin));
-		return FALSE;
+		/*return FALSE;*/
 	}
 
 	xfce_panel_plugin_set_expand(plugin,FALSE);
@@ -690,5 +691,5 @@ gboolean xmms_plugin_control_new(XfcePanelPlugin *plugin) {
 
 	pd->timeout                  = g_timeout_add(1000 / pd->scroll_speed, 						pbar_label_update, pd);
 
-	return(TRUE);
+	/*return(TRUE);*/
 }