Updating branch refs/heads/master
to 98989b4997be4d0b073f3f530b3614f16cd9e884 (commit)
from d4181947b8546da03eef6beca390f54199eae538 (commit)
commit 98989b4997be4d0b073f3f530b3614f16cd9e884
Author: Kemal Ilgar Eroglu <[email protected]>
Date: Tue May 24 00:29:27 2011 +0300
Fix 4.8 compile and audacious symbol lookup error.
ChangeLog | 3 +++
configure.in.in | 2 +-
panel-plugin/playercontrol_plugin.c | 8 ++++----
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index eaf7c9c..c97fdc4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-05-24 KEmal Ilgar Eroglu <[email protected]>
+ * Fix 4.8 compilation
+ * Fix the audacious symbol lookup error
2010-02-05 Tomas Rimkus <[email protected]>
New features:
* mpc.c: fix mpd options mess by using gtk_table
diff --git a/configure.in.in b/configure.in.in
index 69c2e02..f545ea4 100755
--- a/configure.in.in
+++ b/configure.in.in
@@ -87,7 +87,7 @@ AC_ARG_ENABLE([audacious],
AM_CONDITIONAL(BUILD_AUDACIOUS, test x$want_audacious = xyes -o
x$want_audacious = xlegacy)
if test x$want_audacious = xyes; then
- PKG_CHECK_MODULES([AUDACIOUS], [audacious >= 1.4.0 dbus-glib-1 glib-2.0
gobject-2.0])
+ PKG_CHECK_MODULES([AUDACIOUS], [audacious >= 1.4.0 audclient dbus-glib-1
glib-2.0 gobject-2.0])
#CFLAGS="$CFLAGS $Audacious_CFLAGS"
#LIBS="$LIBS $Audacious_LIBS"
#save_CPPFLAGS="$CPPFLAGS"
diff --git a/panel-plugin/playercontrol_plugin.c
b/panel-plugin/playercontrol_plugin.c
index 02ee9c6..574892c 100644
--- a/panel-plugin/playercontrol_plugin.c
+++ b/panel-plugin/playercontrol_plugin.c
@@ -46,7 +46,7 @@
#include "dialogs.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);
/***********************************/
@@ -1360,7 +1360,7 @@ static void show_player_submenu (GtkWidget *item,
GdkEventVisibility *event, gpo
/************************/
/* initial plugin setup */
/************************/
-gboolean xmms_plugin_control_new(XfcePanelPlugin *plugin) {
+static void xmms_plugin_control_new(XfcePanelPlugin *plugin) {
plugin_data *pd;
gint vl, vr, i, label_width, time_width = 0;
gboolean has_player;
@@ -1530,7 +1530,7 @@ bottom:
pd->pctrl =
player_control_get_instance(PLAYER_NONE);
if (!pd->pctrl) {
xfce_err (_("Couldn't load any modules,
exiting..."));
- return FALSE;
+ return;
}
/* We opened it, can we init the player?*/
} else if(!pd->pctrl->player_init(pd)) {
@@ -1575,5 +1575,5 @@ necessary services are running and the settings are
correct."));
pd->timeout = g_timeout_add(500, pbar_label_update, pd);
pd->scroll_timeout = g_timeout_add(1000 / pd->scroll_speed,
scroll_title,
pd);
- return(TRUE);
+ return;
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
