[Xfce4-commits] <parole:master> Make it compiles, the ugly way...

[Ali Abdallah]

Updating branch refs/heads/master
         to b1004d01881ff5a18d2bdf99552b4b077dba3c35 (commit)
       from b18960ed7e176a3fce536b86c2fe0451a0a6906c (commit)

commit b1004d01881ff5a18d2bdf99552b4b077dba3c35
Author: Ali Abdallah <aliov at xfce.org>
Date:   Fri Apr 15 15:12:40 2011 +0200

    Make it compiles, the ugly way...

 gst/parole-gst.c             |    5 +++++
 plugins/tray/tray-provider.c |   24 ++++++++++++++++++++----
 src/parole-about.c           |    4 ++++
 src/parole-medialist.c       |    4 ++++
 src/parole-player.c          |    3 +++
 src/parole-plugins-manager.c |    4 ++++
 src/parole-session.c         |    4 ++++
 7 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/gst/parole-gst.c b/gst/parole-gst.c
index 6676675..ae49623 100644
--- a/gst/parole-gst.c
+++ b/gst/parole-gst.c
@@ -33,6 +33,9 @@
 
 #include <gst/video/video.h>
 
+#ifdef XFCE_DISABLE_DEPRECATED
+#undef XFCE_DISABLE_DEPRECATED
+#endif
 #include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/libxfcegui4.h>
 
@@ -47,6 +50,8 @@
 #include "gst-enum-types.h"
 #include "gstmarshal.h"
 
+
+
 #define HIDE_WINDOW_CURSOR_TIMEOUT 3.0f
 
 #define PAROLE_GST_GET_PRIVATE(o) \
diff --git a/plugins/tray/tray-provider.c b/plugins/tray/tray-provider.c
index aa0b197..88a3f94 100644
--- a/plugins/tray/tray-provider.c
+++ b/plugins/tray/tray-provider.c
@@ -31,8 +31,9 @@
 #include <libnotify/notify.h>
 #endif
 
-#include <libxfcegui4/libxfcegui4.h>
+
 #include <libxfce4util/libxfce4util.h>
+#include <libxfcegui4/libxfcegui4.h>
 
 #include "tray-provider.h"
 
@@ -42,6 +43,9 @@ 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;
@@ -260,13 +264,25 @@ notify_playing (TrayProvider *tray, const ParoleStream *stream)
     }
     
     message = g_strdup_printf ("%s %s %s %s", _("<b>Playing:</b>"), title, _("<b>Duration:</b>"), timestring);
-    
+
+#ifdef NOTIFY_CHECK_VERSION
+#if NOTIFY_CHECK_VERSION (0, 7, 0)    
+    tray->n = notify_notification_new (title, message, NULL);
+#else
+    tray->n = notify_notification_new (title, message, NULL, NULL);
+#endif
+#else
     tray->n = notify_notification_new (title, message, NULL, NULL);
+#endif
     g_free (title);
     g_free (message);
     
+#ifdef NOTIFY_CHECK_VERSION
+#if !NOTIFY_CHECK_VERSION (0, 7, 0)
     notify_notification_attach_to_status_icon (tray->n, tray->tray);
-    pix = xfce_themed_icon_load (has_video ? "video" : "audio-x-generic", 48);
+#endif
+#endif
+    pix = parole_icon_load (has_video ? "video" : "audio-x-generic", 48);
     if ( pix )
     {
 	notify_notification_set_icon_from_pixbuf (tray->n, pix);
@@ -573,7 +589,7 @@ tray_provider_set_player (ParoleProviderPlugin *plugin, ParoleProviderPlayer *pl
     tray->notify = TRUE;
 #endif
     
-    pix = xfce_themed_icon_load ("parole", 48);
+    pix = parole_icon_load ("parole", 48);
     
     if ( pix )
     {
diff --git a/src/parole-about.c b/src/parole-about.c
index 96abcf0..ca6c0b9 100644
--- a/src/parole-about.c
+++ b/src/parole-about.c
@@ -26,6 +26,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+
+#ifdef XFCE_DISABLE_DEPRECATED
+#undef XFCE_DISABLE_DEPRECATED
+#endif
 #include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/libxfcegui4.h>
 
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 2426e35..9ff5304 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -32,6 +32,10 @@
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 
+
+#ifdef XFCE_DISABLE_DEPRECATED
+#undef XFCE_DISABLE_DEPRECATED
+#endif
 #include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/libxfcegui4.h>
 
diff --git a/src/parole-player.c b/src/parole-player.c
index 9478557..6a057d3 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -34,6 +34,9 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
+#ifdef XFCE_DISABLE_DEPRECATED
+#undef XFCE_DISABLE_DEPRECATED
+#endif
 #include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/libxfcegui4.h>
 
diff --git a/src/parole-plugins-manager.c b/src/parole-plugins-manager.c
index 9c9a638..1fd16e5 100644
--- a/src/parole-plugins-manager.c
+++ b/src/parole-plugins-manager.c
@@ -28,6 +28,10 @@
 
 #include <glib.h>
 
+
+#ifdef XFCE_DISABLE_DEPRECATED
+#undef XFCE_DISABLE_DEPRECATED
+#endif
 #include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/libxfcegui4.h>
 
diff --git a/src/parole-session.c b/src/parole-session.c
index 3c973ee..5421a35 100644
--- a/src/parole-session.c
+++ b/src/parole-session.c
@@ -26,6 +26,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+
+#ifdef XFCE_DISABLE_DEPRECATED
+#undef XFCE_DISABLE_DEPRECATED
+#endif
 #include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/libxfcegui4.h>