Merge commit 'origin/1.0-bugfix'

diff --combined modules/gui/pda/pda_callbacks.c
index ca13118dde81a9901f2436eed8f507e8126a2760,e1abc08bb1c0422bdcbabd31024c5db980da7fc1..9e4100ac28bb78cd9d1695b2362ecb548ef6b6e5
--- 1/modules/gui/pda/pda_callbacks.c
--- 2/modules/gui/pda/pda_callbacks.c
+++ b/modules/gui/pda/pda_callbacks.c
@@@ -91,7 -91,7 +91,7 @@@ static void PlaylistAddItem(GtkWidget *
  {
      intf_thread_t *p_intf = GtkGetIntf( widget );
      playlist_t    *p_playlist;
 -    int           i_id , i_pos=0;
 +    int           i_pos=0;
      GtkTreeView   *p_tvplaylist = NULL;
  
      p_playlist = pl_Hold( p_intf );
@@@ -132,11 -132,11 +132,11 @@@
              else
  #endif
              {
 -                i_id = playlist_AddExt( p_playlist, (const char*)name,
 +                playlist_AddExt( p_playlist, (const char*)name,
                                (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 );
              }