Merging upstream version 0.9.5.
authorDaniel Baumann <daniel@debian.org>
Sun, 15 Apr 2012 17:19:26 +0000 (17:19 +0000)
committerDaniel Baumann <daniel@debian.org>
Sun, 15 Apr 2012 17:19:26 +0000 (17:19 +0000)
243 files changed:
AUTHORS
ChangeLog
INSTALL [changed mode: 0755->0644]
Makefile.am
Makefile.in
README
TODO
aclocal.m4
autogen.sh [deleted file]
config.guess
config.h.in [new file with mode: 0644]
config.sub
configure
configure.ac [new file with mode: 0644]
configure.in [deleted file]
data/Makefile.am
data/Makefile.in
data/icons/file.png [deleted file]
data/icons/folder.png [deleted file]
data/mount.rules [deleted file]
data/pcmanfm-find.desktop.in [deleted file]
data/pcmanfm-folder-handler.desktop.in [deleted file]
data/pcmanfm.desktop.in [deleted file]
data/pcmanfm.png [deleted file]
data/pcmanfm2.desktop.in [new file with mode: 0644]
data/ui/Makefile.am [new file with mode: 0644]
data/ui/Makefile.in [new file with mode: 0644]
data/ui/about-dlg.glade [deleted file]
data/ui/about.glade.in [new file with mode: 0644]
data/ui/about.ui [new file with mode: 0644]
data/ui/appchooserdlg.glade [deleted file]
data/ui/autorun.ui [new file with mode: 0644]
data/ui/desktop-pref.ui [new file with mode: 0644]
data/ui/file-assoc-dlg.glade [deleted file]
data/ui/file_operation.glade [deleted file]
data/ui/file_properties.glade [deleted file]
data/ui/find-files.glade [deleted file]
data/ui/godlg.glade [deleted file]
data/ui/pref.ui [new file with mode: 0644]
data/ui/prefdlg.glade [deleted file]
depcomp
gtk-builder-convert [deleted file]
install-sh
intltool-extract.in [deleted file]
intltool-merge.in [deleted file]
intltool-update.in [deleted file]
ltmain.sh
missing
mkinstalldirs [deleted file]
please_read_README_carefully_before_packaging [deleted file]
po/ChangeLog [deleted file]
po/LINGUAS
po/Makefile.in.in
po/POTFILES.in
po/POTFILES.skip [new file with mode: 0644]
po/af.po [deleted file]
po/ar.po [deleted file]
po/bg.po
po/bn_IN.po [deleted file]
po/ca.po
po/cs.po
po/da.po
po/de.po
po/el.po
po/en_GB.po [new file with mode: 0644]
po/es.po
po/et.po [deleted file]
po/eu.po
po/fa.po [deleted file]
po/fi.po [deleted file]
po/fo.po [new file with mode: 0644]
po/fr.po
po/frp.po [deleted file]
po/gl.po [deleted file]
po/he.po
po/hr.po [deleted file]
po/hu.po
po/id.po [deleted file]
po/it.po
po/ja.po [deleted file]
po/km.po [deleted file]
po/ko.po [deleted file]
po/lt.po
po/ml.po [deleted file]
po/ms.po [deleted file]
po/nb.po [deleted file]
po/nl.po [deleted file]
po/nn.po [deleted file]
po/pl.po
po/ps.po [deleted file]
po/pt.po
po/pt_BR.po
po/ru.po
po/sk.po
po/sl.po
po/sr.po [deleted file]
po/sv.po
po/th.po [new file with mode: 0644]
po/tr.po [deleted file]
po/uk.po
po/ur.po [deleted file]
po/ur_PK.po [deleted file]
po/vi.po [deleted file]
po/zh_CN.po [deleted file]
po/zh_TW.po
src/Makefile.am
src/Makefile.in
src/app-config.c [new file with mode: 0644]
src/app-config.h [new file with mode: 0644]
src/compat/glib-mem.h [deleted file]
src/compat/glib-utils.c [deleted file]
src/compat/glib-utils.h [deleted file]
src/desktop-ui.c [new file with mode: 0644]
src/desktop.c [new file with mode: 0644]
src/desktop.h [new file with mode: 0644]
src/desktop/desktop-window.c [deleted file]
src/desktop/desktop-window.h [deleted file]
src/desktop/desktop.c [deleted file]
src/desktop/desktop.h [deleted file]
src/desktop/working-area.c [deleted file]
src/desktop/working-area.h [deleted file]
src/edit-bookmarks.c [deleted file]
src/edit-bookmarks.h [deleted file]
src/exo/exo-icon-view.c [deleted file]
src/exo/exo-icon-view.h [deleted file]
src/exo/exo-marshal.c [deleted file]
src/exo/exo-marshal.h [deleted file]
src/exo/exo-private.c [deleted file]
src/exo/exo-private.h [deleted file]
src/exo/exo-string.c [deleted file]
src/exo/exo-string.h [deleted file]
src/exo/exo-tree-view.c [deleted file]
src/exo/exo-tree-view.h [deleted file]
src/exo/test.c [deleted file]
src/file-assoc-dlg.c [deleted file]
src/file-assoc-dlg.h [deleted file]
src/find-files.c [deleted file]
src/find-files.h [deleted file]
src/go-dialog.c [deleted file]
src/go-dialog.h [deleted file]
src/inotify/inotify-syscalls.h [deleted file]
src/inotify/linux-inotify.h [deleted file]
src/libmd5-rfc/COPYING [deleted file]
src/libmd5-rfc/md5.c [deleted file]
src/libmd5-rfc/md5.h [deleted file]
src/main-win-ui.c [new file with mode: 0644]
src/main-win.c [new file with mode: 0644]
src/main-win.h [new file with mode: 0644]
src/main-window.c [deleted file]
src/main-window.h [deleted file]
src/main.c [deleted file]
src/mime-type/libmimetype.xml [deleted file]
src/mime-type/mime-action.c [deleted file]
src/mime-type/mime-action.h [deleted file]
src/mime-type/mime-cache.c [deleted file]
src/mime-type/mime-cache.h [deleted file]
src/mime-type/mime-type.c [deleted file]
src/mime-type/mime-type.h [deleted file]
src/mime-type/old/glob.c [deleted file]
src/mime-type/old/glob.h [deleted file]
src/mime-type/old/magic.c [deleted file]
src/mime-type/old/magic.h [deleted file]
src/mime-type/old/mime.c [deleted file]
src/mime-type/old/mime.h [deleted file]
src/mime-type/test.c [deleted file]
src/pcmanfm.c [new file with mode: 0644]
src/pcmanfm.h
src/pref-dialog.c [deleted file]
src/pref-dialog.c.orig [deleted file]
src/pref-dialog.h [deleted file]
src/pref.c [new file with mode: 0644]
src/pref.h [new file with mode: 0644]
src/private.h [deleted file]
src/ptk/ptk-app-chooser.c [deleted file]
src/ptk/ptk-app-chooser.h [deleted file]
src/ptk/ptk-bookmarks.c [deleted file]
src/ptk/ptk-bookmarks.h [deleted file]
src/ptk/ptk-clipboard.c [deleted file]
src/ptk/ptk-clipboard.h [deleted file]
src/ptk/ptk-console-output.c [deleted file]
src/ptk/ptk-console-output.h [deleted file]
src/ptk/ptk-dir-tree-view.c [deleted file]
src/ptk/ptk-dir-tree-view.h [deleted file]
src/ptk/ptk-dir-tree.c [deleted file]
src/ptk/ptk-dir-tree.h [deleted file]
src/ptk/ptk-file-archiver.c [deleted file]
src/ptk/ptk-file-archiver.h [deleted file]
src/ptk/ptk-file-browser.c [deleted file]
src/ptk/ptk-file-browser.h [deleted file]
src/ptk/ptk-file-icon-renderer.c [deleted file]
src/ptk/ptk-file-icon-renderer.h [deleted file]
src/ptk/ptk-file-list.c [deleted file]
src/ptk/ptk-file-list.h [deleted file]
src/ptk/ptk-file-menu.c [deleted file]
src/ptk/ptk-file-menu.h [deleted file]
src/ptk/ptk-file-misc.c [deleted file]
src/ptk/ptk-file-misc.h [deleted file]
src/ptk/ptk-file-properties.c [deleted file]
src/ptk/ptk-file-properties.h [deleted file]
src/ptk/ptk-file-task.c [deleted file]
src/ptk/ptk-file-task.h [deleted file]
src/ptk/ptk-input-dialog.c [deleted file]
src/ptk/ptk-input-dialog.h [deleted file]
src/ptk/ptk-location-view.c [deleted file]
src/ptk/ptk-location-view.h [deleted file]
src/ptk/ptk-path-entry.c [deleted file]
src/ptk/ptk-path-entry.h [deleted file]
src/ptk/ptk-text-renderer.c [deleted file]
src/ptk/ptk-text-renderer.h [deleted file]
src/ptk/ptk-utils.c [deleted file]
src/ptk/ptk-utils.h [deleted file]
src/settings.c [deleted file]
src/settings.h [deleted file]
src/utils.c [new file with mode: 0644]
src/utils.h [new file with mode: 0644]
src/vfs/vfs-app-desktop.c [deleted file]
src/vfs/vfs-app-desktop.h [deleted file]
src/vfs/vfs-async-task.c [deleted file]
src/vfs/vfs-async-task.h [deleted file]
src/vfs/vfs-dir.c [deleted file]
src/vfs/vfs-dir.h [deleted file]
src/vfs/vfs-execute.c [deleted file]
src/vfs/vfs-execute.h [deleted file]
src/vfs/vfs-file-info.c [deleted file]
src/vfs/vfs-file-info.h [deleted file]
src/vfs/vfs-file-monitor.c [deleted file]
src/vfs/vfs-file-monitor.h [deleted file]
src/vfs/vfs-file-task.c [deleted file]
src/vfs/vfs-file-task.h [deleted file]
src/vfs/vfs-mime-type.c [deleted file]
src/vfs/vfs-mime-type.h [deleted file]
src/vfs/vfs-thumbnail-loader.c [deleted file]
src/vfs/vfs-thumbnail-loader.h [deleted file]
src/vfs/vfs-utils.c [deleted file]
src/vfs/vfs-utils.h [deleted file]
src/vfs/vfs-volume-hal-options.c [deleted file]
src/vfs/vfs-volume-hal-options.h [deleted file]
src/vfs/vfs-volume-hal.c [deleted file]
src/vfs/vfs-volume-nohal.c [deleted file]
src/vfs/vfs-volume.h [deleted file]
src/volume-manager.c [new file with mode: 0644]
src/volume-manager.h [new file with mode: 0644]
src/xml-purge.c

diff --git a/AUTHORS b/AUTHORS
index dfd1311..6004f28 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,45 +1,5 @@
-Lead Developer:
 洪任諭 (Hong Jen Yee, aka PCMan) <pcman.tw@gmail.com>
 
-Contributors: (alphabet order)
-Cantona <cantona@cantona.net>
-Orlando Fiol <fiolorlando@gmail.com>
-Jim Huang (jserv) <jserv.tw@gmail.com>
-Ying-Chun Liu (PaulLiu) <grandpaul@gmail.com>
-Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
-Kirilov Georgi <kirilov-georgi@users.sourceforge.net>
-Martijn Dekker <mcdutchie@users.sourceforge.net>
-Eugene Arshinov (statc) <earshinov@gmail.com>
-
-Translators: (alphabet order)
-Johan Andersson <nossrednanahoj(at)gmail.com>
-Fábio Antunes <fabio.antunes@hotmail.com>
-Inko Illarramendi Arancibia <inkoia@gmail.com>
-Rüdiger Arp <ruediger@gmx.net>
-SZERVÁC Attila <sas@321.hu>
-Frederic Bezies <fredbezies@gmail.com>
-Xisco Bonet <xiscobv@gmail.com>
-Haifeng Chen <optical.dlz@gmail.com>
-Héonium - Christophe CRIER
-Flávio Costa <formicbr@gmail.com>
-Ersplus - Fraide <ersplus@free.fr>
-Roxana Kolosova <mavka@justos.org>
-Hironao Komatsu <hironao@users.sourceforge.net>
-Muhammad Ali Makki <makki.ma@gmail.com>
-mario <mariodebian@gmail.com>
-mazdac <mazdac@gmail.com>
-Nuno Miguel <nunis@netcabo.pt>
-Claudio Riva <firetux83@gmail.com>
-Bekir SONAT <bekirsonat@kde.org.tr>
-Anton Dobkin <anton@viansib.ru>
-
 External source code taken from other projects:
- * libmd5-rfc: Aladdin Enterprises
- * Working area detection: Gary Kramlich
- * ExoIconView: os-cillation e.K, Anders Carlsson, & Benedikt Meurer
- * Text and icon renderer uese code from Jonathan Blandford
- * Desktop icons use code from Brian Tarricone
-
-Icon:
- * Taken from "nuoveXT 2" icon theme created by Alexandre Moore (saki).
-   http://www.gnome-look.org/content/show.php/nuoveXT+2?content=56625
+ * ExoIconView, ExoTreeView, along with the source code in src/exo:
+       os-cillation e.K, Anders Carlsson, & Benedikt Meurer
index cd9fda0..e69de29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +0,0 @@
-2009-01-26 Og Maciel <ogmaciel@gnome.org>
-
-       * data/ui/about-dlg.glade: Fixed typo fixes SF.net #2490464.
-       * src/ptk/ptk-file-task.c: Grammar issue fixes SF.net #2485704.
-       * src/ptk/ptk-file-misc.c: Grammar issue fixes SF.net #2485704.
diff --git a/INSTALL b/INSTALL
old mode 100755 (executable)
new mode 100644 (file)
index 23e5f25..2550dab
--- a/INSTALL
+++ b/INSTALL
@@ -1,16 +1,19 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-This file is free documentation; the Free Software Foundation gives
+   This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-These are generic installation instructions.
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -23,9 +26,9 @@ debugging `configure').
 
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
    The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
 The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
@@ -67,42 +67,57 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
 is an example:
 
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
    *Note Defining Variables::, for more details.
 
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+   You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
 
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
+   By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
 `configure' the option `--prefix=PREFIX'.
@@ -125,7 +140,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 Optional Features
 =================
 
-Some packages pay attention to `--enable-FEATURE' options to
+   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -137,14 +152,46 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -152,7 +199,8 @@ type, such as `sun4', or a canonical name which has the form:
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@@ -170,9 +218,9 @@ eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +229,7 @@ A warning: not all `configure' scripts look for a site script.
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+   Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -190,21 +238,29 @@ them in the `configure' command line, using `VAR=value'.  For example:
      ./configure CC=/usr/local2/bin/gcc
 
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
+overridden in the site shell script).
 
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
 
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+   `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'
-     Print a summary of the options to `configure', and exit.
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
 
 `--version'
 `-V'
@@ -231,6 +287,16 @@ configuration-related scripts to be executed by `/bin/bash'.
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *Note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
 
index 0d28605..e5a3db4 100644 (file)
@@ -1,12 +1,6 @@
-## Process this file with automake to produce Makefile.in
+NULL=
 
-SUBDIRS = src data po
-
-mimedir = $(datadir)/mime/packages
-mime_DATA = src/mime-type/libmimetype.xml
+SUBDIRS=src po data
 
 EXTRA_DIST = \
-       autogen.sh \
-       $(mime_DATA) \
-       please_read_README_carefully_before_packaging
-
+       $(NULL)
index 3b995a1..94b6380 100644 (file)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14,7 +14,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -36,16 +35,18 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-       $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-       ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \
-       install-sh ltmain.sh missing mkinstalldirs
+       $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+       $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+       TODO config.guess config.sub depcomp install-sh ltmain.sh \
+       missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
@@ -57,29 +58,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        install-pdf-recursive install-ps-recursive install-recursive \
        installcheck-recursive installdirs-recursive pdf-recursive \
        ps-recursive uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(mimedir)"
-DATA = $(mime_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -120,7 +98,7 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
@@ -150,18 +128,20 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FAM_CFLAGS = @FAM_CFLAGS@
-FAM_LIBS = @FAM_LIBS@
 FGREP = @FGREP@
+FM_CFLAGS = @FM_CFLAGS@
+FM_LIBS = @FM_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 G_CAST_CHECKS = @G_CAST_CHECKS@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -178,12 +158,12 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MENU_CACHE_CFLAGS = @MENU_CACHE_CFLAGS@
+MENU_CACHE_LIBS = @MENU_CACHE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -212,12 +192,12 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-SN_CFLAGS = @SN_CFLAGS@
-SN_LIBS = @SN_LIBS@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XLIB_CFLAGS = @XLIB_CFLAGS@
+XLIB_LIBS = @XLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -270,32 +250,30 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = src data po
-mimedir = $(datadir)/mime/packages
-mime_DATA = src/mime-type/libmimetype.xml
+NULL = 
+SUBDIRS = src po data
 EXTRA_DIST = \
-       autogen.sh \
-       $(mime_DATA) \
-       please_read_README_carefully_before_packaging
+       $(NULL)
 
-all: all-recursive
+all: config.h
+       $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
 am--refresh:
        @:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
-             echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-             $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+             echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+             $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
                && exit 0; \
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
        $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --gnu Makefile
+         $(AUTOMAKE) --foreign Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
@@ -310,12 +288,29 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
        $(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 
+config.h: stamp-h1
+       @if test ! -f $@; then \
+         rm -f stamp-h1; \
+         $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+       else :; fi
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+       @rm -f stamp-h1
+       cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in:  $(am__configure_deps) 
+       ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+       rm -f stamp-h1
+       touch $@
+
+distclean-hdr:
+       -rm -f config.h stamp-h1
+
 mostlyclean-libtool:
        -rm -f *.lo
 
@@ -324,26 +319,6 @@ clean-libtool:
 
 distclean-libtool:
        -rm -f libtool config.lt
-install-mimeDATA: $(mime_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(mimedir)" || $(MKDIR_P) "$(DESTDIR)$(mimedir)"
-       @list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(mimedir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(mimedir)" || exit $$?; \
-       done
-
-uninstall-mimeDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(mimedir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(mimedir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -352,7 +327,7 @@ uninstall-mimeDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
@@ -377,7 +352,7 @@ $(RECURSIVE_TARGETS):
        fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
@@ -425,7 +400,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        mkid -fID $$unique
 tags: TAGS
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
        set x; \
        here=`pwd`; \
@@ -442,7 +417,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
              set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
          fi; \
        done; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
@@ -460,9 +435,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
          fi; \
        fi
 ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
@@ -541,7 +516,8 @@ distdir: $(DISTFILES)
          fi; \
        done
        -test -n "$(am__skip_mode_fix)" \
-       || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+       || find "$(distdir)" -type d ! -perm -755 \
+               -exec chmod u+rwx,go+rx {} \; -o \
          ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -549,6 +525,7 @@ distdir: $(DISTFILES)
 dist-gzip: distdir
        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
        $(am__remove_distdir)
+
 dist-bzip2: distdir
        tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
        $(am__remove_distdir)
@@ -576,7 +553,6 @@ dist-zip: distdir
 
 dist dist-all: distdir
        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-       tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
        $(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -585,17 +561,17 @@ dist dist-all: distdir
 distcheck: dist
        case '$(DIST_ARCHIVES)' in \
        *.tar.gz*) \
-         GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+         GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
        *.tar.bz2*) \
-         bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+         bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
        *.tar.lzma*) \
-         unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+         lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
        *.tar.xz*) \
          xz -dc $(distdir).tar.xz | $(am__untar) ;;\
        *.tar.Z*) \
          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
        *.shar.gz*) \
-         GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+         GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
        *.zip*) \
          unzip $(distdir).zip ;;\
        esac
@@ -656,12 +632,9 @@ distcleancheck: distclean
               exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(DATA)
+all-am: Makefile config.h
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(mimedir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -694,8 +667,8 @@ clean-am: clean-generic clean-libtool mostlyclean-am
 distclean: distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-       distclean-tags
+distclean-am: clean-am distclean-generic distclean-hdr \
+       distclean-libtool distclean-tags
 
 dvi: dvi-recursive
 
@@ -709,7 +682,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-mimeDATA
+install-data-am:
 
 install-dvi: install-dvi-recursive
 
@@ -755,27 +728,26 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-mimeDATA
+uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-       install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+       ctags-recursive install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
        all all-am am--refresh check check-am clean clean-generic \
        clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
        dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-       distcheck distclean distclean-generic distclean-libtool \
-       distclean-tags distcleancheck distdir distuninstallcheck dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-info install-info-am install-man install-mimeDATA \
+       distcheck distclean distclean-generic distclean-hdr \
+       distclean-libtool distclean-tags distcleancheck distdir \
+       distuninstallcheck dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am install-man \
        install-pdf install-pdf-am install-ps install-ps-am \
        install-strip installcheck installcheck-am installdirs \
        installdirs-am maintainer-clean maintainer-clean-generic \
        mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-       ps ps-am tags tags-recursive uninstall uninstall-am \
-       uninstall-mimeDATA
+       ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/README b/README
index 289cef5..6c96637 100644 (file)
--- a/README
+++ b/README
@@ -1,172 +1,2 @@
-Here are some detailed IMPORTANT notes and FAQs for users and packagers.
+Compile the program with configure option --sysconfdir=/etc
 
-Please read this carefully before you make package for PCManFM.
-** Suggestions to the packagers:
-
-1. Add these two commands in your post-inst scripts, or some things won't work:
-  update-mime-database /usr/share/mime
-  update-desktop-database
-
-2. Never turn on --enable-inotify configure option. It's currently broken.
-
-3. Use gamin instead of fam, whenever possible.
-
-4. Use hal >= 0.5, or volume management won't work properly.
-  If there is no hal on your system, turn this off with --disable-hal option.
-
-5. Check /usr/share/pcmanfm/mount.rules to see if any modification
-  is required on your distro.
-
-** Detailed explanation for every issues related to PCManFM:
-
-Mime Type Handling:
-
-1. Running update-mime-database /usr/share/mime as root after installation
-  is needed because PCManFM adds some new mime-type definitions
-  to the system to speed up the recognition of some well-known Windows files.
-  (This also improve other programs using the same shared mime database)
-  So, regenerating the the cache of the database is required since it's changed.
-
-  * To packagers: Don't forget to do this in your post-inst scripts.
-
-2. Default application is specified in ~/.local/share/applications/defaults.list
-  If default application is not found in this file, system-wide settings will
-  be used. The system-wised settings are in /usr/share/applications/defaults
-  and /usr/local/share/applications.
-
-  NOTE: There is currently no standard for this. To maximize compatibility, and
-  decrease the users' problems, we use the same mechanism with Gnome and XFCE.
-  Our own mechanism, which I think is better, is dropped in PCManFM 0.3.5 and later.
-
-  * Besides, running update-desktop-database as root is required after
-  installation since all applications for all mime-types are cached on
-  the system according to the freedesktop.org specs to improve performance.
-  Without this cache, PCManFM won't work properly.
-
-  * To packagers: Don't forget to do this in your post-inst scripts.
-
-
-Volume Management (Mounting devices):
-
-  Mounting and unmounting the disks are supported through HAL.
-  If you compile PCManFM with --disable-hal, volume management won't be available.
-  Besides, please use the latest version of HAL available on your systems because
-  incompatibilities exist among different versions of HAL. The older versions
-  lack something important, and their configuration are different, too.
-  Generally HAL >= 0.5 might be OK. Our development environment uses version 0.5.9.
-
-  If a device is defined in /etc/fstab, PCManFM will call mount/umount directly.
-  Otherwise, HAL will be called to mount the devices. This is usually the case of
-  removable devices such as usb disks or SD cards which are not described in fstab.
-  Default options to mount various file systems on these devices can be changed
-  via editing /usr/share/pcmanfm/mount.rules. The file format is easy to understand.
-  Newer versions of HAL force applications to handle these options themselves.
-  (http://www.linuxfromscratch.org/blfs/view/svn/general/hal.html)
-
-  * To packagers: If these default options shipped with PCManFM are not suitable for
-    your distro, please patch them before packaging, or things won't work on your distro.
-    For example, Debian doesn't support 'usefree' option for vfat while Ubuntu uses this.
-    Don't forget to adjust these options, if things don't work on your distro.
-
-
-Switch To Root Problems:
-
-  In "Tool" menu of PCManFM there is an option for you to switch to super user.
-  By default PCManFM calls 'gksudo', and if it doesn't exists, it calls 'gksu'.
-  If both of them don't exist, PCManFM will call 'kdesu'.
-  In some distros, 'gksudo' is disabled by default. Instead, you can assign your
-  preferable program during configuration, and the option is
-  "--with-preferable-sudo=PROG"
-
-  * To packagers: For the sake of consistency, you might use proper argument passed
-  to option "--with-preferable-sudo" before packaging,
-
-
-File Alteration Monitor (fam or gamin?):
-
-  File alteration monitor is an important part of file managers.
-  Without this, file managers won't reflect changes of files done by other
-  applications or under consoles.
-  Historically FAM is used for this, but it has some performance and security
-  problems.  So it's gradually replaced by gamin in modern distros.
-  FAM and gamin are compatible in most of the cases.
-
-  * To packagers: Using gamin with PCManFM is more recommended.
-
-Inotify support:
-
-  * To packagers: Please leave this configure option off as its default and
-    don't try to turn it on.  It's currently broken.
-
-  We use gamin instead of using inotify directly since inotify can only monitor
-  part of the file systems, and requires much additional complicated processing by
-  applications themselves.  So, let gamin do these dirty works for us.
-
-
-Warnings while running PCManFM as root?
-
-  Running applications as root is really dangerous and discouraged on UNIX-like
-  systems.  To protect users from accidentally break the system, we show a warning
-  bar on the window if they run PCManFM as root.  This cannot be turned off because
-  we have the responsibility to let the user know they are at risk.
-
-  However, under some circumstances, you'll need to run PCManFM as root all the time.
-  This is a common case in live CDs.  So, if you are the author of a live CD, and you
-  really need to turn this off, configure with the option "--disable-superuser-checks".
-
-
-Icons of Files are missing?:
-
-  You might get error message when you start PCManFM telling you that your
-  icon theme is not properly set. Normally gtk+ gets icon theme settings via
-  XSETTINGS daemons. Under Gnome and XFCE, they run their setting daemons
-  so you have no problem. However, under other desktop environments, gtk+
-  reads settings from "~/.gtkrc-2.0". The format of this file is poorly
-  documented by gtk+ team.  The only available doc is here:
-  http://library.gnome.org/devel/gtk-tutorial/stable/x2138.html
-  Few people know exactly how to edit this file.  Neither do I, but I know
-  you can set icon theme by adding this:
-  gtk-icon-theme-name="THE NAME OF THE FOLDER CONTAINING ICONS"
-  This name can be found by looking in /usr/share/icons, /usr/local/share/icons,
-  and ~/.local/share/icons.
-  I know this is inconvinient, but that's not my fault, that's the design of gtk+.
-
-  Also, don't use an icon theme designed for KDE, or you'll get no icons.
-  The naming of icons are totally different in Gnome and KDE.
-  Because there is, again, no standard for this. So we use gnome-compatible themes.
-  Personally I recommend using this:
-  http://www.gnome-look.org/content/show.php/nuoveXT+2?content=56625
-
-  If you want to change the ugly look of gtk+ programs, you can add this:
-  gtk-theme-name="THE NAME OF THE GTK+ THEME YOU WANT TO USE"
-  "ClearLooks" is a good gtk+ theme, if you have it installed.
-
-
-Desktop Icon Support:
-
-  PCManFM provides very basic support for desktop icons.
-  Before version 0.3.6.2, using this is strongly discouraged since there are some 
-  performance problems in this part.  In 0.3.6.2 this is partially fixed.
-  Since version 0.3.9, the desktop icon support is completely re-designed and 
-  re-written. The performance problem was solved, and the functionality is already
-  acceptable. Drag and drop support for desktop icons is finally added in 0.4.3.
-  So, upgrading to 0.4 series is strongly encoraged. Don't use the deprecated 0.2.x and 
-  0.3.x series unless you have really good reasons.
-
-  If you only need to set the desktop wallpaper and don't need the icons,
-  the small program 'hsetroot' is for you.
-
-  The feature could be removed during build time via configuration option
-  "--disable-desktop-integration".
-
-
-Where is the "Trash Can"?
-
-  Currently we haven't support this yet. Having a correctly working tash can is 
-  not as easy as you think. It's actually much more complicated than simply moving
-  the files to ~/.Trash. To implement a standard-compliant, correct, and safe 
-  trash can is not an easy task. To see is to believe, read the spec yourself:
-  This is the current proposed Freedesktop.org "Trash Spec"
-  http://www.ramendik.ru/docs/trashspec.html
-  If you think this is easy, please send me a patch and I'll get it applied happily.
-  Why those Freedesktop.org guys always make things more and more complicated?
diff --git a/TODO b/TODO
index 4503a5f..db8fcc9 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,6 @@
-1. Support user scripts for mime-type handling. (Add user 
-   extended options in popup menu for selected files)  PENDING
-2. Improve desktop icon support.
-3. Support remote file systems via FUSE.
-4. Support tags
+Loadable modules:
+    support desktop painting module so there can be modules painting on the desktop window.
 
+Use fm_launch_paths for command line arguments handling.
+
+Add a new command line argument to change wallpaper mode.
index 93ec309..cb97a95 100644 (file)
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -3087,7 +3087,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -3726,7 +3726,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -4347,7 +4347,7 @@ m4_if([$1], [CXX], [
            ;;
        esac
        ;;
-      linux* | k*bsd*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
        case $cc_basename in
          KCC*)
            # KAI C++ Compiler
@@ -4631,7 +4631,7 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -4927,6 +4927,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -5018,7 +5019,7 @@ _LT_EOF
       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
        case $cc_basename in
@@ -6498,7 +6499,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
         case $cc_basename in
           KCC*)
            # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -8505,15 +8506,15 @@ m4_define([lt_dict_filter],
 
 # Generated from ltversion.in.
 
-# serial 3012 ltversion.m4
+# serial 3017 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
+[macro_version='2.2.6b'
+macro_revision='1.3017'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
@@ -8816,7 +8817,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -8832,7 +8833,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -9392,46 +9393,6 @@ fi
 rmdir .tst 2>/dev/null
 AC_SUBST([am__leading_dot])])
 
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well.  Anyway, the user
-# can override the default with the --enable/--disable switch.
-AC_DEFUN([AM_MAINTAINER_MODE],
-[m4_case(m4_default([$1], [disable]),
-       [enable], [m4_define([am_maintainer_other], [disable])],
-       [disable], [m4_define([am_maintainer_other], [enable])],
-       [m4_define([am_maintainer_other], [enable])
-        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
-  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-  AC_ARG_ENABLE([maintainer-mode],
-[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
-                         (and sometimes confusing) to the casual installer],
-      [USE_MAINTAINER_MODE=$enableval],
-      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST([MAINT])dnl
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
 # Check to see how 'make' treats includes.                 -*- Autoconf -*-
 
 # Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755 (executable)
index 9bbea2c..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-DIE=0
-
-if [ -n "$GNOME2_DIR" ]; then
-       ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"
-       LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH"
-       PATH="$GNOME2_DIR/bin:$PATH"
-       export PATH
-       export LD_LIBRARY_PATH
-fi
-
-(test -f $srcdir/configure.in) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level package directory"
-    exit 1
-}
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`autoconf' installed."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo 
-    echo "**Error**: You must have \`intltool' installed."
-    echo "You can get it from:"
-    echo "  ftp://ftp.gnome.org/pub/GNOME/"
-    DIE=1
-  }
-}
-
-(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && {
-  (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`xml-i18n-toolize' installed."
-    echo "You can get it from:"
-    echo "  ftp://ftp.gnome.org/pub/GNOME/"
-    DIE=1
-  }
-}
-
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`libtool' installed."
-    echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-  }
-}
-
-(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.in >/dev/null) && {
-  (grep "sed.*POTFILES" $srcdir/configure.in) > /dev/null || \
-  (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`glib' installed."
-    echo "You can get it from: ftp://ftp.gtk.org/pub/gtk"
-    DIE=1
-  }
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`automake' installed."
-  echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
-  echo "installed doesn't appear recent enough."
-  echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-if test "$DIE" -eq 1; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  echo "**Warning**: I am going to run \`configure' with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo \`$0\'" command line."
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-for coin in `find $srcdir -name configure.in -print`
-do 
-  dr=`dirname $coin`
-  if test -f $dr/NO-AUTO-GEN; then
-    echo skipping $dr -- flagged as no auto-gen
-  else
-    echo processing $dr
-    ( cd $dr
-
-      aclocalinclude="$ACLOCAL_FLAGS"
-
-      if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
-       echo "Creating $dr/aclocal.m4 ..."
-       test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-       echo "Running glib-gettextize...  Ignore non-fatal messages."
-       echo "no" | glib-gettextize --force --copy
-       echo "Making $dr/aclocal.m4 writable ..."
-       test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-      fi
-      if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
-        echo "Running intltoolize..."
-       intltoolize --copy --force --automake
-      fi
-      if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
-        echo "Running xml-i18n-toolize..."
-       xml-i18n-toolize --copy --force --automake
-      fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
-       if test -z "$NO_LIBTOOLIZE" ; then 
-         echo "Running libtoolize..."
-         libtoolize --force --copy
-       fi
-      fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
-       echo "Running autoheader..."
-       autoheader
-      fi
-      echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --gnu $am_opt
-      echo "Running autoconf ..."
-      autoconf
-    )
-  fi
-done
-
-conf_flags="--enable-maintainer-mode"
-
-if test x$NOCONFIGURE = x; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@" \
-  && echo Now type \`make\' to compile. || exit 1
-else
-  echo Skipping configure process.
-fi
index e3a2116..dc84c68 100755 (executable)
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-06-10'
+timestamp='2009-11-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2009-06-10'
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -333,6 +333,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+       echo i386-pc-auroraux${UNAME_RELEASE}
+       exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
        eval $set_cc_for_build
        SUN_ARCH="i386"
@@ -807,12 +810,12 @@ EOF
     i*:PW*:*)
        echo ${UNAME_MACHINE}-pc-pw32
        exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
        case ${UNAME_MACHINE} in
            x86)
                echo i586-pc-interix${UNAME_RELEASE}
                exit ;;
-           EM64T | authenticamd | genuineintel)
+           authenticamd | genuineintel | EM64T)
                echo x86_64-unknown-interix${UNAME_RELEASE}
                exit ;;
            IA64)
@@ -854,6 +857,20 @@ EOF
     i*86:Minix:*:*)
        echo ${UNAME_MACHINE}-pc-minix
        exit ;;
+    alpha:Linux:*:*)
+       case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+         EV5)   UNAME_MACHINE=alphaev5 ;;
+         EV56)  UNAME_MACHINE=alphaev56 ;;
+         PCA56) UNAME_MACHINE=alphapca56 ;;
+         PCA57) UNAME_MACHINE=alphapca56 ;;
+         EV6)   UNAME_MACHINE=alphaev6 ;;
+         EV67)  UNAME_MACHINE=alphaev67 ;;
+         EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+       objdump --private-headers /bin/sh | grep -q ld.so.1
+       if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+       echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+       exit ;;
     arm*:Linux:*:*)
        eval $set_cc_for_build
        if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -876,6 +893,17 @@ EOF
     frv:Linux:*:*)
        echo frv-unknown-linux-gnu
        exit ;;
+    i*86:Linux:*:*)
+       LIBC=gnu
+       eval $set_cc_for_build
+       sed 's/^        //' << EOF >$dummy.c
+       #ifdef __dietlibc__
+       LIBC=dietlibc
+       #endif
+EOF
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+       echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+       exit ;;
     ia64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
@@ -901,39 +929,18 @@ EOF
        #endif
        #endif
 EOF
-       eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-           /^CPU/{
-               s: ::g
-               p
-           }'`"
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
        ;;
     or32:Linux:*:*)
        echo or32-unknown-linux-gnu
        exit ;;
-    ppc:Linux:*:*)
-       echo powerpc-unknown-linux-gnu
-       exit ;;
-    ppc64:Linux:*:*)
-       echo powerpc64-unknown-linux-gnu
-       exit ;;
-    alpha:Linux:*:*)
-       case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-         EV5)   UNAME_MACHINE=alphaev5 ;;
-         EV56)  UNAME_MACHINE=alphaev56 ;;
-         PCA56) UNAME_MACHINE=alphapca56 ;;
-         PCA57) UNAME_MACHINE=alphapca56 ;;
-         EV6)   UNAME_MACHINE=alphaev6 ;;
-         EV67)  UNAME_MACHINE=alphaev67 ;;
-         EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-       objdump --private-headers /bin/sh | grep -q ld.so.1
-       if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-       echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-       exit ;;
     padre:Linux:*:*)
        echo sparc-unknown-linux-gnu
        exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+       echo hppa64-unknown-linux-gnu
+       exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
        # Look for CPU level
        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -942,8 +949,11 @@ EOF
          *)    echo hppa-unknown-linux-gnu ;;
        esac
        exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-       echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+       echo powerpc64-unknown-linux-gnu
+       exit ;;
+    ppc:Linux:*:*)
+       echo powerpc-unknown-linux-gnu
        exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
        echo ${UNAME_MACHINE}-ibm-linux
@@ -966,58 +976,6 @@ EOF
     xtensa*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
-    i*86:Linux:*:*)
-       # The BFD linker knows what the default object file format is, so
-       # first see if it will tell us. cd to the root directory to prevent
-       # problems with other programs or directories called `ld' in the path.
-       # Set LC_ALL=C to ensure ld outputs messages in English.
-       ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-                        | sed -ne '/supported targets:/!d
-                                   s/[         ][      ]*/ /g
-                                   s/.*supported targets: *//
-                                   s/ .*//
-                                   p'`
-        case "$ld_supported_targets" in
-         elf32-i386)
-               TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-               ;;
-       esac
-       # Determine whether the default compiler is a.out or elf
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #include <features.h>
-       #ifdef __ELF__
-       # ifdef __GLIBC__
-       #  if __GLIBC__ >= 2
-       LIBC=gnu
-       #  else
-       LIBC=gnulibc1
-       #  endif
-       # else
-       LIBC=gnulibc1
-       # endif
-       #else
-       #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-       LIBC=gnu
-       #else
-       LIBC=gnuaout
-       #endif
-       #endif
-       #ifdef __dietlibc__
-       LIBC=dietlibc
-       #endif
-EOF
-       eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-           /^LIBC/{
-               s: ::g
-               p
-           }'`"
-       test x"${LIBC}" != x && {
-               echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-               exit
-       }
-       test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-       ;;
     i*86:DYNIX/ptx:4*:*)
        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
        # earlier versions are messed up and put the nodename in both
@@ -1247,6 +1205,16 @@ EOF
     *:Darwin:*:*)
        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
        case $UNAME_PROCESSOR in
+           i386)
+               eval $set_cc_for_build
+               if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+                 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+                     (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+                     grep IS_64BIT_ARCH >/dev/null
+                 then
+                     UNAME_PROCESSOR="x86_64"
+                 fi
+               fi ;;
            unknown) UNAME_PROCESSOR=powerpc ;;
        esac
        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
diff --git a/config.h.in b/config.h.in
new file mode 100644 (file)
index 0000000..734bb5a
--- /dev/null
@@ -0,0 +1,89 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* always defined to indicate that i18n is enabled */
+#undef ENABLE_NLS
+
+/* Gettext package. */
+#undef GETTEXT_PACKAGE
+
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#undef HAVE_BIND_TEXTDOMAIN_CODESET
+
+/* Define to 1 if you have the `dcgettext' function. */
+#undef HAVE_DCGETTEXT
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#undef HAVE_LC_MESSAGES
+
+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* File offset bits */
+#undef _FILE_OFFSET_BITS
+
+/* Whether to enable large file support */
+#undef _LARGEFILE64_SOURCE
index eb0389a..a39437d 100755 (executable)
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2009-06-11'
+timestamp='2009-04-17'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -153,9 +153,6 @@ case $os in
                os=
                basic_machine=$1
                ;;
-        -bluegene*)
-               os=-cnk
-               ;;
        -sim | -cisco | -oki | -wec | -winbond)
                os=
                basic_machine=$1
@@ -470,10 +467,6 @@ case $basic_machine in
                basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
                os=-linux
                ;;
-       bluegene*)
-               basic_machine=powerpc-ibm
-               os=-cnk
-               ;;
        c90)
                basic_machine=c90-cray
                os=-unicos
@@ -1267,7 +1260,7 @@ case $os in
        # Each alternative MUST END IN A *, to match a version number.
        # -sysv* is not here because it comes later, after sysvr4.
        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-             | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+             | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
              | -kopensolaris* \
              | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
@@ -1620,7 +1613,7 @@ case $basic_machine in
                        -sunos*)
                                vendor=sun
                                ;;
-                       -cnk*|-aix*)
+                       -aix*)
                                vendor=ibm
                                ;;
                        -beos*)
index 1be39c8..34785b5 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,10 +1,14 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for pcmanfm 0.5.2.
+# Generated by GNU Autoconf 2.65 for pcmanfm 0.9.5.
+#
+# Report bugs to <http://pcmanfm.sf.net/>.
+#
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
@@ -226,10 +230,11 @@ fi
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: http://pcmanfm.sf.net/ about your system, including any
+$0: error possibly output before this message. Then install
+$0: a modern shell, or manually run the script under such a
+$0: shell if you do have one."
   fi
   exit 1
 fi
@@ -673,7 +678,8 @@ fi
 
 
 
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -695,12 +701,11 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='pcmanfm'
 PACKAGE_TARNAME='pcmanfm'
-PACKAGE_VERSION='0.5.2'
-PACKAGE_STRING='pcmanfm 0.5.2'
-PACKAGE_BUGREPORT=''
+PACKAGE_VERSION='0.9.5'
+PACKAGE_STRING='pcmanfm 0.9.5'
+PACKAGE_BUGREPORT='http://pcmanfm.sf.net/'
 PACKAGE_URL=''
 
-ac_unique_file="src/main.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -753,21 +758,19 @@ CATOBJEXT
 CATALOGS
 MSGFMT_OPTS
 GETTEXT_PACKAGE
-DESKTOP_INTEGRATION_FALSE
-DESKTOP_INTEGRATION_TRUE
-FAM_LIBS
-FAM_CFLAGS
-USE_HAL_FALSE
-USE_HAL_TRUE
-HAL_LIBS
-HAL_CFLAGS
-G_CAST_CHECKS
-SN_LIBS
-SN_CFLAGS
+MENU_CACHE_LIBS
+MENU_CACHE_CFLAGS
+FM_LIBS
+FM_CFLAGS
+GMODULE_LIBS
+GMODULE_CFLAGS
+GIO_LIBS
+GIO_CFLAGS
 GTK_LIBS
 GTK_CFLAGS
+XLIB_LIBS
+XLIB_CFLAGS
 PKG_CONFIG
-LIBTOOL_EXPORT_OPTIONS
 DATADIRNAME
 ALL_LINGUAS
 INTLTOOL_PERL
@@ -798,6 +801,7 @@ INTLTOOL_EXTRACT
 INTLTOOL_MERGE
 INTLTOOL_UPDATE
 USE_NLS
+G_CAST_CHECKS
 CPP
 OTOOL64
 OTOOL
@@ -842,9 +846,6 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
 am__untar
 am__tar
 AMTAR
@@ -909,22 +910,17 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_maintainer_mode
-enable_static
 enable_dependency_tracking
 enable_shared
+enable_static
 with_pic
 enable_fast_install
 with_gnu_ld
 enable_libtool_lock
-enable_nls
-enable_cast_checks
-enable_hal
-enable_inotify
 enable_largefile
-enable_superuser_checks
-with_preferable_sudo
-enable_desktop_integration
+enable_cast_checks
+enable_debug
+enable_nls
 '
       ac_precious_vars='build_alias
 host_alias
@@ -936,12 +932,18 @@ LIBS
 CPPFLAGS
 CPP
 PKG_CONFIG
+XLIB_CFLAGS
+XLIB_LIBS
 GTK_CFLAGS
 GTK_LIBS
-SN_CFLAGS
-SN_LIBS
-HAL_CFLAGS
-HAL_LIBS'
+GIO_CFLAGS
+GIO_LIBS
+GMODULE_CFLAGS
+GMODULE_LIBS
+FM_CFLAGS
+FM_LIBS
+MENU_CACHE_CFLAGS
+MENU_CACHE_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1483,7 +1485,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 pcmanfm 0.5.2 to adapt to many kinds of systems.
+\`configure' configures pcmanfm 0.9.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1553,7 +1555,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pcmanfm 0.5.2:";;
+     short | recursive ) echo "Configuration of pcmanfm 0.9.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1561,27 +1563,17 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-                         (and sometimes confusing) to the casual installer
-  --enable-static[=PKGS]  build static libraries [default=no]
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --disable-nls           do not use Native Language Support
-  --enable-cast-checks    enable Glib casting checks (default: disable)
-  --enable-hal            build with Linux HAL support (default: yes)
-  --enable-inotify        enable experimental Linux inotify support for file
-                          alteration monitor (currently broken) (default: no)
   --enable-largefile      enable Large file support (default: yes)
-  --disable-superuser-checks
-                          disable checks running as super user (useful to
-                          LiveCD or embedded) (default: enable)
-  --disable-desktop-integration
-                          disable desktop integrations such as icons (default:
-                          enable)
+  --enable-cast-checks    enable Glib casting checks (default: disable)
+  --enable-debug          build pcmanfm with debug support [default=no]
+  --disable-nls           do not use Native Language Support
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1589,8 +1581,6 @@ Optional Packages:
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-preferable-sudo=PROG
-                          Specify preferable program to switch to super user
 
 Some influential environment variables:
   CC          C compiler command
@@ -1598,21 +1588,31 @@ Some influential environment variables:
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
+  XLIB_CFLAGS C compiler flags for XLIB, overriding pkg-config
+  XLIB_LIBS   linker flags for XLIB, overriding pkg-config
   GTK_CFLAGS  C compiler flags for GTK, overriding pkg-config
   GTK_LIBS    linker flags for GTK, overriding pkg-config
-  SN_CFLAGS   C compiler flags for SN, overriding pkg-config
-  SN_LIBS     linker flags for SN, overriding pkg-config
-  HAL_CFLAGS  C compiler flags for HAL, overriding pkg-config
-  HAL_LIBS    linker flags for HAL, overriding pkg-config
+  GIO_CFLAGS  C compiler flags for GIO, overriding pkg-config
+  GIO_LIBS    linker flags for GIO, overriding pkg-config
+  GMODULE_CFLAGS
+              C compiler flags for GMODULE, overriding pkg-config
+  GMODULE_LIBS
+              linker flags for GMODULE, overriding pkg-config
+  FM_CFLAGS   C compiler flags for FM, overriding pkg-config
+  FM_LIBS     linker flags for FM, overriding pkg-config
+  MENU_CACHE_CFLAGS
+              C compiler flags for MENU_CACHE, overriding pkg-config
+  MENU_CACHE_LIBS
+              linker flags for MENU_CACHE, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to the package provider.
+Report bugs to <http://pcmanfm.sf.net/>.
 _ACEOF
 ac_status=$?
 fi
@@ -1675,8 +1675,8 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pcmanfm configure 0.5.2
-generated by GNU Autoconf 2.64
+pcmanfm configure 0.9.5
+generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1723,7 +1723,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
        ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
 
@@ -1769,7 +1769,7 @@ fi
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
 
@@ -1837,7 +1837,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
     ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
 
@@ -1879,7 +1879,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
 
@@ -2020,6 +2020,12 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to http://pcmanfm.sf.net/ ##
+## ------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
@@ -2040,8 +2046,8 @@ 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 pcmanfm $as_me 0.5.2, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+It was created by pcmanfm $as_me 0.9.5, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -2294,7 +2300,7 @@ fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
@@ -2303,9 +2309,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
@@ -2387,7 +2393,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-
 am__api_version='1.11'
 
 ac_aux_dir=
@@ -2725,6 +2730,7 @@ IFS=$as_save_IFS
 
 fi
 
+  test -d ./--version && rmdir ./--version
   if test "${ac_cv_path_mkdir+set}" = set; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
@@ -2732,7 +2738,6 @@ fi
     # value for MKDIR_P within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
@@ -2849,7 +2854,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='pcmanfm'
- VERSION='0.5.2'
+ VERSION='0.9.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2890,61 +2895,10 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-       IFS="$lt_save_ifs"
-       if test "X$pkg" = "X$p"; then
-         enable_static=yes
-       fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=no
-fi
-
-
-
-
-
-
-
-
+ac_config_headers="$ac_config_headers config.h"
 
 
+# Checks for programs.
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -3329,32 +3283,30 @@ $as_echo "$ac_try_echo"; } >&5
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+
 int
 main ()
 {
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
@@ -3416,10 +3368,10 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
 else
   ac_file=''
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then :
-  $as_echo "$as_me: failed program was:" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -3427,51 +3379,18 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { as_fn_set_status 77
 as_fn_error "C compiler cannot create executables
 See \`config.log' for more details." "$LINENO" 5; }; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-       cross_compiling=yes
-    else
-       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
@@ -3504,13 +3423,72 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." "$LINENO" 5; }
 fi
-rm -f conftest$ac_cv_exeext
+rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+       cross_compiling=yes
+    else
+       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then :
@@ -4280,8 +4258,8 @@ $as_echo "$ac_try_echo"; } >&5
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
@@ -4633,8 +4611,8 @@ esac
 
 
 
-macro_version='2.2.6'
-macro_revision='1.3012'
+macro_version='2.2.6b'
+macro_revision='1.3017'
 
 
 
@@ -5305,13 +5283,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5308: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5286: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5311: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5289: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5314: output\"" >&5)
+  (eval echo "\"\$as_me:5292: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5777,7 +5755,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -6516,7 +6494,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6519 "configure"' > conftest.$ac_ext
+  echo '#line 6497 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7587,6 +7565,36 @@ fi
 
 
 
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+       IFS="$lt_save_ifs"
+       if test "X$pkg" = "X$p"; then
+         enable_static=yes
+       fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=yes
+fi
+
+
+
+
+
+
+
+
 
 
 # Check whether --with-pic was given.
@@ -8012,11 +8020,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8015: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8023: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8019: \$? = $ac_status" >&5
+   echo "$as_me:8027: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8181,7 +8189,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -8351,11 +8359,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8354: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8362: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8358: \$? = $ac_status" >&5
+   echo "$as_me:8366: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8456,11 +8464,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8459: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8467: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8463: \$? = $ac_status" >&5
+   echo "$as_me:8471: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8511,11 +8519,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8514: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8522: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8518: \$? = $ac_status" >&5
+   echo "$as_me:8526: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8654,6 +8662,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -8745,7 +8754,7 @@ _LT_EOF
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
        case $cc_basename in
@@ -10207,7 +10216,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -10894,7 +10903,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10897 "configure"
+#line 10906 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10990,7 +10999,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10993 "configure"
+#line 11002 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11539,8 +11548,8 @@ $as_echo "$ac_try_echo"; } >&5
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
 am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-$as_echo_n "checking whether NLS is requested... " >&6; }
-    # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then :
-  enableval=$enable_nls; USE_NLS=$enableval
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
 else
-  USE_NLS=yes
+  ac_cv_header_stdc=no
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
 
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
 
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
 
+fi
 
-case "$am__api_version" in
-    1.01234)
-       as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
-    ;;
-    *)
-    ;;
-esac
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
 
-if test -n ""; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5
-$as_echo_n "checking for intltool >= ... " >&6; }
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
 
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo  | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+                  (('a' <= (c) && (c) <= 'i') \
+                    || ('j' <= (c) && (c) <= 'r') \
+                    || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+       || toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+
+# Checks for header files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+                  (('a' <= (c) && (c) <= 'i') \
+                    || ('j' <= (c) && (c) <= 'r') \
+                    || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+       || toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+
+# Large file support
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile; largefile=$enableval
+else
+  largefile="yes"
+fi
+
+
+if test x"$largefile" = x"yes"; then
+  CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
+
+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+
+
+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
+
+fi
+
+# Check whether --enable-cast-checks was given.
+if test "${enable_cast_checks+set}" = set; then :
+  enableval=$enable_cast_checks; cast_checks=$enableval
+else
+  cast_checks="no"
+fi
+
+G_CAST_CHECKS=""
+if test x"$cast_checks" = "xno"; then
+    G_CAST_CHECKS="-DG_DISABLE_CAST_CHECKS"
+fi
+
+
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+  enableval=$enable_debug; enable_debug="${enableval}"
+else
+  enable_debug=no
+
+fi
+
+if test "$enable_debug" = "yes"; then
+    # turn on debug and disable optimization
+    CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG -O0 -g"
+else
+    # turn off glib debug checks
+    # G_DISABLE_CAST_CHECKS is already handled by $(G_CAST_CHECKS)
+    CPPFLAGS="$CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
+fi
+
+# intltool
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
+    # Check whether --enable-nls was given.
+if test "${enable_nls+set}" = set; then :
+  enableval=$enable_nls; USE_NLS=$enableval
+else
+  USE_NLS=yes
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+
+
+
+
+case "$am__api_version" in
+    1.01234)
+       as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+    ;;
+    *)
+    ;;
+esac
+
+if test -n "0.40.0"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5
+$as_echo_n "checking for intltool >= 0.40.0... " >&6; }
+
+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
     INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-       as_fn_error "Your intltool is too old.  You need intltool  or later." "$LINENO" 5
+       as_fn_error "Your intltool is too old.  You need intltool 0.40.0 or later." "$LINENO" 5
 fi
 
 # Extract the first word of "intltool-update", so it can be a program name with args.
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
 
-int
-main ()
-{
+# Checks for libraries.
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-                  (('a' <= (c) && (c) <= 'i') \
-                    || ('j' <= (c) && (c) <= 'r') \
-                    || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-       || toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-
-# libtool option to control which symbols are exported
-# right now, symbols starting with _ are not exported
-LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[^_].*"'
-
-
-# check for mmap()
-for ac_header in stdlib.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-for ac_func in getpagesize
-do :
-  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
-if test "x$ac_cv_func_getpagesize" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETPAGESIZE 1
-_ACEOF
-
-fi
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
-$as_echo_n "checking for working mmap... " >&6; }
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_mmap_fixed_mapped=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-/* malloc might have been renamed as rpl_malloc. */
-#undef malloc
-
-/* Thanks to Mike Haertel and Jim Avera for this test.
-   Here is a matrix of mmap possibilities:
-       mmap private not fixed
-       mmap private fixed at somewhere currently unmapped
-       mmap private fixed at somewhere already mapped
-       mmap shared not fixed
-       mmap shared fixed at somewhere currently unmapped
-       mmap shared fixed at somewhere already mapped
-   For private mappings, we should verify that changes cannot be read()
-   back from the file, nor mmap's back from the file at a different
-   address.  (There have been systems where private was not correctly
-   implemented like the infamous i386 svr4.0, and systems where the
-   VM page cache was not coherent with the file system buffer cache
-   like early versions of FreeBSD and possibly contemporary NetBSD.)
-   For shared mappings, we should conversely verify that changes get
-   propagated back to all the places they're supposed to be.
-
-   Grep wants private fixed already mapped.
-   The main things grep needs to know about mmap are:
-   * does it exist and is it safe to write into the mmap'd area
-   * how to use it (BSD variants)  */
-
-#include <fcntl.h>
-#include <sys/mman.h>
-
-#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
-char *malloc ();
-#endif
-
-/* This mess was copied from the GNU getpagesize.h.  */
-#ifndef HAVE_GETPAGESIZE
-/* Assume that all systems that can run configure have sys/param.h.  */
-# ifndef HAVE_SYS_PARAM_H
-#  define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-#  define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-#  ifdef HAVE_SYS_PARAM_H
-#   include <sys/param.h>
-#   ifdef EXEC_PAGESIZE
-#    define getpagesize() EXEC_PAGESIZE
-#   else /* no EXEC_PAGESIZE */
-#    ifdef NBPG
-#     define getpagesize() NBPG * CLSIZE
-#     ifndef CLSIZE
-#      define CLSIZE 1
-#     endif /* no CLSIZE */
-#    else /* no NBPG */
-#     ifdef NBPC
-#      define getpagesize() NBPC
-#     else /* no NBPC */
-#      ifdef PAGESIZE
-#       define getpagesize() PAGESIZE
-#      endif /* PAGESIZE */
-#     endif /* no NBPC */
-#    endif /* no NBPG */
-#   endif /* no EXEC_PAGESIZE */
-#  else /* no HAVE_SYS_PARAM_H */
-#   define getpagesize() 8192  /* punt totally */
-#  endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
-
-int
-main ()
-{
-  char *data, *data2, *data3;
-  int i, pagesize;
-  int fd;
-
-  pagesize = getpagesize ();
-
-  /* First, make a file with some known garbage in it. */
-  data = (char *) malloc (pagesize);
-  if (!data)
-    return 1;
-  for (i = 0; i < pagesize; ++i)
-    *(data + i) = rand ();
-  umask (0);
-  fd = creat ("conftest.mmap", 0600);
-  if (fd < 0)
-    return 1;
-  if (write (fd, data, pagesize) != pagesize)
-    return 1;
-  close (fd);
-
-  /* Next, try to mmap the file at a fixed address which already has
-     something else allocated at it.  If we can, also make sure that
-     we see the same garbage.  */
-  fd = open ("conftest.mmap", O_RDWR);
-  if (fd < 0)
-    return 1;
-  data2 = (char *) malloc (2 * pagesize);
-  if (!data2)
-    return 1;
-  data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
-  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
-                    MAP_PRIVATE | MAP_FIXED, fd, 0L))
-    return 1;
-  for (i = 0; i < pagesize; ++i)
-    if (*(data + i) != *(data2 + i))
-      return 1;
-
-  /* Finally, make sure that changes to the mapped area do not
-     percolate back to the file as seen by read().  (This is a bug on
-     some variants of i386 svr4.0.)  */
-  for (i = 0; i < pagesize; ++i)
-    *(data2 + i) = *(data2 + i) + 1;
-  data3 = (char *) malloc (pagesize);
-  if (!data3)
-    return 1;
-  if (read (fd, data3, pagesize) != pagesize)
-    return 1;
-  for (i = 0; i < pagesize; ++i)
-    if (*(data + i) != *(data3 + i))
-      return 1;
-  close (fd);
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_mmap_fixed_mapped=yes
-else
-  ac_cv_func_mmap_fixed_mapped=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
-$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-
-$as_echo "#define HAVE_MMAP 1" >>confdefs.h
-
-fi
-rm -f conftest.mmap
-
-
-gtk_modules="gtk+-2.0 >= 2.12.0 \
-             gthread-2.0"
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -12866,6 +12856,100 @@ $as_echo "no" >&6; }
 fi
 
 pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB" >&5
+$as_echo_n "checking for XLIB... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XLIB_CFLAGS"; then
+        pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"x11\"\""; } >&5
+  ($PKG_CONFIG --exists --print-errors ""x11"") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags ""x11"" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XLIB_LIBS"; then
+        pkg_cv_XLIB_LIBS="$XLIB_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"x11\"\""; } >&5
+  ($PKG_CONFIG --exists --print-errors ""x11"") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs ""x11"" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+               XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""x11""`
+        else
+               XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""x11""`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$XLIB_PKG_ERRORS" >&5
+
+       as_fn_error "Package requirements (\"x11\") were not met:
+
+$XLIB_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables XLIB_CFLAGS
+and XLIB_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" "$LINENO" 5
+elif test $pkg_failed = untried; then
+       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables XLIB_CFLAGS
+and XLIB_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." "$LINENO" 5; }
+else
+       XLIB_CFLAGS=$pkg_cv_XLIB_CFLAGS
+       XLIB_LIBS=$pkg_cv_XLIB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+       :
+fi
+
+
+
+gtk_modules="gtk+-2.0 >= 2.16.0"
+
+pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
 $as_echo_n "checking for GTK... " >&6; }
 
 
 
 
-sn_modules="libstartup-notification-1.0"
+gio_modules="gthread-2.0 gio-unix-2.0"
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SN" >&5
-$as_echo_n "checking for SN... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO" >&5
+$as_echo_n "checking for GIO... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
-    if test -n "$SN_CFLAGS"; then
-        pkg_cv_SN_CFLAGS="$SN_CFLAGS"
+    if test -n "$GIO_CFLAGS"; then
+        pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$sn_modules\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "$sn_modules") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gio_modules\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$gio_modules") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SN_CFLAGS=`$PKG_CONFIG --cflags "$sn_modules" 2>/dev/null`
+  pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "$gio_modules" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12982,16 +13066,16 @@ else
        pkg_failed=untried
 fi
 if test -n "$PKG_CONFIG"; then
-    if test -n "$SN_LIBS"; then
-        pkg_cv_SN_LIBS="$SN_LIBS"
+    if test -n "$GIO_LIBS"; then
+        pkg_cv_GIO_LIBS="$GIO_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$sn_modules\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "$sn_modules") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gio_modules\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$gio_modules") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SN_LIBS=`$PKG_CONFIG --libs "$sn_modules" 2>/dev/null`
+  pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "$gio_modules" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -13010,22 +13094,22 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-               SN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$sn_modules"`
+               GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gio_modules"`
         else
-               SN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$sn_modules"`
+               GIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gio_modules"`
         fi
        # Put the nasty error message in config.log where it belongs
-       echo "$SN_PKG_ERRORS" >&5
+       echo "$GIO_PKG_ERRORS" >&5
 
-       as_fn_error "Package requirements ($sn_modules) were not met:
+       as_fn_error "Package requirements ($gio_modules) were not met:
 
-$SN_PKG_ERRORS
+$GIO_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively, you may set the environment variables SN_CFLAGS
-and SN_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables GIO_CFLAGS
+and GIO_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " "$LINENO" 5
 elif test $pkg_failed = untried; then
@@ -13035,15 +13119,15 @@ as_fn_error "The pkg-config script could not be found or is too old.  Make sure
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
-Alternatively, you may set the environment variables SN_CFLAGS
-and SN_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables GIO_CFLAGS
+and GIO_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." "$LINENO" 5; }
 else
-       SN_CFLAGS=$pkg_cv_SN_CFLAGS
-       SN_LIBS=$pkg_cv_SN_LIBS
+       GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
+       GIO_LIBS=$pkg_cv_GIO_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
        :
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts --as-needed" >&5
-$as_echo_n "checking whether $LD accepts --as-needed... " >&6; }
-case `$LD --as-needed -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  LDFLAGS="$LDFLAGS -Wl,--as-needed"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  ;;
-*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts -O1" >&5
-$as_echo_n "checking whether $LD accepts -O1... " >&6; }
-case `$LD -O1 -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  LDFLAGS="$LDFLAGS -Wl,-O1"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  ;;
-*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts -Bsymbolic-functions" >&5
-$as_echo_n "checking whether $LD accepts -Bsymbolic-functions... " >&6; }
-case `$LD -Bsymbolic-functions -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+gmodule_modules="gmodule-2.0"
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5
+$as_echo_n "checking for GMODULE... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GMODULE_CFLAGS"; then
+        pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gmodule_modules\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$gmodule_modules") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "$gmodule_modules" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GMODULE_LIBS"; then
+        pkg_cv_GMODULE_LIBS="$GMODULE_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gmodule_modules\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$gmodule_modules") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "$gmodule_modules" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+               GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gmodule_modules"`
+        else
+               GMODULE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gmodule_modules"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$GMODULE_PKG_ERRORS" >&5
+
+       as_fn_error "Package requirements ($gmodule_modules) were not met:
+
+$GMODULE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GMODULE_CFLAGS
+and GMODULE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" "$LINENO" 5
+elif test $pkg_failed = untried; then
+       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GMODULE_CFLAGS
+and GMODULE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." "$LINENO" 5; }
+else
+       GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS
+       GMODULE_LIBS=$pkg_cv_GMODULE_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-  ;;
-*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  ;;
-esac
+       :
+fi
 
-# Check whether --enable-cast-checks was given.
-if test "${enable_cast_checks+set}" = set; then :
-  enableval=$enable_cast_checks; cast_checks=$enableval
+
+
+fm_modules="libfm-gtk >= 0.1.10"
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FM" >&5
+$as_echo_n "checking for FM... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$FM_CFLAGS"; then
+        pkg_cv_FM_CFLAGS="$FM_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fm_modules\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$fm_modules") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_FM_CFLAGS=`$PKG_CONFIG --cflags "$fm_modules" 2>/dev/null`
 else
-  cast_checks="no"
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$FM_LIBS"; then
+        pkg_cv_FM_LIBS="$FM_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fm_modules\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$fm_modules") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_FM_LIBS=`$PKG_CONFIG --libs "$fm_modules" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
 fi
 
-G_CAST_CHECKS=""
-if test x"$cast_checks" = "xno"; then
-    G_CAST_CHECKS="-DG_DISABLE_CAST_CHECKS"
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
 fi
+        if test $_pkg_short_errors_supported = yes; then
+               FM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fm_modules"`
+        else
+               FM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fm_modules"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$FM_PKG_ERRORS" >&5
+
+       as_fn_error "Package requirements ($fm_modules) were not met:
+
+$FM_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables FM_CFLAGS
+and FM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" "$LINENO" 5
+elif test $pkg_failed = untried; then
+       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
 
+Alternatively, you may set the environment variables FM_CFLAGS
+and FM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
 
-# Check whether --enable-hal was given.
-if test "${enable_hal+set}" = set; then :
-  enableval=$enable_hal; use_hal=$enableval
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." "$LINENO" 5; }
 else
-  use_hal="yes"
+       FM_CFLAGS=$pkg_cv_FM_CFLAGS
+       FM_LIBS=$pkg_cv_FM_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+       :
 fi
 
 
-if test x"$use_hal" = x"yes"; then
-    hal_modules="dbus-glib-1 >= 0.31 hal >= 0.5.0 hal-storage"
+
+menu_modules="libmenu-cache >= 0.3.2"
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5
-$as_echo_n "checking for HAL... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MENU_CACHE" >&5
+$as_echo_n "checking for MENU_CACHE... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
-    if test -n "$HAL_CFLAGS"; then
-        pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
+    if test -n "$MENU_CACHE_CFLAGS"; then
+        pkg_cv_MENU_CACHE_CFLAGS="$MENU_CACHE_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$hal_modules\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "$hal_modules") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$menu_modules\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$menu_modules") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "$hal_modules" 2>/dev/null`
+  pkg_cv_MENU_CACHE_CFLAGS=`$PKG_CONFIG --cflags "$menu_modules" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -13138,16 +13348,16 @@ else
        pkg_failed=untried
 fi
 if test -n "$PKG_CONFIG"; then
-    if test -n "$HAL_LIBS"; then
-        pkg_cv_HAL_LIBS="$HAL_LIBS"
+    if test -n "$MENU_CACHE_LIBS"; then
+        pkg_cv_MENU_CACHE_LIBS="$MENU_CACHE_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$hal_modules\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "$hal_modules") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$menu_modules\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$menu_modules") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "$hal_modules" 2>/dev/null`
+  pkg_cv_MENU_CACHE_LIBS=`$PKG_CONFIG --libs "$menu_modules" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -13166,249 +13376,60 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-               HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$hal_modules"`
+               MENU_CACHE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$menu_modules"`
         else
-               HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$hal_modules"`
+               MENU_CACHE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$menu_modules"`
         fi
        # Put the nasty error message in config.log where it belongs
-       echo "$HAL_PKG_ERRORS" >&5
-
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                have_hal=no
-elif test $pkg_failed = untried; then
-       have_hal=no
-else
-       HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
-       HAL_LIBS=$pkg_cv_HAL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-       have_hal=yes
-fi
-
-    if test x"$have_hal" = x"yes"; then
-
-$as_echo "#define HAVE_HAL 1" >>confdefs.h
-
-    else
-        as_fn_error "To use HAL support, you must have developing packages of dbus-glib-1 (>=0.31), hal(>=0.5.0), and hal-storage, or you can use --disable-hal to disable HAL support." "$LINENO" 5
-    fi
-fi
- if test "$use_hal" = "yes"; then
-  USE_HAL_TRUE=
-  USE_HAL_FALSE='#'
-else
-  USE_HAL_TRUE='#'
-  USE_HAL_FALSE=
-fi
-
-
+       echo "$MENU_CACHE_PKG_ERRORS" >&5
 
+       as_fn_error "Package requirements ($menu_modules) were not met:
 
-# Check whether --enable-inotify was given.
-if test "${enable_inotify+set}" = set; then :
-  enableval=$enable_inotify; use_inotify=$enableval
-else
-  use_inotify="no"
-fi
-
-
-if test x"$use_inotify" = x"yes"; then
+$MENU_CACHE_PKG_ERRORS
 
-$as_echo "#define USE_INOTIFY 1" >>confdefs.h
-
-else
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
 
-    FAM_CFLAGS=""
-    FAM_LIBS=""
-    have_libfam=no
-    for ac_header in fam.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "fam.h" "ac_cv_header_fam_h" "$ac_includes_default"
-if test "x$ac_cv_header_fam_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FAM_H 1
-_ACEOF
+Alternatively, you may set the environment variables MENU_CACHE_CFLAGS
+and MENU_CACHE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" "$LINENO" 5
+elif test $pkg_failed = untried; then
+       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FAMOpen in -lfam" >&5
-$as_echo_n "checking for FAMOpen in -lfam... " >&6; }
-if test "${ac_cv_lib_fam_FAMOpen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfam  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+Alternatively, you may set the environment variables MENU_CACHE_CFLAGS
+and MENU_CACHE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char FAMOpen ();
-int
-main ()
-{
-return FAMOpen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_fam_FAMOpen=yes
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." "$LINENO" 5; }
 else
-  ac_cv_lib_fam_FAMOpen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fam_FAMOpen" >&5
-$as_echo "$ac_cv_lib_fam_FAMOpen" >&6; }
-if test "x$ac_cv_lib_fam_FAMOpen" = x""yes; then :
-  have_libfam="yes" FAM_LIBS="-lfam"
-fi
-
-
+       MENU_CACHE_CFLAGS=$pkg_cv_MENU_CACHE_CFLAGS
+       MENU_CACHE_LIBS=$pkg_cv_MENU_CACHE_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+       :
 fi
 
-done
-
-
-    if test x"$have_libfam" = x"yes"; then
-
-$as_echo "#define HAVE_FAM_H 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_LIBFAM 1" >>confdefs.h
+GETTEXT_PACKAGE=pcmanfm2
 
 
-                save_LIBS="$LIBS"
-        LIBS="$LIBS $FAM_LIBS"
-        for ac_func in FAMNoExists
-do :
-  ac_fn_c_check_func "$LINENO" "FAMNoExists" "ac_cv_func_FAMNoExists"
-if test "x$ac_cv_func_FAMNoExists" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FAMNOEXISTS 1
-_ACEOF
-
-fi
+# Generate po/LINGUAS on the fly rather than relying on translators
+# to maintain it manually. This also overcome the problem that Transifex
+# cannot add a language to po/LINGUAS if a new po file is submitted.
+rm -f $srcdir/po/LINGUAS
+for po_file in `ls $srcdir/po/*.po | sort`;
+do
+    lang=`echo "$po_file" | sed "s|.*/po/\(.*\)\.po|\1|g"`
+    echo $lang >> $srcdir/po/LINGUAS
 done
 
-        LIBS="$save_LIBS"
-    else
-        as_fn_error "Fatal Error: no fam or gamin detected." "$LINENO" 5
-    fi
-fi
-
-
-
-# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
-  enableval=$enable_largefile; largefile=$enableval
-else
-  largefile="yes"
-fi
-
-
-if test x"$largefile" = x"yes"; then
-  CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-
-$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-
-
-$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
-
-fi
-
-# Check whether --enable-superuser-checks was given.
-if test "${enable_superuser_checks+set}" = set; then :
-  enableval=$enable_superuser_checks; superuser_checks=$enableval
-else
-  superuser_checks="yes"
-fi
-
-if test x"$superuser_checks" = "xyes"; then
-
-$as_echo "#define SUPER_USER_CHECKS 1" >>confdefs.h
-
-fi
-
-
-# Check whether --with-preferable-sudo was given.
-if test "${with_preferable_sudo+set}" = set; then :
-  withval=$with_preferable_sudo;  preferable_sudo="$withval"
-fi
-
-if test ! -z "$preferable_sudo"; then
-  CPPFLAGS="$CPPFLAGS -DPREFERABLE_SUDO_PROG=\\\"$preferable_sudo\\\""
-fi
-
-# Check whether --enable-desktop-integration was given.
-if test "${enable_desktop_integration+set}" = set; then :
-  enableval=$enable_desktop_integration; desktop_integration=$enableval
-else
-  desktop_integration="yes"
-fi
-
-if test x"$desktop_integration" = "xyes"; then
-
-$as_echo "#define DESKTOP_INTEGRATION 1" >>confdefs.h
-
-fi
- if test "$desktop_integration" = "yes"; then
-  DESKTOP_INTEGRATION_TRUE=
-  DESKTOP_INTEGRATION_FALSE='#'
-else
-  DESKTOP_INTEGRATION_TRUE='#'
-  DESKTOP_INTEGRATION_FALSE=
-fi
-
-
-CPPFLAGS="$CPPFLAGS -fstrict-aliasing -fmessage-length=0"
-
-ac_fn_c_check_func "$LINENO" "euidaccess" "ac_cv_func_euidaccess"
-if test "x$ac_cv_func_euidaccess" = x""yes; then :
-
-$as_echo "#define HAVE_EUIDACCESS /**/" >>confdefs.h
-
-fi
-
-ac_fn_c_check_func "$LINENO" "eaccess" "ac_cv_func_eaccess"
-if test "x$ac_cv_func_eaccess" = x""yes; then :
-
-$as_echo "#define HAVE_EACCESS /**/" >>confdefs.h
-
-fi
-
-
-ac_fn_c_check_func "$LINENO" "statvfs" "ac_cv_func_statvfs"
-if test "x$ac_cv_func_statvfs" = x""yes; then :
-
-$as_echo "#define HAVE_STATVFS /**/" >>confdefs.h
-
-fi
-
-
-
-# Gtk Builder
-#AC_PATH_PROG([GTK_BUILDER_CONVERT],[gtk-builder-convert],[false])
-#if test "$GTK_BUILDER_CONVERT" = "false"; then
-#  AC_MSG_ERROR([gtk-builder-convert not found])
-#fi
-
-
-GETTEXT_PACKAGE=pcmanfm
-
-
-cat >>confdefs.h <<_ACEOF
-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
-_ACEOF
-
-
-ALL_LINGUAS="af ar da ca cs de es et eu fa fi fr gl he hr hu id it ja ko lt ml ms nb nl nn pl ps pt pt_BR ru sk sl sv tr uk ur ur_PK vi zh_CN zh_TW"
 
    for ac_header in locale.h
 do :
@@ -14114,7 +14135,13 @@ $as_echo "$LINGUAS" >&6; }
        < $srcdir/po/POTFILES.in > po/POTFILES
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in data/Makefile data/pcmanfm.desktop data/pcmanfm-find.desktop data/pcmanfm-folder-handler.desktop"
+cat >>confdefs.h <<_ACEOF
+#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
+_ACEOF
+
+
+ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in data/Makefile data/ui/Makefile data/ui/about.glade data/pcmanfm2.desktop"
+
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -14195,43 +14222,7 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-ac_script='
-:mline
-/\\$/{
- N
- s,\\\n,,
- b mline
-}
-t clear
-:clear
-s/^[    ]*#[    ]*define[       ][      ]*\([^  (][^    (]*([^)]*)\)[   ]*\(.*\)/-D\1=\2/g
-t quote
-s/^[    ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)/-D\1=\2/g
-t quote
-b any
-:quote
-s/[     `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-s/\[/\\&/g
-s/\]/\\&/g
-s/\$/$$/g
-H
-:any
-${
-       g
-       s/^\n//
-       s/\n/ /g
-       p
-}
-'
-DEFS=`sed -n "$ac_script" confdefs.h`
-
+DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
@@ -14257,10 +14248,6 @@ else
   am__EXEEXT_FALSE=
 fi
 
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
   ac_config_commands="$ac_config_commands po/stamp-it"
 
 
-if test -z "${USE_HAL_TRUE}" && test -z "${USE_HAL_FALSE}"; then
-  as_fn_error "conditional \"USE_HAL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${DESKTOP_INTEGRATION_TRUE}" && test -z "${DESKTOP_INTEGRATION_FALSE}"; then
-  as_fn_error "conditional \"DESKTOP_INTEGRATION\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
@@ -14697,8 +14676,8 @@ 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 pcmanfm $as_me 0.5.2, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+This file was extended by pcmanfm $as_me 0.9.5, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -14715,11 +14694,15 @@ case $ac_config_files in *"
 "*) set x $ac_config_files; shift; ac_config_files=$*;;
 esac
 
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
 
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
+config_headers="$ac_config_headers"
 config_commands="$ac_config_commands"
 
 _ACEOF
@@ -14734,27 +14717,34 @@ Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
       --file=FILE[:TEMPLATE]
                    instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
 
+Configuration headers:
+$config_headers
+
 Configuration commands:
 $config_commands
 
-Report bugs to the package provider."
+Report bugs to <http://pcmanfm.sf.net/>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pcmanfm config.status 0.5.2
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+pcmanfm config.status 0.9.5
+configured by $0, generated by GNU Autoconf 2.65,
+  with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@@ -14792,6 +14782,8 @@ do
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
-  --he | --h |  --help | --hel | -h )
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
@@ -14862,10 +14865,10 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
 macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
 macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
 enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
 host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
@@ -15118,6 +15121,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
@@ -15125,9 +15129,9 @@ do
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
-    "data/pcmanfm.desktop") CONFIG_FILES="$CONFIG_FILES data/pcmanfm.desktop" ;;
-    "data/pcmanfm-find.desktop") CONFIG_FILES="$CONFIG_FILES data/pcmanfm-find.desktop" ;;
-    "data/pcmanfm-folder-handler.desktop") CONFIG_FILES="$CONFIG_FILES data/pcmanfm-folder-handler.desktop" ;;
+    "data/ui/Makefile") CONFIG_FILES="$CONFIG_FILES data/ui/Makefile" ;;
+    "data/ui/about.glade") CONFIG_FILES="$CONFIG_FILES data/ui/about.glade" ;;
+    "data/pcmanfm2.desktop") CONFIG_FILES="$CONFIG_FILES data/pcmanfm2.desktop" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@@ -15141,6 +15145,7 @@ done
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
@@ -15231,7 +15236,7 @@ s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -15245,7 +15250,7 @@ s/.\{148\}//
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[    ]*#[    ]*define[       ][      ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[    ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[        ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[    ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[        ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = "\a"
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
 
-eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
 shift
 for ac_tag
 do
@@ -15538,7 +15651,64 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
   esac \
   || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
-
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+       || as_fn_error "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$_am_arg" : 'X\(//\)[^/]' \| \
+        X"$_am_arg" : 'X\(//\)$' \| \
+        X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)[^/].*/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
 
   :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
@@ -15695,9 +15865,6 @@ available_tags=""
 
 # ### BEGIN LIBTOOL CONFIG
 
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
 # Which release of libtool.m4 was used?
 macro_version=$macro_version
 macro_revision=$macro_revision
@@ -15705,6 +15872,9 @@ macro_revision=$macro_revision
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
 
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
 # What type of objects to build.
 pic_mode=$pic_mode
 
@@ -16339,24 +16509,4 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
-echo
-echo PCMan File Manager........................... : Version $VERSION
-echo
-echo Prefix....................................... : $prefix
-echo Linux HAL support............................ : $use_hal
-echo Linux inotify support \(currently broken\)..... : $use_inotify
-echo 64-bit Large file support.................... : $largefile
-echo Show warnings if run as super user........... : $superuser_checks
-if test ! -z "$preferable_sudo"; then
-echo Preferable program to switch to super user... : $preferable_sudo
-fi
-echo Desktop icon integration..................... : $desktop_integration
-echo
-echo The binary will be installed in $prefix/bin
-echo
-echo http://pcmanfm.sourceforge.net/
-echo
-echo Please read README carefully if you are packaging PCManFM.
-echo
-echo
-
+echo Ready to make pcmanfm
diff --git a/configure.ac b/configure.ac
new file mode 100644 (file)
index 0000000..26a9c26
--- /dev/null
@@ -0,0 +1,124 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.63])
+AC_INIT([pcmanfm], [0.9.5], [http://pcmanfm.sf.net/])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+
+AC_CONFIG_HEADERS([config.h])
+
+# Checks for programs.
+AC_ISC_POSIX
+AC_PROG_CC
+AM_PROG_LIBTOOL
+AM_PROG_CC_STDC
+AC_HEADER_STDC
+
+# Checks for header files.
+AC_HEADER_STDC
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+
+# Large file support
+AC_ARG_ENABLE([largefile],
+    AS_HELP_STRING([--enable-largefile],
+        [enable Large file support (default: yes)]),
+    largefile=$enableval, largefile="yes")
+
+if test x"$largefile" = x"yes"; then
+  CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
+  AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
+  AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits])
+fi
+
+AC_ARG_ENABLE(
+    [cast-checks],
+    AS_HELP_STRING([--enable-cast-checks],
+                   [enable Glib casting checks (default: disable)]),
+    cast_checks=$enableval, cast_checks="no")
+G_CAST_CHECKS=""
+if test x"$cast_checks" = "xno"; then
+    G_CAST_CHECKS="-DG_DISABLE_CAST_CHECKS"
+fi
+AC_SUBST(G_CAST_CHECKS)
+
+AC_ARG_ENABLE(debug,
+       [AC_HELP_STRING([--enable-debug],
+               [build pcmanfm with debug support @<:@default=no@:>@])],
+       [enable_debug="${enableval}"],
+       [enable_debug=no]
+)
+if test "$enable_debug" = "yes"; then
+    # turn on debug and disable optimization
+    CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG -O0 -g"
+else
+    # turn off glib debug checks
+    # G_DISABLE_CAST_CHECKS is already handled by $(G_CAST_CHECKS)
+    CPPFLAGS="$CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
+fi
+
+# intltool
+IT_PROG_INTLTOOL([0.40.0])
+
+# Checks for libraries.
+
+PKG_CHECK_MODULES(XLIB, "x11")
+AC_SUBST(XLIB_CFLAGS)
+AC_SUBST(XLIB_LIBS)
+
+gtk_modules="gtk+-2.0 >= 2.16.0"
+PKG_CHECK_MODULES(GTK, [$gtk_modules])
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
+
+gio_modules="gthread-2.0 gio-unix-2.0"
+PKG_CHECK_MODULES(GIO, [$gio_modules])
+AC_SUBST(GIO_CFLAGS)
+AC_SUBST(GIO_LIBS)
+
+gmodule_modules="gmodule-2.0"
+PKG_CHECK_MODULES(GMODULE, [$gmodule_modules])
+AC_SUBST(GMODULE_CFLAGS)
+AC_SUBST(GMODULE_LIBS)
+
+fm_modules="libfm-gtk >= 0.1.10"
+PKG_CHECK_MODULES(FM, [$fm_modules])
+AC_SUBST(FM_CFLAGS)
+AC_SUBST(FM_LIBS)
+
+menu_modules="libmenu-cache >= 0.3.2"
+PKG_CHECK_MODULES(MENU_CACHE, [$menu_modules])
+AC_SUBST(MENU_CACHE_CFLAGS)
+AC_SUBST(MENU_CACHE_LIBS)
+
+GETTEXT_PACKAGE=pcmanfm2
+AC_SUBST(GETTEXT_PACKAGE)
+
+# Generate po/LINGUAS on the fly rather than relying on translators
+# to maintain it manually. This also overcome the problem that Transifex
+# cannot add a language to po/LINGUAS if a new po file is submitted.
+rm -f $srcdir/po/LINGUAS
+for po_file in `ls $srcdir/po/*.po | sort`;
+do
+    lang=`echo "$po_file" | sed "s|.*/po/\(.*\)\.po|\1|g"`
+    echo $lang >> $srcdir/po/LINGUAS
+done
+
+AM_GLIB_GNU_GETTEXT
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
+
+AC_CONFIG_FILES([
+    Makefile
+    src/Makefile
+    po/Makefile.in
+    data/Makefile
+    data/ui/Makefile
+    data/ui/about.glade
+    data/pcmanfm2.desktop
+])
+
+AC_OUTPUT
+
+echo Ready to make pcmanfm
diff --git a/configure.in b/configure.in
deleted file mode 100644 (file)
index c9c5fbd..0000000
+++ /dev/null
@@ -1,233 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT([pcmanfm], [0.5.2])
-AC_CONFIG_SRCDIR([src/main.c])
-AM_INIT_AUTOMAKE([dist-bzip2])
-AM_MAINTAINER_MODE
-
-AM_DISABLE_STATIC
-
-AC_ISC_POSIX
-AC_PROG_CC
-AM_PROG_LIBTOOL
-AM_PROG_CC_STDC
-AC_PROG_INTLTOOL
-AC_HEADER_STDC
-
-# libtool option to control which symbols are exported
-# right now, symbols starting with _ are not exported
-LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
-AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
-
-# check for mmap()
-AC_FUNC_MMAP
-
-gtk_modules="gtk+-2.0 >= 2.12.0 \
-             gthread-2.0"
-PKG_CHECK_MODULES(GTK, [$gtk_modules])
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
-
-sn_modules="libstartup-notification-1.0"
-PKG_CHECK_MODULES(SN, [$sn_modules])
-AC_SUBST(SN_CFLAGS)
-AC_SUBST(SN_LIBS)
-
-dnl linker optimizations
-AC_MSG_CHECKING([whether $LD accepts --as-needed])
-case `$LD --as-needed -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  LDFLAGS="$LDFLAGS -Wl,--as-needed"
-  AC_MSG_RESULT([yes])
-  ;;
-*)
-  AC_MSG_RESULT([no])
-  ;;
-esac
-AC_MSG_CHECKING([whether $LD accepts -O1])
-case `$LD -O1 -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  LDFLAGS="$LDFLAGS -Wl,-O1"
-  AC_MSG_RESULT([yes])
-  ;;
-*)
-  AC_MSG_RESULT([no])
-  ;;
-esac
-AC_MSG_CHECKING([whether $LD accepts -Bsymbolic-functions])
-case `$LD -Bsymbolic-functions -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions"
-  AC_MSG_RESULT([yes])
-  ;;
-*)                                                                              
-  AC_MSG_RESULT([no])
-  ;;
-esac
-
-AC_ARG_ENABLE(
-    [cast-checks],
-    AS_HELP_STRING([--enable-cast-checks],
-                   [enable Glib casting checks (default: disable)]),
-    cast_checks=$enableval, cast_checks="no")
-G_CAST_CHECKS=""
-if test x"$cast_checks" = "xno"; then
-    G_CAST_CHECKS="-DG_DISABLE_CAST_CHECKS"
-fi
-AC_SUBST(G_CAST_CHECKS)
-
-AC_ARG_ENABLE(
-    [hal],
-    AS_HELP_STRING([--enable-hal],
-                   [build with Linux HAL support (default: yes)]),
-    use_hal=$enableval, use_hal="yes")
-
-if test x"$use_hal" = x"yes"; then
-dnl Check HAL support
-    hal_modules="dbus-glib-1 >= 0.31 hal >= 0.5.0 hal-storage"
-    PKG_CHECK_MODULES(HAL, [$hal_modules], [have_hal=yes], [have_hal=no])
-
-    if test x"$have_hal" = x"yes"; then
-        AC_DEFINE([HAVE_HAL], [1], [Define to 1 if you have HAL.])
-    else
-        AC_MSG_ERROR([To use HAL support, you must have developing packages of dbus-glib-1 (>=0.31), hal(>=0.5.0), and hal-storage, or you can use --disable-hal to disable HAL support.])
-    fi
-fi
-AM_CONDITIONAL(USE_HAL, test "$use_hal" = "yes")
-AC_SUBST(HAL_CFLAGS)
-AC_SUBST(HAL_LIBS)
-
-AC_ARG_ENABLE([inotify],
-    AS_HELP_STRING([--enable-inotify],
-        [enable experimental Linux inotify support for file alteration monitor (currently broken) (default: no)]),
-    use_inotify=$enableval, use_inotify="no")
-
-if test x"$use_inotify" = x"yes"; then
-    dnl Linux inotify is enabled.
-    dnl So, both of FAM and gamin are not needed.
-  AC_DEFINE(USE_INOTIFY, 1, [Whether to enable Linux inotify support])
-else
-    dnl ***************************
-    dnl *** Check for Gamin/FAM ***
-    dnl ***************************
-    dnl *Modified from XFCE Thunar*
-
-    FAM_CFLAGS=""
-    FAM_LIBS=""
-    have_libfam=no
-    AC_CHECK_HEADERS([fam.h],
-    [
-        AC_CHECK_LIB([fam], [FAMOpen], [have_libfam="yes" FAM_LIBS="-lfam"])
-    ])
-
-    if test x"$have_libfam" = x"yes"; then
-        dnl Define appropriate symbols
-        AC_DEFINE([HAVE_FAM_H], [1], [Define to 1 if you have the <fam.h> header file.])
-        AC_DEFINE([HAVE_LIBFAM], [1], [Define to 1 if the File Alteration Monitor is available.])
-
-        dnl Check for FAMNoExists (currently Gamin only)
-        save_LIBS="$LIBS"
-        LIBS="$LIBS $FAM_LIBS"
-        AC_CHECK_FUNCS([FAMNoExists])
-        LIBS="$save_LIBS"
-    else
-        AC_MSG_ERROR([Fatal Error: no fam or gamin detected.])
-    fi
-fi
-AC_SUBST([FAM_CFLAGS])
-AC_SUBST([FAM_LIBS])
-
-AC_ARG_ENABLE([largefile],
-    AS_HELP_STRING([--enable-largefile],
-        [enable Large file support (default: yes)]),
-    largefile=$enableval, largefile="yes")
-
-if test x"$largefile" = x"yes"; then
-  CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-  AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
-  AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits])
-fi
-
-AC_ARG_ENABLE(
-    [superuser-checks],
-    AS_HELP_STRING([--disable-superuser-checks],
-                   [disable checks running as super user (useful to LiveCD or embedded) (default: enable)]),
-    superuser_checks=$enableval, superuser_checks="yes")
-if test x"$superuser_checks" = "xyes"; then
-  AC_DEFINE(SUPER_USER_CHECKS, 1, [Whether to check running as super user or not])
-fi
-
-AC_ARG_WITH(
-    [preferable-sudo],
-    AS_HELP_STRING([--with-preferable-sudo=PROG],
-                   [Specify preferable program to switch to super user]),
-                   [ preferable_sudo="$withval" ])
-if test ! -z "$preferable_sudo"; then
-  CPPFLAGS="$CPPFLAGS -DPREFERABLE_SUDO_PROG=\\\"$preferable_sudo\\\""
-fi
-
-AC_ARG_ENABLE(
-    [desktop-integration],
-    AS_HELP_STRING([--disable-desktop-integration],
-                   [disable desktop integrations such as icons (default: enable)]),
-    desktop_integration=$enableval, desktop_integration="yes")
-if test x"$desktop_integration" = "xyes"; then
-  AC_DEFINE(DESKTOP_INTEGRATION, 1, [Whether to integrate desktop or not.])
-fi
-AM_CONDITIONAL(DESKTOP_INTEGRATION, test "$desktop_integration" = "yes")
-
-dnl advanced compiler tweaking
-CPPFLAGS="$CPPFLAGS -fstrict-aliasing -fmessage-length=0"
-
-AC_CHECK_FUNC(euidaccess,[AC_DEFINE(HAVE_EUIDACCESS,[],[Define to 1 if euidaccess is available])])
-AC_CHECK_FUNC(eaccess,[AC_DEFINE(HAVE_EACCESS,[],[Define to 1 if eaccess is available])])
-
-AC_CHECK_FUNC(statvfs,[AC_DEFINE(HAVE_STATVFS,[],[Define to 1 if statvfs is available])])
-
-
-# Gtk Builder
-#AC_PATH_PROG([GTK_BUILDER_CONVERT],[gtk-builder-convert],[false])
-#if test "$GTK_BUILDER_CONVERT" = "false"; then
-#  AC_MSG_ERROR([gtk-builder-convert not found])
-#fi
-
-
-GETTEXT_PACKAGE=pcmanfm
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
-
-dnl Add the languages which your application supports here.
-ALL_LINGUAS="af ar da ca cs de es et eu fa fi fr gl he hr hu id it ja ko lt ml ms nb nl nn pl ps pt pt_BR ru sk sl sv tr uk ur ur_PK vi zh_CN zh_TW"
-AM_GLIB_GNU_GETTEXT
-
-AC_OUTPUT([
-Makefile
-src/Makefile
-po/Makefile.in
-data/Makefile
-data/pcmanfm.desktop
-data/pcmanfm-find.desktop
-data/pcmanfm-folder-handler.desktop
-])
-
-echo
-echo PCMan File Manager........................... : Version $VERSION
-echo
-echo Prefix....................................... : $prefix
-echo Linux HAL support............................ : $use_hal
-echo Linux inotify support \(currently broken\)..... : $use_inotify
-echo 64-bit Large file support.................... : $largefile
-echo Show warnings if run as super user........... : $superuser_checks
-if test ! -z "$preferable_sudo"; then
-echo Preferable program to switch to super user... : $preferable_sudo
-fi
-echo Desktop icon integration..................... : $desktop_integration
-echo
-echo The binary will be installed in $prefix/bin
-echo
-echo http://pcmanfm.sourceforge.net/
-echo
-echo Please read README carefully if you are packaging PCManFM.
-echo
-echo
-
index 88070b1..8de42cd 100644 (file)
@@ -1,43 +1,8 @@
-desktopdir = $(datadir)/applications
-desktop_DATA = pcmanfm.desktop \
-              pcmanfm-find.desktop \
-              pcmanfm-folder-handler.desktop
-@INTLTOOL_DESKTOP_RULE@
-DISTCLEANFILES = pcmanfm.desktop \
-                pcmanfm-find.desktop \
-                pcmanfm-folder-handler.desktop
+NULL=
 
-icondir = $(datadir)/pixmaps
-icon_DATA = pcmanfm.png
-
-filedir = $(datadir)/pcmanfm
-uidir=$(filedir)/ui
-
-file_DATA = \
-       mount.rules
-
-# GtkBuilder UI definition files
-ui_in_files= \
-       ui/prefdlg.glade \
-       ui/appchooserdlg.glade \
-       ui/file_properties.glade \
-       ui/about-dlg.glade \
-       ui/find-files.glade \
-       ui/godlg.glade
-ui_DATA = $(ui_in_files:.glade=.ui)
-
-EXTRA_DIST = \
-       $(desktop_DATA) \
-       $(icon_DATA) \
-       $(file_DATA) \
-       $(ui_DATA)
-
-CLEANFILES = \
-       $(ui_DATA) 
-
-# Generate GtkBuilder UI files from Glade files
-%.ui: %.glade
-#      $(GTK_BUILDER_CONVERT) $< $@
-       $(top_srcdir)/gtk-builder-convert $< $@
-#      $(top_builddir)/src/xml-purge $@
+SUBDIRS=ui
 
+desktopdir=$(datadir)/applications
+desktop_DATA= \
+       pcmanfm2.desktop \
+       $(NULL)
index 3af506d..f064338 100644 (file)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36,19 +36,24 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = data
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-       $(srcdir)/pcmanfm-find.desktop.in \
-       $(srcdir)/pcmanfm-folder-handler.desktop.in \
-       $(srcdir)/pcmanfm.desktop.in
+       $(srcdir)/pcmanfm2.desktop.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = pcmanfm.desktop pcmanfm-find.desktop \
-       pcmanfm-folder-handler.desktop
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = pcmanfm2.desktop
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+       html-recursive info-recursive install-data-recursive \
+       install-dvi-recursive install-exec-recursive \
+       install-html-recursive install-info-recursive \
+       install-pdf-recursive install-ps-recursive install-recursive \
+       installcheck-recursive installdirs-recursive pdf-recursive \
+       ps-recursive uninstall-recursive
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -70,10 +75,42 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(filedir)" \
-       "$(DESTDIR)$(icondir)" "$(DESTDIR)$(uidir)"
-DATA = $(desktop_DATA) $(file_DATA) $(icon_DATA) $(ui_DATA)
+am__installdirs = "$(DESTDIR)$(desktopdir)"
+DATA = $(desktop_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+       distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
@@ -100,18 +137,20 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FAM_CFLAGS = @FAM_CFLAGS@
-FAM_LIBS = @FAM_LIBS@
 FGREP = @FGREP@
+FM_CFLAGS = @FM_CFLAGS@
+FM_LIBS = @FM_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 G_CAST_CHECKS = @G_CAST_CHECKS@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -128,12 +167,12 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MENU_CACHE_CFLAGS = @MENU_CACHE_CFLAGS@
+MENU_CACHE_LIBS = @MENU_CACHE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -162,12 +201,12 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-SN_CFLAGS = @SN_CFLAGS@
-SN_LIBS = @SN_LIBS@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XLIB_CFLAGS = @XLIB_CFLAGS@
+XLIB_LIBS = @XLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -220,46 +259,17 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+NULL = 
+SUBDIRS = ui
 desktopdir = $(datadir)/applications
-desktop_DATA = pcmanfm.desktop \
-              pcmanfm-find.desktop \
-              pcmanfm-folder-handler.desktop
-
-DISTCLEANFILES = pcmanfm.desktop \
-                pcmanfm-find.desktop \
-                pcmanfm-folder-handler.desktop
-
-icondir = $(datadir)/pixmaps
-icon_DATA = pcmanfm.png
-filedir = $(datadir)/pcmanfm
-uidir = $(filedir)/ui
-file_DATA = \
-       mount.rules
-
-
-# GtkBuilder UI definition files
-ui_in_files = \
-       ui/prefdlg.glade \
-       ui/appchooserdlg.glade \
-       ui/file_properties.glade \
-       ui/about-dlg.glade \
-       ui/find-files.glade \
-       ui/godlg.glade
-
-ui_DATA = $(ui_in_files:.glade=.ui)
-EXTRA_DIST = \
-       $(desktop_DATA) \
-       $(icon_DATA) \
-       $(file_DATA) \
-       $(ui_DATA)
-
-CLEANFILES = \
-       $(ui_DATA) 
-
-all: all-am
+desktop_DATA = \
+       pcmanfm2.desktop \
+       $(NULL)
+
+all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
@@ -268,9 +278,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \
        $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --gnu data/Makefile
+         $(AUTOMAKE) --foreign data/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
@@ -284,16 +294,12 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-pcmanfm.desktop: $(top_builddir)/config.status $(srcdir)/pcmanfm.desktop.in
-       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-pcmanfm-find.desktop: $(top_builddir)/config.status $(srcdir)/pcmanfm-find.desktop.in
-       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-pcmanfm-folder-handler.desktop: $(top_builddir)/config.status $(srcdir)/pcmanfm-folder-handler.desktop.in
+pcmanfm2.desktop: $(top_builddir)/config.status $(srcdir)/pcmanfm2.desktop.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
@@ -321,72 +327,141 @@ uninstall-desktopDATA:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
-install-fileDATA: $(file_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(filedir)" || $(MKDIR_P) "$(DESTDIR)$(filedir)"
-       @list='$(file_DATA)'; test -n "$(filedir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(filedir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(filedir)" || exit $$?; \
-       done
 
-uninstall-fileDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(file_DATA)'; test -n "$(filedir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(filedir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(filedir)" && rm -f $$files
-install-iconDATA: $(icon_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
-       @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+       @fail= failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+           *=* | --[!k]*);; \
+           *k*) failcom='fail=yes';; \
+         esac; \
+       done; \
+       dot_seen=no; \
+       target=`echo $@ | sed s/-recursive//`; \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         echo "Making $$target in $$subdir"; \
+         if test "$$subdir" = "."; then \
+           dot_seen=yes; \
+           local_target="$$target-am"; \
+         else \
+           local_target="$$target"; \
+         fi; \
+         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+         || eval $$failcom; \
+       done; \
+       if test "$$dot_seen" = "no"; then \
+         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+       fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+       @fail= failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+           *=* | --[!k]*);; \
+           *k*) failcom='fail=yes';; \
+         esac; \
+       done; \
+       dot_seen=no; \
+       case "$@" in \
+         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+         *) list='$(SUBDIRS)' ;; \
+       esac; \
+       rev=''; for subdir in $$list; do \
+         if test "$$subdir" = "."; then :; else \
+           rev="$$subdir $$rev"; \
+         fi; \
+       done; \
+       rev="$$rev ."; \
+       target=`echo $@ | sed s/-recursive//`; \
+       for subdir in $$rev; do \
+         echo "Making $$target in $$subdir"; \
+         if test "$$subdir" = "."; then \
+           local_target="$$target-am"; \
+         else \
+           local_target="$$target"; \
+         fi; \
+         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+         || eval $$failcom; \
+       done && test -z "$$fail"
+tags-recursive:
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
        done
-
-uninstall-iconDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(icondir)" && rm -f $$files
-install-uiDATA: $(ui_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
-       @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \
+ctags-recursive:
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
        done
 
-uninstall-uiDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(uidir)" && rm -f $$files
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       mkid -fID $$unique
 tags: TAGS
-TAGS:
 
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       set x; \
+       here=`pwd`; \
+       if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+         include_option=--etags-include; \
+         empty_fix=.; \
+       else \
+         include_option=--include; \
+         empty_fix=; \
+       fi; \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test ! -f $$subdir/TAGS || \
+             set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+         fi; \
+       done; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       shift; \
+       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         if test $$# -gt 0; then \
+           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             "$$@" $$unique; \
+         else \
+           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$unique; \
+         fi; \
+       fi
 ctags: CTAGS
-CTAGS:
-
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       test -z "$(CTAGS_ARGS)$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && $(am__cd) $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -418,22 +493,51 @@ distdir: $(DISTFILES)
            || exit 1; \
          fi; \
        done
+       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test -d "$(distdir)/$$subdir" \
+           || $(MKDIR_P) "$(distdir)/$$subdir" \
+           || exit 1; \
+         fi; \
+       done
+       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+           $(am__relativize); \
+           new_distdir=$$reldir; \
+           dir1=$$subdir; dir2="$(top_distdir)"; \
+           $(am__relativize); \
+           new_top_distdir=$$reldir; \
+           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+           ($(am__cd) $$subdir && \
+             $(MAKE) $(AM_MAKEFLAGS) \
+               top_distdir="$$new_top_distdir" \
+               distdir="$$new_distdir" \
+               am__remove_distdir=: \
+               am__skip_length_check=: \
+               am__skip_mode_fix=: \
+               distdir) \
+             || exit 1; \
+         fi; \
+       done
 check-am: all-am
-check: check-am
+check: check-recursive
 all-am: Makefile $(DATA)
-installdirs:
-       for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(filedir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(uidir)"; do \
+installdirs: installdirs-recursive
+installdirs-am:
+       for dir in "$(DESTDIR)$(desktopdir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
 
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
-installcheck: installcheck-am
+installcheck: installcheck-recursive
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -442,107 +546,98 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-       -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
+clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
 
-distclean: distclean-am
+distclean: distclean-recursive
        -rm -f Makefile
-distclean-am: clean-am distclean-generic
+distclean-am: clean-am distclean-generic distclean-tags
 
-dvi: dvi-am
+dvi: dvi-recursive
 
 dvi-am:
 
-html: html-am
+html: html-recursive
 
 html-am:
 
-info: info-am
+info: info-recursive
 
 info-am:
 
-install-data-am: install-desktopDATA install-fileDATA install-iconDATA \
-       install-uiDATA
+install-data-am: install-desktopDATA
 
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
 install-exec-am:
 
-install-html: install-html-am
+install-html: install-html-recursive
 
 install-html-am:
 
-install-info: install-info-am
+install-info: install-info-recursive
 
 install-info-am:
 
 install-man:
 
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
 
 install-pdf-am:
 
-install-ps: install-ps-am
+install-ps: install-ps-recursive
 
 install-ps-am:
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
-pdf: pdf-am
+pdf: pdf-recursive
 
 pdf-am:
 
-ps: ps-am
+ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-desktopDATA uninstall-fileDATA \
-       uninstall-iconDATA uninstall-uiDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-desktopDATA install-dvi \
-       install-dvi-am install-exec install-exec-am install-fileDATA \
-       install-html install-html-am install-iconDATA install-info \
-       install-info-am install-man install-pdf install-pdf-am \
-       install-ps install-ps-am install-strip install-uiDATA \
-       installcheck installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-       uninstall-desktopDATA uninstall-fileDATA uninstall-iconDATA \
-       uninstall-uiDATA
-
-@INTLTOOL_DESKTOP_RULE@
-
-# Generate GtkBuilder UI files from Glade files
-%.ui: %.glade
-#      $(GTK_BUILDER_CONVERT) $< $@
-       $(top_srcdir)/gtk-builder-convert $< $@
-#      $(top_builddir)/src/xml-purge $@
+uninstall-am: uninstall-desktopDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+       install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+       all all-am check check-am clean clean-generic clean-libtool \
+       ctags ctags-recursive distclean distclean-generic \
+       distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+       install-data-am install-desktopDATA install-dvi install-dvi-am \
+       install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-pdf \
+       install-pdf-am install-ps install-ps-am install-strip \
+       installcheck installcheck-am installdirs installdirs-am \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags tags-recursive uninstall uninstall-am \
+       uninstall-desktopDATA
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/icons/file.png b/data/icons/file.png
deleted file mode 100644 (file)
index 3966a19..0000000
Binary files a/data/icons/file.png and /dev/null differ
diff --git a/data/icons/folder.png b/data/icons/folder.png
deleted file mode 100644 (file)
index 2fc0f58..0000000
Binary files a/data/icons/folder.png and /dev/null differ
diff --git a/data/mount.rules b/data/mount.rules
deleted file mode 100644 (file)
index 78a9700..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file contains default mount options for pcmanfm
-# If mount options are already specfied for a volume in /etc/fstab, then 
-# 'mount' command will be used, and it will follow /etc/fstab.
-# If a volume is not defined in /etc/fstab, such as removable usb disk,
-# the mount options defined in this file will be used.
-# I know this sucks. Personally, I don't like to do this either.
-# However, unfortunately the latest HAL forced us to do so.
-# http://www.linuxfromscratch.org/blfs/view/svn/general/hal.html
-
-[vfat]
-mount_options=shortname=mixed;uid=;utf8;umask=077;exec
-
-# mount_options=shortname=mixed;uid=;utf8;umask=077;exec;usefree
-# Sometimes, adding a 'usefree' option is required due to bugs in the kernel.
-# See: https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/133567
-
-[udf]
-mount_options=uid=;exec
-
-[ntfs-3g]
-mount_options=locale=;exec
-
-[ntfs]
-mount_options=umask=222;utf8;exec
-fstype_override=ntfs-3g
-
-[iso9660]
-mount_options=uid=;utf8;exec
-
-[hfs]
-mount_options=uid=
diff --git a/data/pcmanfm-find.desktop.in b/data/pcmanfm-find.desktop.in
deleted file mode 100644 (file)
index 1bfdb6f..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=Search for Files or Folders
-Name[ru]=Поиск Файлов или Папок
-Name[fi]=Etsi tiedostoja ja kansioita
-Name[et]=Failide ja kaustade otsimine
-Name[ja]=ファイルやフォルダの検索
-Name[zh_TW]=尋找檔案或資料夾
-Categories=Application;Utility;GTK;
-Exec=pcmanfm --find-files %F
-Icon=gtk-find
-StartupNotify=true
-Type=Application
-Terminal=false
-MimeType=x-directory/normal;inode/directory;
-Comment=Search for files and folders in disks
-Comment[ru]=Поиск Файлов или Папок на дисках
-Comment[zh_TW]=在磁碟中尋找檔案或資料夾
-Comment[fi]=Etsi tiedostoja ja kansioita levyiltä
-Comment[et]=Otsi ketastelt faile ja katalooge
-Comment[ja]=ディスクからファイルやフォルダを探します
diff --git a/data/pcmanfm-folder-handler.desktop.in b/data/pcmanfm-folder-handler.desktop.in
deleted file mode 100644 (file)
index edfec6a..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Open Folder
-Name[ru]=Открыть Папку
-Name[fi]=Avaa kansio
-Name[ja]=フォルダを開く
-TryExec=pcmanfm
-Exec=pcmanfm %U
-NoDisplay=true
-Terminal=false
-Icon=folder-open
-StartupNotify=true
-Type=Application
-MimeType=x-directory/gnome-default-handler;x-directory/normal;inode/directory;
-#NotShowIn=GNOME;
-
diff --git a/data/pcmanfm.desktop.in b/data/pcmanfm.desktop.in
deleted file mode 100644 (file)
index c01c462..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=PCMan File Manager
-Categories=Application;System;Utility;Core;GTK;
-Name[zh_TW]=檔案總管
-Name[fi]=PCMan-tiedostonhallinta
-Name[et]=PCMan failihaldur
-Name[ja]=PCMan ファイルマネージャ
-Exec=pcmanfm %F
-Icon=pcmanfm
-StartupNotify=true
-Type=Application
-Terminal=false
-MimeType=x-directory/normal;inode/directory;
-GenericName=File Manager
-GenericName[ru]=Файловый менеджер
-GenericName[zh_TW]=檔案管理程式
-GenericName[fi]=Tiedostonhallinta
-GenericName[et]=Failihaldur
-GenericName[ja]=ファイルマネージャ
-Comment=Browse the file system and manage the files
-Comment[zh_TW]=瀏覽檔案系統及管理檔案
-Comment[fi]=Selaa tiedostojärjestelmää ja hallitse tiedostoja
-Comment[et]=Lehitse failisüsteemi ja halda faile
-Comment[ja]=ファイルシステムをブラウズし、ファイルの管理を行います
diff --git a/data/pcmanfm.png b/data/pcmanfm.png
deleted file mode 100644 (file)
index 2fc0f58..0000000
Binary files a/data/pcmanfm.png and /dev/null differ
diff --git a/data/pcmanfm2.desktop.in b/data/pcmanfm2.desktop.in
new file mode 100644 (file)
index 0000000..1fc9fda
--- /dev/null
@@ -0,0 +1,28 @@
+[Desktop Entry]
+Type=Application
+Icon=system-file-manager
+Name=File Manager
+Name[de]=Dateimanager
+Name[et]=Failihaldur
+Name[fi]=Tiedostonhallinta
+Name[ja]=ファイルマネージャ
+Name[ru]=Файловый менеджер
+Name[zh_TW]=檔案管理程式
+GenericName=File Manager
+GenericName[de]=Dateimanager
+GenericName[et]=Failihaldur
+GenericName[fi]=Tiedostonhallinta
+GenericName[ja]=ファイルマネージャ
+GenericName[ru]=Файловый менеджер
+GenericName[zh_TW]=檔案管理程式
+Comment=Browse the file system and manage the files
+Comment[de]=Das Dateisystem durchsuchen und Dateien verwalten
+Comment[et]=Lehitse failisüsteemi ja halda faile
+Comment[fi]=Selaa tiedostojärjestelmää ja hallitse tiedostoja
+Comment[ja]=ファイルシステムをブラウズし、ファイルの管理を行います
+Comment[zh_TW]=瀏覽檔案系統及管理檔案
+Categories=FileManager;Utility;Core;GTK;
+Exec=pcmanfm2 %U
+StartupNotify=true
+Terminal=false
+MimeType=x-directory/normal;inode/directory;
diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
new file mode 100644 (file)
index 0000000..5e67abc
--- /dev/null
@@ -0,0 +1,24 @@
+NULL=
+
+# GtkBuilder UI definition files
+uidir=$(datadir)/pcmanfm2/ui
+ui_in_files= \
+       about.glade \
+       pref.glade \
+       desktop-pref.glade \
+       autorun.glade \
+       $(NULL)
+ui_DATA = $(ui_in_files:.glade=.ui)
+
+EXTRA_DIST = \
+       $(ui_DATA) \
+       $(NULL)
+
+CLEANFILES = \
+       $(ui_DATA) \
+       $(NULL)
+
+# Purge GtkBuilder UI files
+%.ui: %.glade
+       cp $< $@
+       $(top_builddir)/src/xml-purge $@
diff --git a/data/ui/Makefile.in b/data/ui/Makefile.in
new file mode 100644 (file)
index 0000000..f2374ca
--- /dev/null
@@ -0,0 +1,461 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/ui
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+       $(srcdir)/about.glade.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = about.glade
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(uidir)"
+DATA = $(ui_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FM_CFLAGS = @FM_CFLAGS@
+FM_LIBS = @FM_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+G_CAST_CHECKS = @G_CAST_CHECKS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MENU_CACHE_CFLAGS = @MENU_CACHE_CFLAGS@
+MENU_CACHE_LIBS = @MENU_CACHE_LIBS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XLIB_CFLAGS = @XLIB_CFLAGS@
+XLIB_LIBS = @XLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+NULL = 
+
+# GtkBuilder UI definition files
+uidir = $(datadir)/pcmanfm2/ui
+ui_in_files = \
+       about.glade \
+       pref.glade \
+       desktop-pref.glade \
+       autorun.glade \
+       $(NULL)
+
+ui_DATA = $(ui_in_files:.glade=.ui)
+EXTRA_DIST = \
+       $(ui_DATA) \
+       $(NULL)
+
+CLEANFILES = \
+       $(ui_DATA) \
+       $(NULL)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+               && { if test -f $@; then exit 0; else break; fi; }; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/ui/Makefile'; \
+       $(am__cd) $(top_srcdir) && \
+         $(AUTOMAKE) --foreign data/ui/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+about.glade: $(top_builddir)/config.status $(srcdir)/about.glade.in
+       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+install-uiDATA: $(ui_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
+       @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \
+       done
+
+uninstall-uiDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(uidir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       list='$(DISTFILES)'; \
+         dist_files=`for file in $$list; do echo $$file; done | \
+         sed -e "s|^$$srcdirstrip/||;t" \
+             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+       case $$dist_files in \
+         */*) $(MKDIR_P) `echo "$$dist_files" | \
+                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+                          sort -u` ;; \
+       esac; \
+       for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         if test -d $$d/$$file; then \
+           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+           fi; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+           fi; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+         else \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+       for dir in "$(DESTDIR)$(uidir)"; do \
+         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+       -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-uiDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-uiDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+       install-data install-data-am install-dvi install-dvi-am \
+       install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-pdf \
+       install-pdf-am install-ps install-ps-am install-strip \
+       install-uiDATA installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       uninstall uninstall-am uninstall-uiDATA
+
+
+# Purge GtkBuilder UI files
+%.ui: %.glade
+       cp $< $@
+       $(top_builddir)/src/xml-purge $@
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/data/ui/about-dlg.glade b/data/ui/about-dlg.glade
deleted file mode 100644 (file)
index 5bb5085..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"><glade-interface><widget class="GtkAboutDialog" id="dlg"><property name="border_width">5</property><property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property><property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property><property name="has_separator">False</property><property name="program_name">PCMan File Manager</property><property name="copyright" translatable="yes">Copyright (C) 2005 - 2008</property><property name="comments" translatable="yes">Lightweight file manager
-
-Developed by Hon Jen Yee (PCMan)</property><property name="website">http://pcmanfm.sourceforge.net/</property><property name="license">PCMan File Manager
-
-Copyright (C) 2005 - 2008 洪任諭 (Hong Jen Yee)
-
-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.</property><property name="authors" translatable="yes">洪任諭 Hong Jen Yee &lt;pcman.tw@gmail.com&gt;
-
-Source code taken from other projects:
- * libmd5-rfc: Aladdin Enterprises
- * Working area detection: Gary Kramlich
- * ExoIconView: os-cillation e.K, Anders Carlsson, &amp; Benedikt Meurer
- * Text and icon renderer uses code from Jonathan Blandford
- * Desktop icons use code from Brian Tarricone
- * Volume management uses code from following projects/authors:
-     * gnome-vfs: David Zeuthen
-     * thunar-vfs and libexo: Benedikt Meurer
-     * gnome-mount: David Zeuthen</property><property name="translator_credits" translatable="yes" comments="Please replace this line with your own names, one name per line. ">translator-credits</property><property name="artists" translatable="yes">The icon was taken from "nuoveXT 2" icon theme
-created by Alexandre Moore (saki).
-http://www.gnome-look.org/content/show.php/nuoveXT+2?content=56625</property><property name="logo_icon_name">pcman</property><property name="wrap_license">True</property><child internal-child="vbox"><widget class="GtkVBox" id="dialog-vbox1"><property name="visible">True</property><property name="spacing">2</property><child><placeholder/></child><child internal-child="action_area"><widget class="GtkHButtonBox" id="dialog-action_area1"><property name="visible">True</property><property name="layout_style">GTK_BUTTONBOX_END</property></widget><packing><property name="expand">False</property><property name="pack_type">GTK_PACK_END</property></packing></child></widget></child></widget></glade-interface>
diff --git a/data/ui/about.glade.in b/data/ui/about.glade.in
new file mode 100644 (file)
index 0000000..40f0bc9
--- /dev/null
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkAboutDialog" id="dlg">
+    <property name="border_width">5</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="type_hint">dialog</property>
+    <property name="has_separator">False</property>
+    <property name="program_name">PCManFM</property>
+    <property name="version">@VERSION@</property>
+    <property name="copyright" translatable="yes">Copyright (C) 2009 - 2010</property>
+    <property name="comments" translatable="yes">Lightweight file manager
+
+Developed by Hon Jen Yee (PCMan)</property>
+    <property name="website">http://pcmanfm.sourceforge.net/</property>
+    <property name="license">PCMan File Manager
+
+Copyright (C) 2009 - 2010 &#x6D2A;&#x4EFB;&#x8AED; (Hong Jen Yee)
+
+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.</property>
+    <property name="authors">&#x6D2A;&#x4EFB;&#x8AED; Hong Jen Yee &lt;pcman.tw@gmail.com&gt;
+ * Desktop icons use code from Brian Tarricone</property>
+    <property name="translator_credits" translatable="yes" comments="Please replace this line with your own names, one name per line. ">translator-credits</property>
+    <property name="artists"></property>
+    <property name="logo_icon_name">system-file-manager</property>
+    <property name="wrap_license">True</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/data/ui/about.ui b/data/ui/about.ui
new file mode 100644 (file)
index 0000000..ad453d3
--- /dev/null
@@ -0,0 +1,20 @@
+<?xml version="1.0"?><interface><object class="GtkAboutDialog" id="dlg"><property name="border_width">5</property><property name="window_position">center-on-parent</property><property name="type_hint">dialog</property><property name="has_separator">False</property><property name="program_name">PCManFM</property><property name="version">0.9.5</property><property name="copyright" translatable="yes">Copyright (C) 2009 - 2010</property><property name="comments" translatable="yes">Lightweight file manager
+
+Developed by Hon Jen Yee (PCMan)</property><property name="website">http://pcmanfm.sourceforge.net/</property><property name="license">PCMan File Manager
+
+Copyright (C) 2009 - 2010 &#x6D2A;&#x4EFB;&#x8AED; (Hong Jen Yee)
+
+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.</property><property name="authors">&#x6D2A;&#x4EFB;&#x8AED; Hong Jen Yee &lt;pcman.tw@gmail.com&gt;
+ * Desktop icons use code from Brian Tarricone</property><property name="translator_credits" translatable="yes" comments="Please replace this line with your own names, one name per line. ">translator-credits</property><property name="artists"></property><property name="logo_icon_name">system-file-manager</property><property name="wrap_license">True</property><child internal-child="vbox"><object class="GtkVBox" id="dialog-vbox1"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">2</property><child internal-child="action_area"><object class="GtkHButtonBox" id="dialog-action_area1"><property name="visible">True</property><property name="layout_style">end</property></object><packing><property name="expand">False</property><property name="pack_type">end</property><property name="position">0</property></packing></child></object></child></object></interface>
diff --git a/data/ui/appchooserdlg.glade b/data/ui/appchooserdlg.glade
deleted file mode 100644 (file)
index 0211df1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"><glade-interface><widget class="GtkDialog" id="dlg"><property name="border_width">6</property><property name="title" translatable="yes">Choose an Application</property><property name="default_height">420</property><property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property><child internal-child="vbox"><widget class="GtkVBox" id="dialog-vbox"><property name="visible">True</property><property name="spacing">12</property><child><widget class="GtkHBox" id="hbox5"><property name="visible">True</property><property name="border_width">6</property><property name="spacing">4</property><child><widget class="GtkLabel" id="label7"><property name="visible">True</property><property name="xpad">2</property><property name="ypad">2</property><property name="label" translatable="yes">File Type To be Opened:</property></widget><packing><property name="expand">False</property><property name="fill">False</property></packing></child><child><widget class="GtkLabel" id="file_type"><property name="visible">True</property></widget><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></widget><packing><property name="expand">False</property><property name="padding">2</property><property name="position">2</property></packing></child><child><widget class="GtkLabel" id="label4"><property name="visible">True</property><property name="xpad">4</property><property name="ypad">4</property><property name="label" translatable="yes">Please choose an application from following lists or enter the command line by hand:</property><property name="wrap">True</property></widget><packing><property name="expand">False</property><property name="fill">False</property><property name="padding">1</property><property name="position">3</property></packing></child><child><widget class="GtkNotebook" id="notebook"><property name="visible">True</property><property name="can_focus">True</property><signal name="switch_page" handler="on_notebook_switch_page" object="app_chooser_dlg"/><child><widget class="GtkScrolledWindow" id="scrolledwindow1"><property name="visible">True</property><property name="can_focus">True</property><property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property><property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property><property name="shadow_type">GTK_SHADOW_IN</property><child><widget class="GtkTreeView" id="recommended_apps"><property name="visible">True</property><property name="can_focus">True</property><property name="has_focus">True</property><property name="headers_visible">False</property></widget></child></widget></child><child><widget class="GtkLabel" id="label3"><property name="visible">True</property><property name="label" translatable="yes">_Recommended Applications</property><property name="use_underline">True</property></widget><packing><property name="type">tab</property><property name="tab_fill">False</property></packing></child><child><widget class="GtkScrolledWindow" id="scrolledwindow2"><property name="visible">True</property><property name="can_focus">True</property><property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property><property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property><property name="shadow_type">GTK_SHADOW_IN</property><child><widget class="GtkTreeView" id="all_apps"><property name="visible">True</property><property name="can_focus">True</property><property name="headers_visible">False</property></widget></child></widget><packing><property name="position">1</property></packing></child><child><widget class="GtkLabel" id="label2"><property name="visible">True</property><property name="label" translatable="yes">_All Applications</property><property name="use_underline">True</property></widget><packing><property name="type">tab</property><property name="position">1</property><property name="tab_fill">False</property></packing></child></widget><packing><property name="position">4</property></packing></child><child><widget class="GtkHBox" id="hbox1"><property name="visible">True</property><property name="border_width">4</property><property name="spacing">12</property><child><widget class="GtkLabel" id="label5"><property name="visible">True</property><property name="label" translatable="yes">_Command Line:</property><property name="use_underline">True</property><property name="mnemonic_widget">cmdline</property></widget><packing><property name="expand">False</property><property name="fill">False</property></packing></child><child><widget class="GtkEntry" id="cmdline"><property name="visible">True</property><property name="can_focus">True</property><property name="activates_default">True</property></widget><packing><property name="position">1</property></packing></child><child><widget class="GtkButton" id="browse_btn"><property name="visible">True</property><property name="can_focus">True</property><signal name="clicked" handler="on_browse_btn_clicked" object="app_chooser_dlg"/><child><widget class="GtkAlignment" id="alignment1"><property name="visible">True</property><property name="xscale">0</property><property name="yscale">0</property><child><widget class="GtkHBox" id="hbox3"><property name="visible">True</property><property name="spacing">2</property><child><widget class="GtkImage" id="image1"><property name="visible">True</property><property name="stock">gtk-open</property></widget><packing><property name="expand">False</property><property name="fill">False</property></packing></child><child><widget class="GtkLabel" id="label6"><property name="visible">True</property><property name="label" translatable="yes">_Browse</property><property name="use_underline">True</property></widget><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></widget></child></widget></child></widget><packing><property name="expand">False</property><property name="fill">False</property><property name="position">2</property></packing></child></widget><packing><property name="expand">False</property><property name="position">5</property></packing></child><child><widget class="GtkVBox" id="vbox1"><property name="visible">True</property><property name="spacing">6</property><child><widget class="GtkCheckButton" id="open_in_terminal"><property name="sensitive">False</property><property name="can_focus">True</property><property name="label" translatable="yes">Opened in Terminal</property><property name="use_underline">True</property><property name="draw_indicator">True</property></widget><packing><property name="expand">False</property><property name="fill">False</property></packing></child><child><widget class="GtkCheckButton" id="set_default"><property name="visible">True</property><property name="can_focus">True</property><property name="label" translatable="yes">Set selected application to default action</property><property name="use_underline">True</property><property name="draw_indicator">True</property></widget><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></widget><packing><property name="position">6</property></packing></child><child internal-child="action_area"><widget class="GtkHButtonBox" id="dialog-action_area1"><property name="visible">True</property><property name="layout_style">GTK_BUTTONBOX_END</property><child><widget class="GtkButton" id="cancelbutton"><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="label">gtk-cancel</property><property name="use_stock">True</property><property name="response_id">-6</property></widget></child><child><widget class="GtkButton" id="okbutton"><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="has_default">True</property><property name="label">gtk-ok</property><property name="use_stock">True</property><property name="response_id">-5</property></widget><packing><property name="position">1</property></packing></child></widget><packing><property name="expand">False</property><property name="pack_type">GTK_PACK_END</property></packing></child></widget></child></widget></glade-interface>
diff --git a/data/ui/autorun.ui b/data/ui/autorun.ui
new file mode 100644 (file)
index 0000000..4257903
--- /dev/null
@@ -0,0 +1 @@
+<?xml version="1.0"?><interface><requires lib="gtk+" version="2.16"/><object class="GtkDialog" id="dlg"><property name="border_width">5</property><property name="title" translatable="yes">Removable medium is inserted</property><property name="window_position">center</property><property name="default_width">400</property><property name="default_height">380</property><property name="icon_name">drive-removable-media</property><property name="type_hint">dialog</property><property name="has_separator">False</property><child internal-child="vbox"><object class="GtkVBox" id="dlg-vbox"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">2</property><child><object class="GtkVBox" id="vbox1"><property name="visible">True</property><property name="border_width">12</property><property name="orientation">vertical</property><property name="spacing">18</property><child><object class="GtkHBox" id="hbox1"><property name="visible">True</property><property name="spacing">12</property><child><object class="GtkImage" id="icon"><property name="visible">True</property><property name="icon-size">6</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkVBox" id="vbox3"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">6</property><child><object class="GtkLabel" id="msg"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Removable medium is inserted&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox2"><property name="visible">True</property><property name="spacing">12</property><child><object class="GtkLabel" id="label1"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Type of medium:</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkLabel" id="type"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Detecting...</property></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkVBox" id="vbox6"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">6</property><child><object class="GtkLabel" id="msg1"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Please select the action you want to perform:</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkScrolledWindow" id="scrolledwindow1"><property name="visible">True</property><property name="can_focus">True</property><property name="hscrollbar_policy">automatic</property><property name="vscrollbar_policy">automatic</property><property name="shadow_type">in</property><child><object class="GtkTreeView" id="listview"><property name="visible">True</property><property name="can_focus">True</property><property name="headers_visible">False</property></object></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child><child internal-child="action_area"><object class="GtkHButtonBox" id="dialog-action_area1"><property name="visible">True</property><property name="layout_style">end</property><child><object class="GtkButton" id="cancel"><property name="label">gtk-cancel</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkButton" id="ok"><property name="label">gtk-ok</property><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="pack_type">end</property><property name="position">0</property></packing></child></object></child><action-widgets><action-widget response="-6">cancel</action-widget><action-widget response="-5">ok</action-widget></action-widgets></object></interface>
diff --git a/data/ui/desktop-pref.ui b/data/ui/desktop-pref.ui
new file mode 100644 (file)
index 0000000..b07312c
--- /dev/null
@@ -0,0 +1 @@
+<?xml version="1.0"?><interface><requires lib="gtk+" version="2.16"/><object class="GtkDialog" id="dlg"><property name="border_width">5</property><property name="title" translatable="yes">Desktop Preferences</property><property name="resizable">False</property><property name="window_position">center</property><property name="type_hint">dialog</property><property name="has_separator">False</property><child internal-child="vbox"><object class="GtkVBox" id="dialog-vbox1"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">2</property><child><object class="GtkNotebook" id="notebook1"><property name="visible">True</property><property name="can_focus">True</property><child><object class="GtkVBox" id="vbox1"><property name="visible">True</property><property name="border_width">12</property><property name="orientation">vertical</property><property name="spacing">18</property><child><object class="GtkVBox" id="vbox3"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">6</property><child><object class="GtkLabel" id="label14"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Background&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkAlignment" id="alignment3"><property name="visible">True</property><property name="left_padding">12</property><child><object class="GtkVBox" id="vbox5"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">6</property><child><object class="GtkHBox" id="hbox3"><property name="visible">True</property><property name="spacing">12</property><child><object class="GtkLabel" id="label3"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Wallpaper:</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkFileChooserButton" id="wallpaper"><property name="visible">True</property><property name="title" translatable="yes">Please select an image file</property><property name="width_chars">40</property></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox1"><property name="visible">True</property><property name="spacing">12</property><child><object class="GtkLabel" id="label10"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Background color:</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkColorButton" id="desktop_bg"><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="color">#000000000000</property></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child><child><object class="GtkHBox" id="hbox2"><property name="visible">True</property><property name="spacing">12</property><child><object class="GtkLabel" id="label4"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Wallpaper mode:</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkComboBox" id="wallpaper_mode"><property name="visible">True</property><property name="model">wp_modes</property><child><object class="GtkCellRendererText" id="cellrenderertext1"/><attributes><attribute name="text">0</attribute></attributes></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">3</property></packing></child></object></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkVBox" id="vbox4"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">6</property><child><object class="GtkLabel" id="label6"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Text&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkAlignment" id="alignment4"><property name="visible">True</property><property name="left_padding">12</property><child><object class="GtkVBox" id="vbox6"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">6</property><child><object class="GtkHBox" id="hbox4"><property name="visible">True</property><property name="spacing">12</property><child><object class="GtkLabel" id="label5"><property name="visible">True</property><property name="label" translatable="yes">Font of label text:</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkFontButton" id="desktop_font"><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox6"><property name="visible">True</property><property name="spacing">12</property><child><object class="GtkHBox" id="hbox9"><property name="visible">True</property><property name="spacing">12</property><child><object class="GtkLabel" id="label11"><property name="visible">True</property><property name="label" translatable="yes">Color of label text:</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkColorButton" id="desktop_fg"><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="color">#000000000000</property></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox5"><property name="visible">True</property><property name="spacing">12</property><child><object class="GtkLabel" id="label13"><property name="visible">True</property><property name="label" translatable="yes">Color of shadow:</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkColorButton" id="desktop_shadow"><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="color">#000000000000</property></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object></child><child type="tab"><object class="GtkLabel" id="label1"><property name="visible">True</property><property name="label" translatable="yes">Appearance</property></object><packing><property name="tab_fill">False</property></packing></child><child><object class="GtkVBox" id="icons_page"><property name="border_width">12</property><property name="orientation">vertical</property><property name="spacing">18</property><child><object class="GtkVBox" id="vbox8"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">6</property><child><object class="GtkLabel" id="label19"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Show desktop icons&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkAlignment" id="alignment1"><property name="visible">True</property><property name="left_padding">12</property><child><object class="GtkVBox" id="vbox2"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">6</property><child><object class="GtkCheckButton" id="show_my_doc"><property name="label" translatable="yes">Show "My Documents" icon on desktop</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_underline">True</property><property name="draw_indicator">True</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkCheckButton" id="show_my_computer"><property name="label" translatable="yes">Show "My Computer" icon on desktop</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_underline">True</property><property name="draw_indicator">True</property></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child><object class="GtkCheckButton" id="show_trash"><property name="label" translatable="yes">Show "Trash Bin" icon on desktop</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_underline">True</property><property name="draw_indicator">True</property></object><packing><property name="expand">False</property><property name="position">2</property></packing></child><child><object class="GtkCheckButton" id="show_volumes"><property name="label" translatable="yes">Show icons of volumes on desktop</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_underline">True</property><property name="draw_indicator">True</property></object><packing><property name="expand">False</property><property name="position">3</property></packing></child></object></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child></object><packing><property name="position">1</property></packing></child><child type="tab"><object class="GtkLabel" id="label2"><property name="visible">True</property><property name="label" translatable="yes">Desktop Icons</property></object><packing><property name="position">1</property><property name="tab_fill">False</property></packing></child><child><object class="GtkVBox" id="vbox7"><property name="visible">True</property><property name="border_width">12</property><property name="orientation">vertical</property><property name="spacing">6</property><child><object class="GtkCheckButton" id="show_wm_menu"><property name="label" translatable="yes">Show menus provided by window managers when desktop is clicked</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property><property name="draw_indicator">True</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child></object><packing><property name="position">2</property></packing></child><child type="tab"><object class="GtkLabel" id="label7"><property name="visible">True</property><property name="label" translatable="yes">Advanced</property></object><packing><property name="position">2</property><property name="tab_fill">False</property></packing></child></object><packing><property name="position">1</property></packing></child><child internal-child="action_area"><object class="GtkHButtonBox" id="dialog-action_area1"><property name="visible">True</property><property name="layout_style">end</property><child><object class="GtkButton" id="close"><property name="label">gtk-close</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child></object><packing><property name="expand">False</property><property name="pack_type">end</property><property name="position">0</property></packing></child></object></child><action-widgets><action-widget response="0">close</action-widget></action-widgets></object><object class="GtkListStore" id="wp_modes"><columns><column type="gchararray"/><column type="guint"/></columns><data><row><col id="0" translatable="yes">Fill with background color only</col><col id="1">0</col></row><row><col id="0" translatable="yes">Stretch to fill the entire screen</col><col id="1">1</col></row><row><col id="0" translatable="yes">Stretch to fit the screen</col><col id="1">2</col></row><row><col id="0" translatable="yes">Center on the screen</col><col id="1">3</col></row><row><col id="0" translatable="yes">Tile the image to fill the entire screen</col><col id="1">4</col></row></data></object></interface>
diff --git a/data/ui/file-assoc-dlg.glade b/data/ui/file-assoc-dlg.glade
deleted file mode 100644 (file)
index e9ff432..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"><glade-interface><widget class="GtkDialog" id="file_assoc_dlg"><property name="visible">True</property><property name="border_width">6</property><property name="title" translatable="yes">File Associations</property><property name="modal">True</property><property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property><property name="default_width">640</property><property name="default_height">400</property><property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property><property name="has_separator">False</property><child internal-child="vbox"><widget class="GtkVBox" id="dialog-vbox1"><property name="visible">True</property><property name="spacing">12</property><child><widget class="GtkHPaned" id="hpaned"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">6</property><property name="position">160</property><child><widget class="GtkVBox" id="vbox3"><property name="visible">True</property><child><widget class="GtkLabel" id="label2"><property name="visible">True</property><property name="xpad">4</property><property name="ypad">4</property><property name="label" translatable="yes">Known File Types:</property></widget><packing><property name="expand">False</property><property name="fill">False</property></packing></child><child><widget class="GtkScrolledWindow" id="scrolledwindow1"><property name="visible">True</property><property name="can_focus">True</property><property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property><property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property><property name="shadow_type">GTK_SHADOW_IN</property><child><widget class="GtkTreeView" id="types"><property name="visible">True</property><property name="can_focus">True</property><property name="headers_visible">False</property><property name="rules_hint">True</property></widget></child></widget><packing><property name="position">1</property></packing></child></widget><packing><property name="resize">True</property><property name="shrink">False</property></packing></child><child><widget class="GtkVBox" id="vbox1"><property name="visible">True</property><child><widget class="GtkLabel" id="label1"><property name="visible">True</property><property name="xpad">4</property><property name="ypad">4</property><property name="label" translatable="yes">Actions Showed in Popup Menus</property></widget><packing><property name="expand">False</property><property name="fill">False</property></packing></child><child><widget class="GtkHBox" id="hbox4"><property name="visible">True</property><child><widget class="GtkScrolledWindow" id="scrolledwindow2"><property name="visible">True</property><property name="can_focus">True</property><property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property><property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property><property name="shadow_type">GTK_SHADOW_IN</property><child><widget class="GtkTreeView" id="actions"><property name="visible">True</property><property name="can_focus">True</property><property name="reorderable">True</property><property name="rules_hint">True</property></widget></child></widget></child><child><widget class="GtkVBox" id="vbox4"><property name="visible">True</property><property name="border_width">2</property><property name="spacing">6</property><child><widget class="GtkButton" id="add_app"><property name="visible">True</property><property name="can_focus">True</property><child><widget class="GtkAlignment" id="alignment6"><property name="visible">True</property><property name="xscale">0</property><property name="yscale">0</property><child><widget class="GtkHBox" id="hbox8"><property name="visible">True</property><property name="spacing">2</property><child><widget class="GtkImage" id="image6"><property name="visible">True</property><property name="stock">gtk-add</property></widget><packing><property name="expand">False</property><property name="fill">False</property></packing></child><child><widget class="GtkLabel" id="label8"><property name="visible">True</property><property name="label" translatable="yes">Add _Application</property><property name="use_underline">True</property></widget><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></widget></child></widget></child></widget><packing><property name="expand">False</property><property name="fill">False</property></packing></child><child><widget class="GtkButton" id="add_custom"><property name="visible">True</property><property name="can_focus">True</property><child><widget class="GtkAlignment" id="alignment7"><property name="visible">True</property><property name="xscale">0</property><property name="yscale">0</property><child><widget class="GtkHBox" id="hbox9"><property name="visible">True</property><property name="spacing">2</property><child><widget class="GtkImage" id="image7"><property name="visible">True</property><property name="stock">gtk-add</property></widget><packing><property name="expand">False</property><property name="fill">False</property></packing></child><child><widget class="GtkLabel" id="label9"><property name="visible">True</property><property name="label" translatable="yes">Add _Custom Action</property><property name="use_underline">True</property></widget><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></widget></child></widget></child></widget><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child><child><widget class="GtkButton" id="edit"><property name="visible">True</property><property name="can_focus">True</property><property name="label">gtk-edit</property><property name="use_stock">True</property></widget><packing><property name="expand">False</property><property name="fill">False</property><property name="position">2</property></packing></child><child><widget class="GtkButton" id="remove"><property name="visible">True</property><property name="can_focus">True</property><property name="label">gtk-remove</property><property name="use_stock">True</property></widget><packing><property name="expand">False</property><property name="fill">False</property><property name="position">3</property></packing></child><child><widget class="GtkButton" id="up"><property name="visible">True</property><property name="can_focus">True</property><child><widget class="GtkAlignment" id="alignment8"><property name="visible">True</property><property name="xscale">0</property><property name="yscale">0</property><child><widget class="GtkHBox" id="hbox10"><property name="visible">True</property><property name="spacing">2</property><child><widget class="GtkImage" id="image8"><property name="visible">True</property><property name="stock">gtk-go-up</property></widget><packing><property name="expand">False</property><property name="fill">False</property></packing></child><child><widget class="GtkLabel" id="label10"><property name="visible">True</property><property name="label" translatable="yes">Move _Up</property><property name="use_underline">True</property></widget><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></widget></child></widget></child></widget><packing><property name="expand">False</property><property name="fill">False</property><property name="position">4</property></packing></child><child><widget class="GtkButton" id="button13"><property name="visible">True</property><property name="can_focus">True</property><child><widget class="GtkAlignment" id="alignment9"><property name="visible">True</property><property name="xscale">0</property><property name="yscale">0</property><child><widget class="GtkHBox" id="hbox11"><property name="visible">True</property><property name="spacing">2</property><child><widget class="GtkImage" id="image9"><property name="visible">True</property><property name="stock">gtk-go-down</property></widget><packing><property name="expand">False</property><property name="fill">False</property></packing></child><child><widget class="GtkLabel" id="label11"><property name="visible">True</property><property name="label" translatable="yes">Move _Down</property><property name="use_underline">True</property></widget><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></widget></child></widget></child></widget><packing><property name="expand">False</property><property name="fill">False</property><property name="position">5</property></packing></child></widget><packing><property name="expand">False</property><property name="position">1</property></packing></child></widget><packing><property name="position">1</property></packing></child></widget><packing><property name="resize">True</property><property name="shrink">False</property></packing></child></widget><packing><property name="position">2</property></packing></child><child internal-child="action_area"><widget class="GtkHButtonBox" id="dialog-action_area1"><property name="visible">True</property><property name="layout_style">GTK_BUTTONBOX_END</property><child><widget class="GtkButton" id="cancel"><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="label">gtk-cancel</property><property name="use_stock">True</property><property name="response_id">-6</property></widget></child><child><widget class="GtkButton" id="ok"><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="label">gtk-ok</property><property name="use_stock">True</property><property name="response_id">-5</property></widget><packing><property name="position">1</property></packing></child></widget><packing><property name="expand">False</property><property name="pack_type">GTK_PACK_END</property></packing></child></widget></child></widget></glade-interface>
diff --git a/data/ui/file_operation.glade b/data/ui/file_operation.glade
deleted file mode 100644 (file)
index c962e22..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
-  <!-- interface-requires gtk+ 2.16 -->
-  <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkDialog" id="dlg">
-    <property name="visible">True</property>
-    <property name="border_width">6</property>
-    <property name="resizable">False</property>
-    <property name="default_width">400</property>
-    <property name="type_hint">dialog</property>
-    <property name="gravity">north-east</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox">
-        <property name="visible">True</property>
-        <property name="spacing">12</property>
-        <child>
-          <widget class="GtkTable" id="table">
-            <property name="visible">True</property>
-            <property name="border_width">6</property>
-            <property name="n_rows">4</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">12</property>
-            <property name="row_spacing">6</property>
-            <child>
-              <widget class="GtkLabel" id="from">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-              </widget>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="to">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-              </widget>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="current">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes" comments="Preparing to do some file operation (Copy, Move, Delete...) ">Preparing...</property>
-                <property name="ellipsize">middle</property>
-              </widget>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkProgressBar" id="progress">
-                <property name="visible">True</property>
-                <property name="pulse_step">0.10000000149</property>
-              </widget>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label4">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes" comments="Processing: &lt;Name of currently proccesed file&gt;">&lt;b&gt;Processing:&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="to_label">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes" comments="To: &lt;Destination folder&gt; ex. Copy file to..., Move file to...etc.">&lt;b&gt;To:&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;Progress:&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="action">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <widget class="GtkButton" id="cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="response_id">-6</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_cancel_button_clicked" object="fileOperation"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>
diff --git a/data/ui/file_properties.glade b/data/ui/file_properties.glade
deleted file mode 100644 (file)
index 6c9d41a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"><glade-interface><widget class="GtkDialog" id="dlg"><property name="visible">True</property><property name="border_width">6</property><property name="title" translatable="yes">File Properties</property><property name="resizable">False</property><property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property><property name="default_width">360</property><property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property><property name="gravity">GDK_GRAVITY_CENTER</property><property name="has_separator">False</property><signal name="response" handler="on_filePropertiesDlg_response"/><child internal-child="vbox"><widget class="GtkVBox" id="dialog_vbox"><property name="visible">True</property><property name="spacing">12</property><child><widget class="GtkNotebook" id="notebook"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">6</property><child><widget class="GtkAlignment" id="alignment2"><property name="visible">True</property><property name="top_padding">6</property><property name="bottom_padding">6</property><property name="left_padding">12</property><child><widget class="GtkTable" id="general_table"><property name="visible">True</property><property name="border_width">4</property><property name="n_rows">8</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><widget class="GtkLabel" id="mime_type"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="wrap">True</property><property name="selectable">True</property><property name="ellipsize">PANGO_ELLIPSIZE_END</property></widget><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkLabel" id="label3"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;File _Name:&lt;/b&gt;</property><property name="use_markup">True</property><property name="use_underline">True</property><property name="mnemonic_widget">file_name</property></widget><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkLabel" id="label4"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;File Type:&lt;/b&gt;</property><property name="use_markup">True</property><property name="use_underline">True</property></widget><packing><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkLabel" id="label5"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Total Size of Files:&lt;/b&gt;</property><property name="use_markup">True</property><property name="use_underline">True</property></widget><packing><property name="top_attach">4</property><property name="bottom_attach">5</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkLabel" id="label7"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Last Modification:&lt;/b&gt;</property><property name="use_markup">True</property><property name="use_underline">True</property></widget><packing><property name="top_attach">6</property><property name="bottom_attach">7</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkLabel" id="total_size"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></widget><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">4</property><property name="bottom_attach">5</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkLabel" id="mtime"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></widget><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">6</property><property name="bottom_attach">7</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkLabel" id="label13"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Last Access:&lt;/b&gt;</property><property name="use_markup">True</property><property name="use_underline">True</property></widget><packing><property name="top_attach">7</property><property name="bottom_attach">8</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkLabel" id="atime"><property name="visible">True</property><property name="xalign">0</property></widget><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">7</property><property name="bottom_attach">8</property><property name="y_options"></property></packing></child><child><widget class="GtkLabel" id="label20"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Location:&lt;/b&gt;</property><property name="use_markup">True</property><property name="use_underline">True</property></widget><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkLabel" id="location"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></widget><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkEntry" id="file_name"><property name="visible">True</property><property name="can_focus">True</property></widget><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="y_options"></property></packing></child><child><widget class="GtkLabel" id="label21"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Size on Disk:&lt;/b&gt;</property><property name="use_markup">True</property><property name="use_underline">True</property></widget><packing><property name="top_attach">5</property><property name="bottom_attach">6</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkLabel" id="size_on_disk"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></widget><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">5</property><property name="bottom_attach">6</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkLabel" id="open_with_label"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Open _with:&lt;/b&gt;</property><property name="use_markup">True</property><property name="use_underline">True</property><property name="mnemonic_widget">open_with</property></widget><packing><property name="top_attach">3</property><property name="bottom_attach">4</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkComboBox" id="open_with"><property name="visible">True</property></widget><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">3</property><property name="bottom_attach">4</property><property name="x_options">GTK_FILL</property><property name="y_options">GTK_FILL</property></packing></child></widget></child></widget></child><child><widget class="GtkLabel" id="label1"><property name="visible">True</property><property name="label" translatable="yes">_General</property><property name="use_underline">True</property></widget><packing><property name="type">tab</property><property name="tab_fill">False</property></packing></child><child><widget class="GtkAlignment" id="alignment1"><property name="visible">True</property><property name="top_padding">6</property><property name="bottom_padding">6</property><property name="left_padding">12</property><child><widget class="GtkVBox" id="vbox1"><property name="visible">True</property><property name="spacing">6</property><child><widget class="GtkTable" id="table3"><property name="visible">True</property><property name="border_width">2</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><widget class="GtkLabel" id="owner_label"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;_Owner:&lt;/b&gt;</property><property name="use_markup">True</property><property name="use_underline">True</property><property name="mnemonic_widget">owner</property></widget><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkLabel" id="group_label"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;_Group:&lt;/b&gt;</property><property name="use_markup">True</property><property name="use_underline">True</property><property name="mnemonic_widget">group</property></widget><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkEntry" id="owner"><property name="visible">True</property><property name="can_focus">True</property></widget><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="y_options"></property></packing></child><child><widget class="GtkEntry" id="group"><property name="visible">True</property><property name="can_focus">True</property></widget><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="y_options"></property></packing></child></widget><packing><property name="expand">False</property><property name="fill">False</property></packing></child><child><widget class="GtkHSeparator" id="hseparator1"><property name="visible">True</property></widget><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child><child><widget class="GtkTable" id="table2"><property name="visible">True</property><property name="border_width">4</property><property name="n_rows">3</property><property name="n_columns">6</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><widget class="GtkLabel" id="label17"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Owner:&lt;/b&gt;</property><property name="use_markup">True</property><property name="use_underline">True</property></widget><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkLabel" id="label18"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Group:&lt;/b&gt;</property><property name="use_markup">True</property><property name="use_underline">True</property></widget><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkLabel" id="label19"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Other Users:&lt;/b&gt;</property><property name="use_markup">True</property><property name="use_underline">True</property></widget><packing><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkCheckButton" id="owner_r"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">2</property><property name="label" translatable="yes">Read</property><property name="use_underline">True</property><property name="draw_indicator">True</property></widget><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkCheckButton" id="group_r"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">2</property><property name="label" translatable="yes">Read</property><property name="use_underline">True</property><property name="draw_indicator">True</property></widget><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkCheckButton" id="others_r"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">2</property><property name="label" translatable="yes">Read</property><property name="use_underline">True</property><property name="draw_indicator">True</property></widget><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkCheckButton" id="owner_w"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">2</property><property name="label" translatable="yes">Write</property><property name="use_underline">True</property><property name="draw_indicator">True</property></widget><packing><property name="left_attach">2</property><property name="right_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkCheckButton" id="group_w"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">2</property><property name="label" translatable="yes">Write</property><property name="use_underline">True</property><property name="draw_indicator">True</property></widget><packing><property name="left_attach">2</property><property name="right_attach">3</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkCheckButton" id="others_w"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">2</property><property name="label" translatable="yes">Write</property><property name="use_underline">True</property><property name="draw_indicator">True</property></widget><packing><property name="left_attach">2</property><property name="right_attach">3</property><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkCheckButton" id="owner_x"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">2</property><property name="label" translatable="yes">Execute</property><property name="use_underline">True</property><property name="draw_indicator">True</property></widget><packing><property name="left_attach">3</property><property name="right_attach">4</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkCheckButton" id="group_x"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">2</property><property name="label" translatable="yes">Execute</property><property name="use_underline">True</property><property name="draw_indicator">True</property></widget><packing><property name="left_attach">3</property><property name="right_attach">4</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkCheckButton" id="others_x"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">2</property><property name="label" translatable="yes">Execute</property><property name="use_underline">True</property><property name="draw_indicator">True</property></widget><packing><property name="left_attach">3</property><property name="right_attach">4</property><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkCheckButton" id="set_uid"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">2</property><property name="label" translatable="yes" comments="This is used in file attribute">Set UID</property><property name="use_underline">True</property><property name="draw_indicator">True</property></widget><packing><property name="left_attach">5</property><property name="right_attach">6</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkCheckButton" id="set_gid"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">2</property><property name="label" translatable="yes" comments="This is used in file attribute">Set GID</property><property name="use_underline">True</property><property name="draw_indicator">True</property></widget><packing><property name="left_attach">5</property><property name="right_attach">6</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkCheckButton" id="sticky"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">2</property><property name="label" translatable="yes" comments="This is used in file attribute">Sticky</property><property name="use_underline">True</property><property name="draw_indicator">True</property></widget><packing><property name="left_attach">5</property><property name="right_attach">6</property><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><widget class="GtkVSeparator" id="vseparator1"><property name="visible">True</property></widget><packing><property name="left_attach">4</property><property name="right_attach">5</property><property name="bottom_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options">GTK_FILL</property></packing></child></widget><packing><property name="expand">False</property><property name="position">2</property></packing></child></widget></child></widget><packing><property name="position">1</property></packing></child><child><widget class="GtkLabel" id="label2"><property name="visible">True</property><property name="label" translatable="yes">_Permissions</property><property name="use_underline">True</property></widget><packing><property name="type">tab</property><property name="position">1</property><property name="tab_fill">False</property></packing></child></widget><packing><property name="position">2</property></packing></child><child internal-child="action_area"><widget class="GtkHButtonBox" id="dialog_action_area"><property name="visible">True</property><property name="layout_style">GTK_BUTTONBOX_END</property><child><widget class="GtkButton" id="cancel_button"><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="label">gtk-cancel</property><property name="use_stock">True</property><property name="response_id">-6</property><signal name="clicked" handler="gtk_widget_destroy" object="filePropertiesDlg"/></widget></child><child><widget class="GtkButton" id="ok_button"><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="label">gtk-ok</property><property name="use_stock">True</property><property name="response_id">-5</property><signal name="clicked" handler="gtk_widget_destroy" object="filePropertiesDlg"/></widget><packing><property name="position">1</property></packing></child></widget><packing><property name="expand">False</property><property name="pack_type">GTK_PACK_END</property></packing></child></widget></child></widget></glade-interface>
diff --git a/data/ui/find-files.glade b/data/ui/find-files.glade
deleted file mode 100644 (file)
index b1af38b..0000000
+++ /dev/null
@@ -1,739 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Wed Dec 17 01:40:09 2008 -->
-<glade-interface>
-  <widget class="GtkWindow" id="win">
-    <property name="title" translatable="yes">Find Files</property>
-    <property name="default_width">580</property>
-    <property name="default_height">400</property>
-    <child>
-      <widget class="GtkVBox" id="vbox1">
-        <property name="visible">True</property>
-        <child>
-          <widget class="GtkNotebook" id="search_criteria">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="border_width">4</property>
-            <child>
-              <widget class="GtkVBox" id="vbox2">
-                <property name="visible">True</property>
-                <property name="border_width">6</property>
-                <property name="spacing">6</property>
-                <child>
-                  <widget class="GtkHBox" id="hbox1">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <widget class="GtkLabel" id="label1">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;File Name Contains:&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="padding">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkComboBoxEntry" id="fn_pattern">
-                        <property name="visible">True</property>
-                        <property name="has_focus">True</property>
-                        <child internal-child="entry">
-                          <widget class="GtkEntry" id="fn_pattern_entry">
-                            <property name="visible">True</property>
-                            <property name="activates_default">True</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkCheckButton" id="fn_case_sensitive">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Case Sensitive</property>
-                        <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
-                        <property name="draw_indicator">True</property>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkFrame" id="frame2">
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment1">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <widget class="GtkTable" id="table1">
-                            <property name="visible">True</property>
-                            <property name="border_width">4</property>
-                            <property name="n_rows">3</property>
-                            <property name="n_columns">2</property>
-                            <property name="column_spacing">6</property>
-                            <property name="row_spacing">6</property>
-                            <child>
-                              <widget class="GtkCheckButton" id="video_files">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Video Files (avi, mpg,...)</property>
-                                <property name="response_id">0</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkCheckButton" id="audio_files">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Audio Files (mp3, ogg,...)</property>
-                                <property name="response_id">0</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                              <packing>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkCheckButton" id="img_files">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Image Files (jpg, png,...)</property>
-                                <property name="response_id">0</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkCheckButton" id="text_files">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Plain Text Files</property>
-                                <property name="response_id">0</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                              <packing>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                              </packing>
-                            </child>
-                            <child>
-      &