Skip to content

Commit

Permalink
V0.4.1
Browse files Browse the repository at this point in the history
Compiled as a module as recommended in the documentation.
  • Loading branch information
matiasdelellis committed Mar 6, 2012
1 parent aa9cece commit 363124c
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 39 deletions.
12 changes: 0 additions & 12 deletions ChangeLog
Original file line number Original file line Diff line number Diff line change
@@ -1,12 +0,0 @@
YYYY-MM-DD John Doo <john@foo.org>

* === Released 0.0.1 ===
* configure.in.in, NEWS: Bump version.

YYYY-MM-DD John Doo <john@foo.org>

* panel-plugin/sample.c(sample_plugin_new): A short description
of the change.
* panel-plugin/sample-dialogs.c(sample_plugin_about): A short
description of the change.
* THANKS: Add missing translator credits.
15 changes: 15 additions & 0 deletions NEWS
Original file line number Original file line Diff line number Diff line change
@@ -1,3 +1,18 @@
V0.4.1
Now is compiled as a module as recommended in the documentation.
[PATCH] Use Xfce 4.8 locations for plugin and desktop file.
[PATCH 2/3] Update FSFE address.
[PATCH 3/3] Fix author name.
PATCHS thanks to Christoph Wickert.
Fix compile with libnotify <= 0.7
Fix transparency issue when no show the cover art.
Test some NULL string before use it.
Change plugin website to github.
Clean changelog. Update it whit make dist.
Update es.po and pot file.

NOTE: Lastfm scrobble now depend on libclastfm >= 0.5

V0.4.0 V0.4.0
You can show the cover art on the panel if it is informed by the player. You can show the cover art on the panel if it is informed by the player.
Open the image when double click on panel image. Open the image when double click on panel image.
Expand Down
26 changes: 16 additions & 10 deletions configure.ac.in
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dnl *** Version information ***
dnl *************************** dnl ***************************
m4_define([soundmenu_version_major], [0]) m4_define([soundmenu_version_major], [0])
m4_define([soundmenu_version_minor], [4]) m4_define([soundmenu_version_minor], [4])
m4_define([soundmenu_version_micro], [0]) m4_define([soundmenu_version_micro], [1])
m4_define([soundmenu_version], [soundmenu_version_major().soundmenu_version_minor().soundmenu_version_micro()]) m4_define([soundmenu_version], [soundmenu_version_major().soundmenu_version_minor().soundmenu_version_micro()])


dnl *************************** dnl ***************************
Expand Down Expand Up @@ -45,6 +45,12 @@ AC_PROG_INSTALL()
AC_PROG_INTLTOOL() AC_PROG_INTLTOOL()
AC_PROG_LIBTOOL() AC_PROG_LIBTOOL()


dnl **************************
dnl *** Initialize libtool ***
dnl **************************
LT_PREREQ([2.2.6])
LT_INIT([disable-static])

dnl ********************************** dnl **********************************
dnl *** Check for standard headers *** dnl *** Check for standard headers ***
dnl ********************************** dnl **********************************
Expand Down Expand Up @@ -76,19 +82,19 @@ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
dnl Check global keyboard shortcuts support dnl Check global keyboard shortcuts support
LIBKEYBINDER_FOUND="no" LIBKEYBINDER_FOUND="no"
XDT_CHECK_OPTIONAL_PACKAGE([LIBKEYBINDER], XDT_CHECK_OPTIONAL_PACKAGE([LIBKEYBINDER],
[keybinder], [0.2.0], [keybinder], [0.2.2],
[keybinder], [keybinder],
[keybinder library], [yes]) [keybinder library], [yes])
dnl Check libclastfm dnl Check libclastfm
LIBCLASTFM_FOUND="no" LIBCLASTFM_FOUND="no"
XDT_CHECK_OPTIONAL_PACKAGE([LIBCLASTFM], XDT_CHECK_OPTIONAL_PACKAGE([LIBCLASTFM],
[libclastfm], [0.4], [libclastfm], [0.5],
[libclastfm], [libclastfm],
[libclastfm library], [yes]) [libclastfm library], [yes])
dnl Check libglyr dnl Check libglyr
LIBGLYR_FOUND="no" LIBGLYR_FOUND="no"
XDT_CHECK_OPTIONAL_PACKAGE([LIBGLYR], XDT_CHECK_OPTIONAL_PACKAGE([LIBGLYR],
[libglyr], [0.8.5], [libglyr], [0.9.4],
[libglyr], [libglyr],
[libglyr library], [yes]) [libglyr library], [yes])


Expand Down Expand Up @@ -131,12 +137,12 @@ dnl ***************************
echo echo
echo "xfce4-soundmenu-plugin Build Configuration:" echo "xfce4-soundmenu-plugin Build Configuration:"
echo echo
echo " Prefix.....................................................: ${prefix}" echo " Plugin Dir: ${libdir}/xfce4/panel/plugins"
echo " Debug Support..............................................: $enable_debug" echo " Debug Support...............................................................: $enable_debug"
echo " Global keyboard shortcuts support..........................: $LIBKEYBINDER_FOUND" echo " Global keyboard shortcuts support...........................................: $LIBKEYBINDER_FOUND"
echo " Lastfm support (Need http://liblastfm.sourceforge.net 0.4).: $LIBCLASTFM_FOUND" echo " Lastfm support (Need http://liblastfm.sourceforge.net >=0.5)................: $LIBCLASTFM_FOUND"
echo " Use libglyr to search lyrics...............................: $LIBGLYR_FOUND" echo " Search lyrics and artist info( Need https://github.com/sahib/glyr >= 0.9.4).: $LIBGLYR_FOUND"
echo " Notification support.......................................: $LIBNOTIFY_FOUND" echo " Notification support........................................................: $LIBNOTIFY_FOUND"
echo echo




36 changes: 21 additions & 15 deletions panel-plugin/Makefile.am
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ INCLUDES = \
# #
# Soundmenu plugin # Soundmenu plugin
# #
plugin_PROGRAMS = \ plugin_LTLIBRARIES = \
xfce4-soundmenu-plugin libsoundmenu.la


plugindir = \ plugindir = \
$(libdir)/xfce4/panel/plugins $(libdir)/xfce4/panel/plugins


xfce4_soundmenu_plugin_SOURCES = \ libsoundmenu_la_SOURCES = \
soundmenu-plugin.c \ soundmenu-plugin.c \
soundmenu-plugin.h \ soundmenu-plugin.h \
soundmenu-mpris2.c \ soundmenu-mpris2.c \
Expand All @@ -27,42 +27,48 @@ xfce4_soundmenu_plugin_SOURCES = \
soundmenu-related.h soundmenu-related.h


if HAVE_LIBCLASTFM if HAVE_LIBCLASTFM
xfce4_soundmenu_plugin_SOURCES += \ libsoundmenu_la_SOURCES += \
soundmenu-lastfm.c \ soundmenu-lastfm.c \
soundmenu-lastfm.h soundmenu-lastfm.h
endif endif


xfce4_soundmenu_plugin_CFLAGS = \ libsoundmenu_la_CFLAGS = \
$(DBUS_GLIB_CFLAGS) \ $(DBUS_GLIB_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \ $(LIBXFCE4UI_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS) \ $(LIBXFCE4PANEL_CFLAGS) \
$(PLATFORM_CFLAGS) $(PLATFORM_CFLAGS)


xfce4_soundmenu_plugin_LDADD = \ libsoundmenu_la_LDFLAGS = \
-avoid-version \
-module \
-no-undefined \
-export-symbols-regex '^xfce_panel_module_(preinit|init|construct)'

libsoundmenu_la_LIBADD = \
$(DBUS_GLIB_LIBS) \ $(DBUS_GLIB_LIBS) \
$(LIBXFCE4UTIL_LIBS) \ $(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_LIBS) \ $(LIBXFCE4UI_LIBS) \
$(LIBXFCE4PANEL_LIBS) $(LIBXFCE4PANEL_LIBS)


if HAVE_LIBKEYBINDER if HAVE_LIBKEYBINDER
xfce4_soundmenu_plugin_CFLAGS += $(LIBKEYBINDER_CFLAGS) libsoundmenu_la_CFLAGS += $(LIBKEYBINDER_CFLAGS)
xfce4_soundmenu_plugin_LDADD += $(LIBKEYBINDER_LIBS) libsoundmenu_la_LIBADD += $(LIBKEYBINDER_LIBS)
endif endif


if HAVE_LIBCLASTFM if HAVE_LIBCLASTFM
xfce4_soundmenu_plugin_CFLAGS += $(LIBCLASTFM_CFLAGS) libsoundmenu_la_CFLAGS += $(LIBCLASTFM_CFLAGS)
xfce4_soundmenu_plugin_LDADD += $(LIBCLASTFM_LIBS) libsoundmenu_la_LIBADD += $(LIBCLASTFM_LIBS)
endif endif


if HAVE_LIBGLYR if HAVE_LIBGLYR
xfce4_soundmenu_plugin_CFLAGS += $(LIBGLYR_CFLAGS) libsoundmenu_la_CFLAGS += $(LIBGLYR_CFLAGS)
xfce4_soundmenu_plugin_LDADD += $(LIBGLYR_LIBS) libsoundmenu_la_LIBADD += $(LIBGLYR_LIBS)
endif endif


if HAVE_LIBNOTIFY if HAVE_LIBNOTIFY
xfce4_soundmenu_plugin_CFLAGS += $(LIBNOTIFY_CFLAGS) libsoundmenu_la_CFLAGS += $(LIBNOTIFY_CFLAGS)
xfce4_soundmenu_plugin_LDADD += $(LIBNOTIFY_LIBS) libsoundmenu_la_LIBADD += $(LIBNOTIFY_LIBS)
endif endif


# #
Expand Down
2 changes: 1 addition & 1 deletion panel-plugin/soundmenu-plugin.c
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ soundmenu_construct (XfcePanelPlugin *plugin);


/* register the plugin */ /* register the plugin */


XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (soundmenu_construct); XFCE_PANEL_PLUGIN_REGISTER (soundmenu_construct);


/* Open the image when double click.. */ /* Open the image when double click.. */


Expand Down
3 changes: 2 additions & 1 deletion panel-plugin/soundmenu.desktop.in.in
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ Encoding=UTF-8
_Name=Sound menu Plugin _Name=Sound menu Plugin
_Comment=Sound menu plugin for the Xfce panel _Comment=Sound menu plugin for the Xfce panel
Icon=xfce4-soundmenu-plugin Icon=xfce4-soundmenu-plugin
X-XFCE-Exec=@libdir@/xfce4/panel/plugins/xfce4-soundmenu-plugin X-XFCE-Module=soundmenu
X-XFCE-Internal=false
X-XFCE-Unique=true X-XFCE-Unique=true

0 comments on commit 363124c

Please sign in to comment.