Git Repositories

Merge the migration-to-gio branch into master.
authorJannis Pohlmann <jannis@xfce.org>
Fri, 21 Aug 2009 15:47:20 +0000 (17:47 +0200)
committerJannis Pohlmann <jannis@xfce.org>
Fri, 21 Aug 2009 15:47:20 +0000 (17:47 +0200)
commit1f5eed407c762bf7ca118e377f91c6cb1e63eb31
treed0c1b60db807e336b28ccaf8edc6d2bfeff68e76
parent116819a0d9f258df20c76cd336723628a3b5798b
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
270 files changed:
.gitignore [new file with mode: 0644]
AUTHORS
ChangeLog
ChangeLog.pre-gio [new file with mode: 0644]
INSTALL [deleted file]
Makefile.am
README
acinclude.m4
autogen.sh
configure.in.in
docs/reference/Makefile.am
docs/reference/thunar-vfs/Makefile.am [deleted file]
docs/reference/thunar-vfs/thunar-vfs-docs.sgml [deleted file]
docs/reference/thunar-vfs/thunar-vfs-overrides.txt [deleted file]
docs/reference/thunar-vfs/thunar-vfs-sections.txt [deleted file]
docs/reference/thunar-vfs/thunar-vfs.types [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-group.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-info.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-init-shutdown.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-interactive-job.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-jobs.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-action.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-application.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-database.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-handler.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-info.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-monitor.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-operations.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-path.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-thumb-factory.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-thumb.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-trash-info.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-trash-manager.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-trash.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-types.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-uri.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-user-manager.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-user.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-util.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-volume-manager.sgml [deleted file]
docs/reference/thunar-vfs/tmpl/thunar-vfs-volume.sgml [deleted file]
docs/reference/thunar-vfs/version.xml.in [deleted file]
docs/reference/thunarx/Makefile.am
docs/reference/thunarx/thunarx-docs.sgml
docs/reference/thunarx/thunarx-sections.txt
docs/reference/thunarx/tmpl/thunarx-file-info.sgml
examples/tex-open-terminal/Makefile.am
plugins/thunar-apr/Makefile.am
plugins/thunar-apr/README
plugins/thunar-sbr/Makefile.am
plugins/thunar-sbr/README
plugins/thunar-sbr/thunar-sbr-date-renamer.c
plugins/thunar-sendto-email/Makefile.am
plugins/thunar-sendto-email/main.c
plugins/thunar-uca/Makefile.am
plugins/thunar-uca/README
plugins/thunar-uca/thunar-uca-model.c
plugins/thunar-uca/thunar-uca-provider.c
plugins/thunar-wallpaper/Makefile.am
plugins/thunar-wallpaper/twp-provider.c
po-doc/LINGUAS [deleted file]
po-doc/Makefile.am
po/LINGUAS [deleted file]
po/POTFILES.in
po/Thunar.pot
tests/Makefile.am [deleted file]
tests/data/Makefile.am [deleted file]
tests/data/test-thunar-vfs-volume-bsd.fstab [deleted file]
tests/test-thunar-vfs-path.c [deleted file]
tests/test-thunar-vfs-uri.c [deleted file]
thunar-vfs/Makefile.am [deleted file]
thunar-vfs/abicheck.sh [deleted file]
thunar-vfs/make-thunar-vfs-alias.pl [deleted file]
thunar-vfs/thunar-vfs-1.pc.in [deleted file]
thunar-vfs/thunar-vfs-config.c [deleted file]
thunar-vfs/thunar-vfs-config.h.in [deleted file]
thunar-vfs/thunar-vfs-deep-count-job.c [deleted file]
thunar-vfs/thunar-vfs-deep-count-job.h [deleted file]
thunar-vfs/thunar-vfs-exec.h [deleted file]
thunar-vfs/thunar-vfs-font-thumbnailer-1.desktop.in [deleted file]
thunar-vfs/thunar-vfs-font-thumbnailer.c [deleted file]
thunar-vfs/thunar-vfs-info.c [deleted file]
thunar-vfs/thunar-vfs-info.h [deleted file]
thunar-vfs/thunar-vfs-interactive-job.c [deleted file]
thunar-vfs/thunar-vfs-interactive-job.h [deleted file]
thunar-vfs/thunar-vfs-io-jobs.c [deleted file]
thunar-vfs/thunar-vfs-io-jobs.h [deleted file]
thunar-vfs/thunar-vfs-io-local-xfer.c [deleted file]
thunar-vfs/thunar-vfs-io-local-xfer.h [deleted file]
thunar-vfs/thunar-vfs-io-local.c [deleted file]
thunar-vfs/thunar-vfs-io-local.h [deleted file]
thunar-vfs/thunar-vfs-io-ops.c [deleted file]
thunar-vfs/thunar-vfs-io-ops.h [deleted file]
thunar-vfs/thunar-vfs-io-scandir.c [deleted file]
thunar-vfs/thunar-vfs-io-scandir.h [deleted file]
thunar-vfs/thunar-vfs-io-trash.c [deleted file]
thunar-vfs/thunar-vfs-io-trash.h [deleted file]
thunar-vfs/thunar-vfs-job-private.h [deleted file]
thunar-vfs/thunar-vfs-job.c [deleted file]
thunar-vfs/thunar-vfs-job.h [deleted file]
thunar-vfs/thunar-vfs-marshal.list [deleted file]
thunar-vfs/thunar-vfs-mime-action-private.h [deleted file]
thunar-vfs/thunar-vfs-mime-action.c [deleted file]
thunar-vfs/thunar-vfs-mime-action.h [deleted file]
thunar-vfs/thunar-vfs-mime-application.c [deleted file]
thunar-vfs/thunar-vfs-mime-application.h [deleted file]
thunar-vfs/thunar-vfs-mime-cache.c [deleted file]
thunar-vfs/thunar-vfs-mime-cache.h [deleted file]
thunar-vfs/thunar-vfs-mime-cleaner.c [deleted file]
thunar-vfs/thunar-vfs-mime-database-private.h [deleted file]
thunar-vfs/thunar-vfs-mime-database.c [deleted file]
thunar-vfs/thunar-vfs-mime-database.h [deleted file]
thunar-vfs/thunar-vfs-mime-handler-private.h [deleted file]
thunar-vfs/thunar-vfs-mime-handler.c [deleted file]
thunar-vfs/thunar-vfs-mime-handler.h [deleted file]
thunar-vfs/thunar-vfs-mime-info.c [deleted file]
thunar-vfs/thunar-vfs-mime-info.h [deleted file]
thunar-vfs/thunar-vfs-mime-legacy.c [deleted file]
thunar-vfs/thunar-vfs-mime-legacy.h [deleted file]
thunar-vfs/thunar-vfs-mime-parser.c [deleted file]
thunar-vfs/thunar-vfs-mime-parser.h [deleted file]
thunar-vfs/thunar-vfs-mime-provider.c [deleted file]
thunar-vfs/thunar-vfs-mime-provider.h [deleted file]
thunar-vfs/thunar-vfs-mime-sniffer.c [deleted file]
thunar-vfs/thunar-vfs-mime-sniffer.h [deleted file]
thunar-vfs/thunar-vfs-monitor-private.h [deleted file]
thunar-vfs/thunar-vfs-monitor.c [deleted file]
thunar-vfs/thunar-vfs-monitor.h [deleted file]
thunar-vfs/thunar-vfs-os-bsd.c [deleted file]
thunar-vfs/thunar-vfs-os-generic.c [deleted file]
thunar-vfs/thunar-vfs-os.h [deleted file]
thunar-vfs/thunar-vfs-path-private.h [deleted file]
thunar-vfs/thunar-vfs-path.c [deleted file]
thunar-vfs/thunar-vfs-path.h [deleted file]
thunar-vfs/thunar-vfs-pixbuf-thumbnailer.c [deleted file]
thunar-vfs/thunar-vfs-private.c [deleted file]
thunar-vfs/thunar-vfs-private.h [deleted file]
thunar-vfs/thunar-vfs-simple-job.c [deleted file]
thunar-vfs/thunar-vfs-simple-job.h [deleted file]
thunar-vfs/thunar-vfs-thumb-jpeg.c [deleted file]
thunar-vfs/thunar-vfs-thumb-jpeg.h [deleted file]
thunar-vfs/thunar-vfs-thumb-private.h [deleted file]
thunar-vfs/thunar-vfs-thumb.c [deleted file]
thunar-vfs/thunar-vfs-thumb.h [deleted file]
thunar-vfs/thunar-vfs-transfer-job.c [deleted file]
thunar-vfs/thunar-vfs-transfer-job.h [deleted file]
thunar-vfs/thunar-vfs-types.h [deleted file]
thunar-vfs/thunar-vfs-update-thumbnailers-cache.c [deleted file]
thunar-vfs/thunar-vfs-user.h [deleted file]
thunar-vfs/thunar-vfs-util.c [deleted file]
thunar-vfs/thunar-vfs-util.h [deleted file]
thunar-vfs/thunar-vfs-volume-freebsd.c [deleted file]
thunar-vfs/thunar-vfs-volume-freebsd.h [deleted file]
thunar-vfs/thunar-vfs-volume-hal.c [deleted file]
thunar-vfs/thunar-vfs-volume-hal.h [deleted file]
thunar-vfs/thunar-vfs-volume-manager.c [deleted file]
thunar-vfs/thunar-vfs-volume-none.c [deleted file]
thunar-vfs/thunar-vfs-volume-none.h [deleted file]
thunar-vfs/thunar-vfs-volume-private.h [deleted file]
thunar-vfs/thunar-vfs-volume.c [deleted file]
thunar-vfs/thunar-vfs-volume.h [deleted file]
thunar-vfs/thunar-vfs.c [deleted file]
thunar-vfs/thunar-vfs.h [deleted file]
thunar-vfs/thunar-vfs.symbols [deleted file]
thunar/Makefile.am
thunar/main.c
thunar/thunar-abstract-icon-view.c
thunar/thunar-application.c
thunar/thunar-application.h
thunar/thunar-browser.c [new file with mode: 0644]
thunar/thunar-browser.h [new file with mode: 0644]
thunar/thunar-chooser-button.c
thunar/thunar-chooser-dialog.c
thunar/thunar-chooser-model.c
thunar/thunar-chooser-model.h
thunar/thunar-clipboard-manager.c
thunar/thunar-clipboard-manager.h
thunar/thunar-create-dialog.c
thunar/thunar-create-dialog.h
thunar/thunar-dbus-client.c
thunar/thunar-dbus-client.h
thunar/thunar-dbus-service-infos.xml
thunar/thunar-dbus-service.c
thunar/thunar-debug.c
thunar/thunar-deep-count-job.c [new file with mode: 0644]
thunar/thunar-deep-count-job.h [new file with mode: 0644]
thunar/thunar-details-view.c
thunar/thunar-dialogs.c
thunar/thunar-dialogs.h
thunar/thunar-dnd.c
thunar/thunar-enum-types.c
thunar/thunar-enum-types.h
thunar/thunar-exec.c [moved from thunar-vfs/thunar-vfs-exec.c with 67% similarity]
thunar/thunar-exec.h [new file with mode: 0644]
thunar/thunar-file.c
thunar/thunar-file.h
thunar/thunar-folder.c
thunar/thunar-gio-extensions.c [new file with mode: 0644]
thunar/thunar-gio-extensions.h [new file with mode: 0644]
thunar/thunar-gtk-extensions.c
thunar/thunar-icon-factory.c
thunar/thunar-icon-factory.h
thunar/thunar-image.c [new file with mode: 0644]
thunar/thunar-image.h [new file with mode: 0644]
thunar/thunar-io-jobs-util.c [new file with mode: 0644]
thunar/thunar-io-jobs-util.h [new file with mode: 0644]
thunar/thunar-io-jobs.c [new file with mode: 0644]
thunar/thunar-io-jobs.h [new file with mode: 0644]
thunar/thunar-io-scan-directory.c [new file with mode: 0644]
thunar/thunar-io-scan-directory.h [new file with mode: 0644]
thunar/thunar-job.c [new file with mode: 0644]
thunar/thunar-job.h [new file with mode: 0644]
thunar/thunar-launcher.c
thunar/thunar-list-model.c
thunar/thunar-location-button.c
thunar/thunar-location-buttons.c
thunar/thunar-location-dialog.c
thunar/thunar-location-entry.c
thunar/thunar-marshal.list
thunar/thunar-metafile.c
thunar/thunar-metafile.h
thunar/thunar-misc-jobs.c [new file with mode: 0644]
thunar/thunar-misc-jobs.h [new file with mode: 0644]
thunar/thunar-path-entry.c
thunar/thunar-permissions-chooser.c
thunar/thunar-preferences-dialog.c
thunar/thunar-preferences.c
thunar/thunar-private.h
thunar/thunar-progress-dialog.c
thunar/thunar-progress-dialog.h
thunar/thunar-properties-dialog.c
thunar/thunar-renamer-dialog.c
thunar/thunar-renamer-dialog.h
thunar/thunar-renamer-model.c
thunar/thunar-renamer-progress.c
thunar/thunar-sendto-model.c
thunar/thunar-shortcuts-icon-renderer.c
thunar/thunar-shortcuts-model.c
thunar/thunar-shortcuts-view.c
thunar/thunar-simple-job.c [new file with mode: 0644]
thunar/thunar-simple-job.h [new file with mode: 0644]
thunar/thunar-size-label.c
thunar/thunar-standard-view.c
thunar/thunar-templates-action.c
thunar/thunar-text-renderer.c
thunar/thunar-thumbnail-generator.c [deleted file]
thunar/thunar-thumbnail-generator.h [deleted file]
thunar/thunar-thumbnailer-dbus.xml [new file with mode: 0644]
thunar/thunar-thumbnailer-manager-dbus.xml [new file with mode: 0644]
thunar/thunar-thumbnailer.c [new file with mode: 0644]
thunar/thunar-thumbnailer.h [new file with mode: 0644]
thunar/thunar-transfer-job.c [new file with mode: 0644]
thunar/thunar-transfer-job.h [new file with mode: 0644]
thunar/thunar-trash-action.c
thunar/thunar-tree-model.c
thunar/thunar-tree-model.h
thunar/thunar-tree-view.c
thunar/thunar-user.c [moved from thunar-vfs/thunar-vfs-user.c with 51% similarity]
thunar/thunar-user.h [new file with mode: 0644]
thunar/thunar-util.c
thunar/thunar-util.h
thunar/thunar-window.c
thunarx/Makefile.am
thunarx/abicheck.sh
thunarx/thunarx-1.pc.in [deleted file]
thunarx/thunarx-2.pc.in [new file with mode: 0644]
thunarx/thunarx-file-info.c
thunarx/thunarx-file-info.h
thunarx/thunarx.symbols