Merge branch 1.0-bugfix into master

diff --git a/compat/getcwd.c b/compat/getcwd.c
new file mode 100644 (file)
index 0000000..a238d05
--- /dev/null
+++ b/compat/getcwd.c
@@ -0,0 +1,38 @@
+/*****************************************************************************
+ * getcwd.c: POSIX getcwd() replacement
+ *****************************************************************************
+ * Copyright © 2009 the VideoLAN project
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stddef.h>
+
+char *getcwd (char *buf, size_t size)
+{
+#ifdef UNDER_CE
+    /* Windows CE lacks any notion of working directory, so we just
+     * return an error, and set errno - oh wait, WinCE doesn't support
+     * errno either! */
+    (void) buf; (void) size;
+    return NULL;
+#else
+# error Unimplemented!
+#endif
+}

diff --git a/configure.ac b/configure.ac
index c2e8b0507086c9a55bfb87b37dcff568622c38d7..9e043504a61efe7dbf386336ee914aef072a7853 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -580,7 +580,7 @@ dnl Check for usual libc functions
 AC_CHECK_FUNCS([gettimeofday isatty sigrelse getpwuid_r memalign posix_memalign if_nametoindex getenv putenv setenv ctime_r lrintf daemon fork lstat posix_fadvise posix_madvise uselocale])
 AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(fcntl)
-AC_REPLACE_FUNCS([asprintf atof atoll gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtoll vasprintf swab])
+AC_REPLACE_FUNCS([asprintf atof atoll getcwd gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtoll vasprintf swab])
 AC_CHECK_FUNCS([stricmp strnicmp])
 AC_CHECK_FUNCS(fdatasync,,
   [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 5636832a6b027999450f4c4d240898c531218775..a02eeceb974186caf7261f71076dd1c732fd53ff 100644 (file)
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -44,7 +44,8 @@ typedef struct
 
 #if !defined (HAVE_STRLCPY) || \
     !defined (HAVE_STRNDUP) || \
-    !defined (HAVE_STRNLEN)
+    !defined (HAVE_STRNLEN) || \
+    !defined (HAVE_GETCWD)
 # include <stddef.h> /* size_t */
 #endif
 
@@ -128,6 +129,10 @@ struct tm *localtime_r (const time_t *, struct tm *);
 void rewind (FILE *);
 #endif
 
+#ifndef HAVE_GETCWD
+char *getcwd (char *buf, size_t size);
+#endif
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 8d224f4d2eddb56515b6d2db4adb1e13d67f681c..3a6a4cc69382ece9e792423be463948ac36c84ff 100644 (file)
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -1072,6 +1072,9 @@ void CaptureOpenPanel::initialize()
     screenFPS->setAlignment( Qt::AlignRight );
     screenPropLayout->addWidget( screenFPS, 0, 1 );
 
+    /* Screen connect */
+    CuMRL( screenFPS, valueChanged( int ) );
+
     /* General connects */
     CONNECT( ui.deviceCombo, activated( int ) ,
              stackedDevLayout, setCurrentIndex( int ) );

diff --git a/modules/video_output/xcb/keys.c b/modules/video_output/xcb/keys.c
index 21491fee0b5a4d56b08c0194d659cb609a7b8a9d..3ea33757f534255cfa5f0730bb468e39080cfeb3 100644 (file)
--- a/modules/video_output/xcb/keys.c
+++ b/modules/video_output/xcb/keys.c
@@ -162,8 +162,6 @@ static int ConvertKeySym (xcb_keysym_t sym)
         return KEY_SPACE;
     if (isascii(sym))
         return sym;
-    if (sym > XK_Delete)
-        return KEY_UNSET;
 
     /* Special keys */
     res = bsearch (&sym, tab, sizeof (tab) / sizeof (tab[0]), sizeof (tab[0]),