reverted:
--- vlc-0.9.8a/patch
+++ vlc-0.9.8a.orig/patch
@@ -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@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
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,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@ubuntu.com>  Wed, 25 Feb 2009 11:37:57 +0000
+
 vlc (0.9.8a-1ubuntu3) jaunty; urgency=low
 
   [ Andreas Wenning ]
diff -u vlc-0.9.8a/debian/patches/series vlc-0.9.8a/debian/patches/series
--- vlc-0.9.8a/debian/patches/series
+++ vlc-0.9.8a/debian/patches/series
@@ -8,0 +9 @@
+vlc-notify.diff
only in patch2:
unchanged:
--- vlc-0.9.8a.orig/debian/patches/vlc-notify.diff
+++ vlc-0.9.8a/debian/patches/vlc-notify.diff
@@ -0,0 +1,48 @@
+=== modified file 'modules/misc/notify/notify.c'
+Index: vlc-0.9.8a/modules/misc/notify/notify.c
+===================================================================
+--- vlc-0.9.8a.orig/modules/misc/notify/notify.c	2009-02-25 11:35:21.000000000 +0000
++++ vlc-0.9.8a/modules/misc/notify/notify.c	2009-02-25 11:36:16.000000000 +0000
+@@ -271,6 +271,9 @@
+ {
+     NotifyNotification * notification;
+     GError *p_error = NULL;
++    gboolean supports_actions = FALSE;
++    GList *caps = NULL;
++    GList *c;
+ 
+     /* Close previous notification if still active */
+     if( p_intf->p_sys->notification )
+@@ -290,11 +293,27 @@
+         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 );
++    /* Determine if the notification server can handle actions */
++    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 );
++    }
++
++    /* Adds previous and next buttons in the notification if actions are supported. */
++    if( supports_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);
+