Updating branch refs/heads/master
to a8ea57d578e95e8ed1b691516f284633620808af (commit)
from f20e98ab4a6ffff5f671118bfd4f1cb4fadbcbca (commit)
commit a8ea57d578e95e8ed1b691516f284633620808af
Author: Simon Steinbeiss <[email protected]>
Date: Mon Jul 23 17:33:30 2012 +0200
Fix build-errors with -z, defs in LDFLAGS (bug #7531)
src/misc/Makefile.am | 4 ++++
src/plugins/power-manager/Makefile.am | 6 +++++-
src/plugins/properties/Makefile.am | 4 ++++
src/plugins/tray/Makefile.am | 3 +++
src/plugins/tray/tray-provider.c | 15 ++++++++++-----
5 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am
index ca8dd59..dfe8d00 100644
--- a/src/misc/Makefile.am
+++ b/src/misc/Makefile.am
@@ -37,6 +37,10 @@ libparole_la_CFLAGS = \
$(TAGLIBC_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS)
+libparole_la_LIBADD = \
+ $(GTK_LIBS) \
+ $(TAGLIBC_LIBS)
+
paroleincludedir = \
$(includedir)/parole
diff --git a/src/plugins/power-manager/Makefile.am
b/src/plugins/power-manager/Makefile.am
index f37d31e..4ffc0e9 100644
--- a/src/plugins/power-manager/Makefile.am
+++ b/src/plugins/power-manager/Makefile.am
@@ -23,6 +23,10 @@ power_manager_plugin_la_CFLAGS = \
$(LIBXFCE4UTIL_CFLAGS) \
$(DBUS_GLIB_CFLAGS)
+power_manager_plugin_la_LIBADD = \
+ $(top_builddir)/src/misc/libparole.la \
+ $(LIBXFCE4UTIL_LIBS) \
+ $(DBUS_GLIB_LIBS)
power_manager_plugin_la_LDFLAGS = \
-avoid-version \
@@ -42,4 +46,4 @@ EXTRA_DIST = \
$(desktop_in_files)
DISTCLEANFILES = \
- $(desktop_DATA)
\ No newline at end of file
+ $(desktop_DATA)
diff --git a/src/plugins/properties/Makefile.am
b/src/plugins/properties/Makefile.am
index ba0e741..29d65b9 100644
--- a/src/plugins/properties/Makefile.am
+++ b/src/plugins/properties/Makefile.am
@@ -24,6 +24,10 @@ stream_properties_la_CFLAGS = \
$(LIBXFCE4UTIL_CFLAGS)
stream_properties_la_LIBADD = \
+ $(top_builddir)/src/misc/libparole.la \
+ $(GMODULE_LIBS) \
+ $(GTK_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
$(TAGLIBC_LIBS)
stream_properties_la_LDFLAGS = \
diff --git a/src/plugins/tray/Makefile.am b/src/plugins/tray/Makefile.am
index b0a5ea8..0fbee79 100644
--- a/src/plugins/tray/Makefile.am
+++ b/src/plugins/tray/Makefile.am
@@ -31,6 +31,9 @@ tray_icon_la_LDFLAGS = \
$(PLATFORM_LDFLAGS)
tray_icon_la_LIBADD = \
+ $(top_builddir)/src/misc/libparole.la \
+ $(GTK_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
$(LIBNOTIFY_LIBS)
#
diff --git a/src/plugins/tray/tray-provider.c b/src/plugins/tray/tray-provider.c
index e237b81..5efabd9 100644
--- a/src/plugins/tray/tray-provider.c
+++ b/src/plugins/tray/tray-provider.c
@@ -43,9 +43,6 @@ static void tray_provider_iface_init
(ParoleProviderPluginIface *iface);
static void tray_provider_finalize (GObject *object);
-extern GdkPixbuf *parole_icon_load (const gchar *icon_name, gint
size);
-
-
struct _TrayProviderClass
{
GObjectClass parent_class;
@@ -299,7 +296,11 @@ notify_playing (TrayProvider *tray, const ParoleStream
*stream)
notify_notification_attach_to_status_icon (tray->n, tray->tray);
#endif
#endif
- pix = parole_icon_load (has_video ? "video" : "audio-x-generic", 48);
+ pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+ has_video ? "video" : "audio-x-generic",
+ 48,
+ GTK_ICON_LOOKUP_USE_BUILTIN,
+ NULL);
if ( pix )
{
notify_notification_set_icon_from_pixbuf (tray->n, pix);
@@ -572,7 +573,11 @@ tray_provider_set_player (ParoleProviderPlugin *plugin,
ParoleProviderPlayer *pl
tray->notify = TRUE;
#endif
- pix = parole_icon_load ("parole", 48);
+ pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+ "parole",
+ 48,
+ GTK_ICON_LOOKUP_USE_BUILTIN,
+ NULL);
if ( pix )
{
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
