Imported Upstream version 1.7.3upstream/1.7.3

43 files changed, 109 insertions, 199 deletions

diff --git a/ChangeLog b/ChangeLog
index 71ab678..7e0d0f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -144,7 +144,20 @@
 
 	1.7.1 release
 
-2012-11-23 Luis Felipe Strano Moraes
+2012-11-22  Sebastian Dransfeld
+
+	* Accept unquoted values in user-dirs.dirs
+
+2012-11-23  Luis Felipe Strano Moraes
 
         1.7.2 release
 
+2012-11-24  Sebastian Dransfeld
+
+	* Fix alloca
+
+2012-12-07  Luis Felipe Strano Moraes
+
+	* 1.7.3 release
+
+
diff --git a/NEWS b/NEWS
index d2d2126..f6ffa8d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,16 @@
-Efreet 1.7.2
+Efreet 1.7.3
+
+Changes since Efreet 1.7.2:
+---------------------------
+
+Fixes:
+	- Fix alloca
 
 Changes since Efreet 1.7.1:
 ---------------------------
 
-No changes, just updating to keep in sync with last release.
+Fixes:
+    * Allow unquoted values in user-dirs.dirs
 
 Changes since Efreet 1.7.0:
 ---------------------------
diff --git a/configure b/configure
index 392d203..f077664 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for efreet 1.7.2.
+# Generated by GNU Autoconf 2.68 for efreet 1.7.3.
 #
 # Report bugs to <enlightenment-devel@lists.sourceforge.net>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='efreet'
 PACKAGE_TARNAME='efreet'
-PACKAGE_VERSION='1.7.2'
-PACKAGE_STRING='efreet 1.7.2'
+PACKAGE_VERSION='1.7.3'
+PACKAGE_STRING='efreet 1.7.3'
 PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1370,7 +1370,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures efreet 1.7.2 to adapt to many kinds of systems.
+\`configure' configures efreet 1.7.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1440,7 +1440,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of efreet 1.7.2:";;
+     short | recursive ) echo "Configuration of efreet 1.7.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1572,7 +1572,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-efreet configure 1.7.2
+efreet configure 1.7.3
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1995,7 +1995,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by efreet $as_me 1.7.2, which was
+It was created by efreet $as_me 1.7.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2820,7 +2820,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='efreet'
- VERSION='1.7.2'
+ VERSION='1.7.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11791,7 +11791,7 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define VMIC 2
+#define VMIC 3
 _ACEOF
 
 
@@ -11799,7 +11799,7 @@ cat >>confdefs.h <<_ACEOF
 #define VREV 0
 _ACEOF
 
-version_info="8:2:7"
+version_info="8:3:7"
 release_info=""
 
 
@@ -17272,7 +17272,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by efreet $as_me 1.7.2, which was
+This file was extended by efreet $as_me 1.7.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17338,7 +17338,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-efreet config.status 1.7.2
+efreet config.status 1.7.3
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index c05ebe3..3281734 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [1])
 m4_define([v_min], [7])
-m4_define([v_mic], [2])
+m4_define([v_mic], [3])
 m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
 m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
 ##--   When released, remove the dnl on the below line
diff --git a/efreet.spec b/efreet.spec
index 001f021..3ec569f 100644
--- a/efreet.spec
+++ b/efreet.spec
@@ -4,7 +4,7 @@
 
 Summary: FreeDesktop.Org Compatibility Library
 Name: efreet
-Version: 1.7.2
+Version: 1.7.3
 Release: %{_rel}
 License: BSD
 Group: System Environment/Libraries
diff --git a/po/cs.gmo b/po/cs.gmo
index d154a83..ebd8dcf 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 292b59d..41934b8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efreet\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-11-22 15:32-0800\n"
+"POT-Creation-Date: 2012-12-07 11:47-0200\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
@@ -15,6 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/efreet_base.c:128
+#: src/lib/efreet_base.c:112
 msgid "Desktop"
 msgstr "Plocha"
diff --git a/po/de.gmo b/po/de.gmo
index 2a66452..210c604 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index d936ac4..1b3f5d5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efreet\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-11-22 15:32-0800\n"
+"POT-Creation-Date: 2012-12-07 11:47-0200\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
@@ -15,6 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/efreet_base.c:128
+#: src/lib/efreet_base.c:112
 msgid "Desktop"
 msgstr "Arbeitsfläche"
diff --git a/po/efreet.pot b/po/efreet.pot
index 9259493..44c674e 100644
--- a/po/efreet.pot
+++ b/po/efreet.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: efreet 1.7.2\n"
+"Project-Id-Version: efreet 1.7.3\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-11-22 15:32-0800\n"
+"POT-Creation-Date: 2012-12-07 11:47-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/efreet_base.c:128
+#: src/lib/efreet_base.c:112
 msgid "Desktop"
 msgstr ""
diff --git a/po/el.gmo b/po/el.gmo
index ee3d829..d3e41b0 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index b52f0f9..65fa1e0 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efreet\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-11-22 15:32-0800\n"
+"POT-Creation-Date: 2012-12-07 11:47-0200\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
@@ -15,6 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/efreet_base.c:128
+#: src/lib/efreet_base.c:112
 msgid "Desktop"
 msgstr "Επιφάνεια εργασίας"
diff --git a/po/es.gmo b/po/es.gmo
index 25ff355..7fe927d 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 91037ec..2995dcc 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efreet\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-11-22 15:32-0800\n"
+"POT-Creation-Date: 2012-12-07 11:47-0200\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
@@ -15,6 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/efreet_base.c:128
+#: src/lib/efreet_base.c:112
 msgid "Desktop"
 msgstr "Escritorio"
diff --git a/po/fr.gmo b/po/fr.gmo
index f30d92a..15be539 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index d511826..3de6466 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efreet\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-11-22 15:32-0800\n"
+"POT-Creation-Date: 2012-12-07 11:47-0200\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
@@ -15,6 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/efreet_base.c:128
+#: src/lib/efreet_base.c:112
 msgid "Desktop"
 msgstr "Bureau"
diff --git a/po/it.gmo b/po/it.gmo
index be77c5f..3d81966 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index 2bcdfdc..e01bb8d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efreet\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-11-22 15:32-0800\n"
+"POT-Creation-Date: 2012-12-07 11:47-0200\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
@@ -15,6 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/efreet_base.c:128
+#: src/lib/efreet_base.c:112
 msgid "Desktop"
 msgstr "Scrivania"
diff --git a/po/ja.gmo b/po/ja.gmo
index 4da74e4..df43876 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index 1cac655..5271cd6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efreet\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-11-22 15:32-0800\n"
+"POT-Creation-Date: 2012-12-07 11:47-0200\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
@@ -15,6 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/efreet_base.c:128
+#: src/lib/efreet_base.c:112
 msgid "Desktop"
 msgstr "デスクトップ"
diff --git a/po/ko.gmo b/po/ko.gmo
index 60318cc..11e211c 100644
--- a/po/ko.gmo
+++ b/po/ko.gmo
diff --git a/po/ko.po b/po/ko.po
index 934408d..519176d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efreet\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-11-22 15:32-0800\n"
+"POT-Creation-Date: 2012-12-07 11:47-0200\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
@@ -15,6 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/efreet_base.c:128
+#: src/lib/efreet_base.c:112
 msgid "Desktop"
 msgstr "바탕화면"
diff --git a/po/nl.gmo b/po/nl.gmo
index af24502..613963d 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 2c7751a..5098c0b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efreet\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-11-22 15:32-0800\n"
+"POT-Creation-Date: 2012-12-07 11:47-0200\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
@@ -15,6 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/efreet_base.c:128
+#: src/lib/efreet_base.c:112
 msgid "Desktop"
 msgstr "Bureaublad"
diff --git a/po/pt.gmo b/po/pt.gmo
index c7734d5..7ed21df 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index 45ce290..f298c47 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efreet\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-11-22 15:32-0800\n"
+"POT-Creation-Date: 2012-12-07 11:47-0200\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
@@ -15,6 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/efreet_base.c:128
+#: src/lib/efreet_base.c:112
 msgid "Desktop"
 msgstr "Área de Trabalho"
diff --git a/po/ru.gmo b/po/ru.gmo
index ca7de62..8483b5a 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index 6a77562..15aceb0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efreet\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-11-22 15:32-0800\n"
+"POT-Creation-Date: 2012-12-07 11:47-0200\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
@@ -15,6 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/efreet_base.c:128
+#: src/lib/efreet_base.c:112
 msgid "Desktop"
 msgstr "Рабочий стол"
diff --git a/po/sl.gmo b/po/sl.gmo
index ade3b44..a1be1a5 100644
--- a/po/sl.gmo
+++ b/po/sl.gmo
diff --git a/po/sl.po b/po/sl.po
index 41a4b96..4e8f7a0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efreet\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-11-22 15:32-0800\n"
+"POT-Creation-Date: 2012-12-07 11:47-0200\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
@@ -15,6 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/efreet_base.c:128
+#: src/lib/efreet_base.c:112
 msgid "Desktop"
 msgstr "Namizje"
diff --git a/src/bin/efreet_icon_cache_create.c b/src/bin/efreet_icon_cache_create.c
index e8d100c..e2ec227 100644
--- a/src/bin/efreet_icon_cache_create.c
+++ b/src/bin/efreet_icon_cache_create.c
@@ -1,6 +1,9 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "efreet_alloca.h"
+
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 824c8de..f1cc10b 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -66,4 +66,4 @@ libefreet_trash_la_CPPFLAGS = \
 libefreet_trash_la_LIBADD = @EFREET_LIBS@ libefreet.la
 libefreet_trash_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
 
-EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h
+EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h efreet_alloca.h
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index c3c4cfd..aae2785 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -372,7 +372,7 @@ libefreet_trash_la_CPPFLAGS = \
 
 libefreet_trash_la_LIBADD = @EFREET_LIBS@ libefreet.la
 libefreet_trash_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
-EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h
+EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h efreet_alloca.h
 all: all-am
 
 .SUFFIXES:
diff --git a/src/lib/efreet.c b/src/lib/efreet.c
index c48223f..8d3bf57 100644
--- a/src/lib/efreet.c
+++ b/src/lib/efreet.c
@@ -2,23 +2,7 @@
 # include <config.h>
 #endif
 
-#undef alloca
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+#include "efreet_alloca.h"
 
 #include <unistd.h>
 #include <sys/stat.h>
diff --git a/src/lib/efreet_alloca.h b/src/lib/efreet_alloca.h
new file mode 100644
index 0000000..58a7398
--- /dev/null
+++ b/src/lib/efreet_alloca.h
@@ -0,0 +1,30 @@
+#ifndef EFREET_ALLOCA_H
+#define EFREET_ALLOCA_H
+
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#elif !defined alloca
+# ifdef __GNUC__
+#  define alloca __builtin_alloca
+# elif defined _AIX
+#  define alloca __alloca
+# elif defined _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# elif !defined HAVE_ALLOCA
+#  ifdef  __cplusplus
+extern "C"
+#  endif
+void *alloca (size_t);
+# endif
+#endif
+
+#endif
diff --git a/src/lib/efreet_base.c b/src/lib/efreet_base.c
index 6ee0119..cf1bb9b 100644
--- a/src/lib/efreet_base.c
+++ b/src/lib/efreet_base.c
@@ -2,23 +2,7 @@
 # include <config.h>
 #endif
 
-#undef alloca
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+#include "efreet_alloca.h"
 
 #include <unistd.h>
 #include <ctype.h>
diff --git a/src/lib/efreet_desktop.c b/src/lib/efreet_desktop.c
index 9293f94..7faf43c 100644
--- a/src/lib/efreet_desktop.c
+++ b/src/lib/efreet_desktop.c
@@ -2,23 +2,7 @@
 # include <config.h>
 #endif
 
-#undef alloca
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+#include "efreet_alloca.h"
 
 #ifdef HAVE_EVIL
 # include <Evil.h>
diff --git a/src/lib/efreet_desktop_command.c b/src/lib/efreet_desktop_command.c
index bf97f8f..f7f4d13 100644
--- a/src/lib/efreet_desktop_command.c
+++ b/src/lib/efreet_desktop_command.c
@@ -2,23 +2,7 @@
 # include <config.h>
 #endif
 
-#undef alloca
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+#include "efreet_alloca.h"
 
 #include <unistd.h>
 #include <ctype.h>
diff --git a/src/lib/efreet_icon.c b/src/lib/efreet_icon.c
index 526e0ec..86a669a 100644
--- a/src/lib/efreet_icon.c
+++ b/src/lib/efreet_icon.c
@@ -2,23 +2,7 @@
 # include <config.h>
 #endif
 
-#undef alloca
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+#include "efreet_alloca.h"
 
 #include <Ecore.h>
 #include <Ecore_File.h>
diff --git a/src/lib/efreet_ini.c b/src/lib/efreet_ini.c
index 375fda1..fbe4dd7 100644
--- a/src/lib/efreet_ini.c
+++ b/src/lib/efreet_ini.c
@@ -2,23 +2,7 @@
 # include <config.h>
 #endif
 
-#undef alloca
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+#include "efreet_alloca.h"
 
 #include <ctype.h>
 #include <sys/stat.h>
diff --git a/src/lib/efreet_menu.c b/src/lib/efreet_menu.c
index e612ba1..3ab6c5c 100644
--- a/src/lib/efreet_menu.c
+++ b/src/lib/efreet_menu.c
@@ -2,23 +2,7 @@
 # include <config.h>
 #endif
 
-#undef alloca
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+#include "efreet_alloca.h"
 
 #include <Ecore_File.h>
 
diff --git a/src/lib/efreet_mime.c b/src/lib/efreet_mime.c
index 9343d90..51be95f 100644
--- a/src/lib/efreet_mime.c
+++ b/src/lib/efreet_mime.c
@@ -2,22 +2,7 @@
 # include <config.h>
 #endif
 
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+#include "efreet_alloca.h"
 
 #include <ctype.h>
 #include <sys/stat.h>
diff --git a/src/lib/efreet_utils.c b/src/lib/efreet_utils.c
index dab85ef..a2bee37 100644
--- a/src/lib/efreet_utils.c
+++ b/src/lib/efreet_utils.c
@@ -2,25 +2,9 @@
 # include <config.h>
 #endif
 
-/* TODO: add no_display check, as we might want only displayable items */
+#include "efreet_alloca.h"
 
-#undef alloca
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+/* TODO: add no_display check, as we might want only displayable items */
 
 #include <fnmatch.h>