diff options
| author | Jannis Pohlmann <jannis@xfce.org> | 2009-08-21 17:47:20 +0200 |
|---|---|---|
| committer | Jannis Pohlmann <jannis@xfce.org> | 2009-08-21 17:47:20 +0200 |
| commit | 1f5eed407c762bf7ca118e377f91c6cb1e63eb31 (patch) | |
| tree | d0c1b60db807e336b28ccaf8edc6d2bfeff68e76 /examples | |
| parent | 116819a0d9f258df20c76cd336723628a3b5798b (diff) | |
| download | thunar-1f5eed407c762bf7ca118e377f91c6cb1e63eb31.tar.gz | |
Merge the migration-to-gio branch into master.
I'm 100% sure I can implement all ThunarVFS thumbnailers on top of
tumbler in time for the Xfce 4.8 release. Same about the volume monitor
backend for GIO to avoid a GVfs dependency. So why not merge the GIO
branch now?
Not much to say about this merge. It replaces ThunarVFS with GIO inside
Thunar and Thunarx, something I've been working on over the past few
months. It currently requires GVfs for volume monitoring and also
(optionally) depends on tumbler for thumbnail generation. Enjoy.
All .po files are going to be updated in the next commit.
Conflicts:
ChangeLog
INSTALL
acinclude.m4
configure.in.in
plugins/thunar-wallpaper/twp-provider.c
po-doc/ChangeLog
po/ChangeLog
po/LINGUAS
thunar-vfs/thunar-vfs-1.pc.in
thunar-vfs/thunar-vfs-thumb.c
thunar/thunar-templates-action.c
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/tex-open-terminal/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/tex-open-terminal/Makefile.am b/examples/tex-open-terminal/Makefile.am index 01ab1b00..91679893 100644 --- a/examples/tex-open-terminal/Makefile.am +++ b/examples/tex-open-terminal/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"TexOpenTerminal\" \ $(PLATFORM_CPPFLAGS) -extensionsdir = $(libdir)/thunarx-$(THUNAR_VERSION_API) +extensionsdir = $(libdir)/thunarx-$(THUNARX_VERSION_API) extensions_LTLIBRARIES = \ tex-open-terminal.la @@ -21,10 +21,10 @@ tex_open_terminal_la_CFLAGS = \ $(PLATFORM_CFLAGS) tex_open_terminal_la_DEPENDENCIES = \ - $(top_builddir)/thunarx/libthunarx-$(THUNAR_VERSION_API).la + $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la tex_open_terminal_la_LIBADD = \ - $(top_builddir)/thunarx/libthunarx-$(THUNAR_VERSION_API).la \ + $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la \ $(GTK_LIBS) tex_open_terminal_la_LDFLAGS = \ |