[SCM] VLC media player packaging branch, jaunty, updated. debian/0.9.8a-1ubuntu4

[siretart at users.alioth.debian.org]

The following commit has been merged in the jaunty branch:
commit c88b108b2c49ef404e7debaec13967bc9000e92f
Author: James Westby <james.westby at ubuntu.com>
Date:   Wed Feb 25 11:37:57 2009 +0000

    Imported Debian patch 0.9.8a-1ubuntu4

diff --git a/debian/changelog b/debian/changelog
index 5637e51..bb5947f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vlc (0.9.8a-1ubuntu4) jaunty; urgency=low
+
+  [ Cody Russell ]
+  * Check whether the server allows actions before trying to send them.
+    (LP: #328605)
+
+ -- James Westby <james.westby at ubuntu.com>  Wed, 25 Feb 2009 11:37:57 +0000
+
 vlc (0.9.8a-1ubuntu3) jaunty; urgency=low
 
   [ Andreas Wenning ]
diff --git a/debian/patches/series b/debian/patches/series
index 350f829..3db5726 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 300_manpage_syntax.diff
 301_DVD_media.diff
 401_detect_xinerama_fullscreen.diff
+vlc-notify.diff
diff --git a/debian/patches/vlc-notify.diff b/debian/patches/vlc-notify.diff
new file mode 100644
index 0000000..7ce6b44
--- /dev/null
+++ b/debian/patches/vlc-notify.diff
@@ -0,0 +1,59 @@
+=== modified file 'modules/misc/notify/notify.c'
+--- vlc-0.9.8a/modules/misc/notify/notify.c	2008-11-28 09:56:50 +0000
++++ vlc-0.9.8a/modules/misc/notify/notify.c	2009-02-25 12:38:32 +0000
+@@ -272,6 +272,35 @@
+     pl_Release( ((vlc_object_t*) p) );
+ }
+ 
++static gboolean
++can_support_actions ()
++{
++    static gboolean supports_actions = FALSE;
++    static gboolean have_checked = FALSE;
++
++    if( !have_checked ) {
++        GList *caps = NULL;
++        GList *c;
++
++        have_checked = TRUE;
++
++        caps = notify_get_server_caps ();
++        if( caps != NULL ) {
++            for( c = caps; c != NULL; c = c->next ) {
++                if( strcmp( (char*)c->data, "actions" ) == 0 ) {
++                    supports_actions = TRUE;
++                    break;
++                }
++            }
++        }
++
++	g_list_foreach( caps, (GFunc)g_free, NULL );
++	g_list_free( caps );
++    }
++
++    return supports_actions;
++}
++
+ static int Notify( vlc_object_t *p_this, const char *psz_temp, GdkPixbuf *pix,
+                    intf_thread_t *p_intf )
+ {
+@@ -296,11 +325,13 @@
+         gdk_pixbuf_unref( pix );
+     }
+ 
+-    /* Adds previous and next buttons in the notification */
+-    notify_notification_add_action( notification, "previous", _("Previous"), Prev,
+-                                    (gpointer*) p_intf, NULL );
+-    notify_notification_add_action( notification, "next", _("Next"), Next,
+-                                    (gpointer*) p_intf, NULL );
++    /* Adds previous and next buttons in the notification if actions are supported. */
++    if( can_support_actions() ) {
++      notify_notification_add_action( notification, "previous", _("Previous"), Prev,
++				      (gpointer*) p_intf, NULL );
++      notify_notification_add_action( notification, "next", _("Next"), Next,
++				      (gpointer*) p_intf, NULL );
++    }
+ 
+     notify_notification_show( notification, NULL);
+ 
+
diff --git a/patch b/patch
deleted file mode 100644
index 38bd531..0000000
--- a/patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u vlc-0.9.8a/debian/changelog vlc-0.9.8a/debian/changelog
---- vlc-0.9.8a/debian/changelog
-+++ vlc-0.9.8a/debian/changelog
-@@ -1,3 +1,9 @@
-+vlc (0.9.8a-1ubuntu2) jaunty; urgency=low
-+
-+  * no change rebuild to pick up new libx264, LP: #325720
-+
-+ -- Reinhard Tartler <siretart at tauware.de>  Sat, 07 Feb 2009 20:40:56 +0100
-+
- vlc (0.9.8a-1ubuntu1) jaunty; urgency=low
- 
-   * merge from debian. LP: #300328, #305100, #289263

-- 
VLC media player packaging