Merge branch 'master' of git@git.videolan.org:vlc

[vlc] / modules / misc / notify / notify.c

diff --git a/modules/misc/notify/notify.c b/modules/misc/notify/notify.c
index 5dfcbe94cfab47f48b1725393b4ab621266d73cf..e4473fbbfd690c5a5c9026a5b9c58ac9c1afb024 100644 (file)
--- a/modules/misc/notify/notify.c
+++ b/modules/misc/notify/notify.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * notify.c : libnotify notification plugin
  *****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Christophe Mutricy <xtophe -at- videolan -dot- org>
@@ -24,6 +24,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
@@ -66,7 +70,7 @@ vlc_module_begin();
     set_description( _("LibNotify Notification Plugin") );
 
     add_integer( "notify-timeout", 4000,NULL,
-                TIMEOUT_TEXT, TIMEOUT_LONGTEXT, VLC_TRUE );
+                TIMEOUT_TEXT, TIMEOUT_LONGTEXT, true );
 
     set_capability( "interface", 0 );
     set_callbacks( Open, Close );
@@ -80,7 +84,7 @@ static int Open( vlc_object_t *p_this )
     intf_thread_t   *p_intf = (intf_thread_t *)p_this;
     playlist_t      *p_playlist;
     intf_sys_t      *p_sys  = malloc( sizeof( intf_sys_t ) );
-    
+
     if( !p_sys )
     {
         msg_Err( p_intf, "Out of memory" );
@@ -118,6 +122,9 @@ static void Close( vlc_object_t *p_this )
     var_DelCallback( p_playlist, "playlist-current", ItemChange, p_this );
     pl_Release( p_this );
 
+    if( p_intf->p_sys->notification )
+        g_object_unref( p_intf->p_sys->notification );
+
     vlc_mutex_destroy( &p_sys->lock );
     free( p_sys );
     notify_uninit();
@@ -129,6 +136,7 @@ static void Close( vlc_object_t *p_this )
 static int ItemChange( vlc_object_t *p_this, const char *psz_var,
                        vlc_value_t oldval, vlc_value_t newval, void *param )
 {
+    VLC_UNUSED(psz_var); VLC_UNUSED(oldval); VLC_UNUSED(newval);
     char                psz_tmp[MAX_LENGTH];
     char                psz_notify[MAX_LENGTH];
     char                *psz_title      = NULL;
@@ -193,7 +201,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
                   psz_title, psz_artist );
     else
         snprintf( psz_tmp, MAX_LENGTH, "<b>%s</b>", psz_title );
- 
+
     free( psz_title );
     free( psz_artist );
     free( psz_album );
@@ -211,9 +219,15 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
         free( psz_arturl );
     }
     else /* else we show state-of-the art logo */
-        pix = gdk_pixbuf_new_from_file( DATA_PATH "/vlc48x48.png", &p_error );
+    {
+        const char *data_path = config_GetDataDir ();
+        char buf[strlen (data_path) + sizeof ("/vlc48x48.png")];
+
+        snprintf (buf, sizeof (buf), "%s/vlc48x48.png", data_path);
+        pix = gdk_pixbuf_new_from_file( buf, &p_error );
+    }
 
-    /* we need to replace '&' with '&amp;' because '&' is a keyword of 
+    /* we need to replace '&' with '&amp;' because '&' is a keyword of
      * notification-daemon parser */
     int i_notify, i_len, i;
     i_len = strlen( psz_tmp );
@@ -244,6 +258,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
 
 static void Next( NotifyNotification *notification, gchar *psz, gpointer p )
 { /* libnotify callback, called when the "Next" button is pressed */
+    VLC_UNUSED(psz);
     notify_notification_close (notification, NULL);
     playlist_t *p_playlist = pl_Yield( ((vlc_object_t*) p) );
     playlist_Next( p_playlist );
@@ -252,6 +267,7 @@ static void Next( NotifyNotification *notification, gchar *psz, gpointer p )
 
 static void Prev( NotifyNotification *notification, gchar *psz, gpointer p )
 { /* libnotify callback, called when the "Previous" button is pressed */
+    VLC_UNUSED(psz);
     notify_notification_close (notification, NULL);
     playlist_t *p_playlist = pl_Yield( ((vlc_object_t*) p) );
     playlist_Prev( p_playlist );
@@ -266,7 +282,10 @@ static int Notify( vlc_object_t *p_this, const char *psz_temp, GdkPixbuf *pix,
 
     /* Close previous notification if still active */
     if( p_intf->p_sys->notification )
+    {
         notify_notification_close( p_intf->p_sys->notification, &p_error );
+        g_object_unref( p_intf->p_sys->notification );
+    }
 
     notification = notify_notification_new( _("Now Playing"),
             psz_temp, NULL, NULL);