Merge commit 'origin/1.0-bugfix'

modules/gui/pda/pda_callbacks.c

@@ -136,7 +136,7 @@ static void PlaylistAddItem(GtkWidget *widget, gchar *name, char **ppsz_options,
                               (const char*)name,
                               PLAYLIST_APPEND, PLAYLIST_END,
                               (mtime_t) 0,
-                              i_options, (const char **) ppsz_options, VLC_INPUT_OPTION_TRUSTED,
+                              i_size, (const char **) ppsz_options, VLC_INPUT_OPTION_TRUSTED,
                               true, pl_Unlocked );
             }
 

modules/gui/pda/pda_support.c

@@ -9,6 +9,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <string.h>
 
 #include <gtk/gtk.h>
 
@@ -75,6 +76,7 @@ GtkWidget*
 create_pixmap                          (GtkWidget       *widget,
                                         const gchar     *filename)
 {
+  VLC_UNUSED( widget );
   gchar *pathname = NULL;
   GtkWidget *pixmap;
 
@@ -136,7 +138,7 @@ glade_set_atk_action_description       (AtkAction       *action,
   for (i = 0; i < n_actions; i++)
     {
       if (!strcmp (atk_action_get_name (action, i), action_name))
-        atk_action_set_description (action, i, description)
+        atk_action_set_description (action, i, description);
     }
 }
 

modules/misc/gtk_main.c

@@ -94,7 +94,7 @@ static int Open( vlc_object_t *p_this )
     if( i_refcount > 0 )
     {
         i_refcount++;
-        vlc_mutex_unlock( lock );
+        vlc_mutex_unlock( &gtk_lock );
 
         return VLC_SUCCESS;
     }
@@ -110,11 +110,11 @@ static int Open( vlc_object_t *p_this )
     /* Launch the gtk_main() thread. It will not return until it has
      * called gdk_threads_enter(), which ensures us thread safety. */
     if( vlc_thread_create( p_gtk_main, "gtk_main", GtkMain,
-                           VLC_THREAD_PRIORITY_LOW, true ) )
+                           VLC_THREAD_PRIORITY_LOW ) )
     {
         vlc_object_release( p_gtk_main );
         i_refcount--;
-        vlc_mutex_unlock( lock );
+        vlc_mutex_unlock( &gtk_lock );
         return VLC_ETHREAD;
     }