.clang-format

+---
+Language: Cpp
+BasedOnStyle: GNU
+
+AlignEscapedNewlines: DontAlign
+AlignTrailingComments: true
+AlignConsecutiveDeclarations: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AlwaysBreakAfterReturnType: All
+BinPackParameters: false
+AlignAfterOpenBracket: true
+BreakBeforeBinaryOperators: NonAssignment
+ColumnLimit: 0
+ContinuationIndentWidth: 0
+IncludeBlocks: Regroup
+IndentGotoLabels: false
+InsertNewlineAtEOF: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 3
+SpaceAfterCStyleCast: true
+
+WhitespaceSensitiveMacros:
+  # Avoid breaking formatting in the code parameter
+  - G_DEFINE_TYPE_WITH_CODE
+  - G_DEFINE_TYPE_EXTENDED
+  - G_DEFINE_ABSTRACT_TYPE_WITH_CODE
+  # Buggy workaround to add exceptions to 'SpaceBeforeParens: Always' (see below)
+  - _
+# Workaround to avoid some alignment bugs when adding a macro to WhitespaceSensitiveMacros,
+# see https://github.com/llvm/llvm-project/issues/55443#issuecomment-1953268337
+# This doesn't fix all alignment bugs though, so I'd rather make an exception only for '_',
+# and not also for 'N_' or 'I_' for example.
+# See also https://github.com/llvm/llvm-project/issues/82288
+Macros:
+  - _(x)=x
+...

.gcc-analyzer-false-positives

+# action_mgr->n_files_to_process > 0 ensures that action_mgr->files_to_process != NULL
+thunar-action-manager.c:[0-9]+:[0-9]+: warning: dereference of NULL .+\*action_mgr.files_to_process.+ \[CWE-476\] \[-Wanalyzer-null-dereference\]
+
+# perhaps a bit questionable, but it's been working for a long time, and it seems
+# a bit pointless to add a lot of cast to silence this warning
+thunar-dbus-service.c:[0-9]+:[0-9]+: warning: .+va_arg.+ expected .+void \*\*.+ but received .+gboolean \(\*\)\(ThunarDBusFileManager \*, GDBusMethodInvocation \*, const gchar \*, gboolean,  gboolean,  const gchar \*, const gchar \*, ThunarDBusService \*\).+ \{aka .+int \(\*\)\(struct _ThunarDBusFileManager \*, struct _GDBusMethodInvocation \*, const char \*, int,  int,  const char \*, const char \*, struct _ThunarDBusService \*\).+\} for variadic argument 2 of .+ap.+ \[CWE-686\] \[-Wanalyzer-va-arg-type-mismatch\]
+thunar-dbus-service.c:[0-9]+:[0-9]+: warning: .+va_arg.+ expected .+void \*\*.+ but received .+gboolean \(\*\)\(ThunarDBusTrash \*, GDBusMethodInvocation \*, const gchar \*, const gchar \*, ThunarDBusService \*\).+ \{aka .+int \(\*\)\(struct _ThunarDBusTrash \*, struct _GDBusMethodInvocation \*, const char \*, const char \*, struct _ThunarDBusService \*\).+\} for variadic argument 2 of .+ap.+ \[CWE-686\] \[-Wanalyzer-va-arg-type-mismatch\]
+thunar-dbus-service.c:[0-9]+:[0-9]+: warning: .+va_arg.+ expected .+void \*\*.+ but received .+gboolean \(\*\)\(ThunarDBusThunar \*, GDBusMethodInvocation \*, const gchar \*, gchar \*\*, gboolean,  const gchar \*, const gchar \*, ThunarDBusService \*\).+ \{aka .+int \(\*\)\(struct _ThunarDBusThunar \*, struct _GDBusMethodInvocation \*, const char \*, char \*\*, int,  const char \*, const char \*, struct _ThunarDBusService \*\).+\} for variadic argument 2 of .+ap.+ \[CWE-686\] \[-Wanalyzer-va-arg-type-mismatch\]
+thunar-dbus-service.c:[0-9]+:[0-9]+: warning: .+va_arg.+ expected .+void \*\*.+ but received .+gboolean \(\*\)\(ThunarOrgFreedesktopFileManager1 \*, GDBusMethodInvocation \*, gchar \*\*, const gchar \*, ThunarDBusService \*\).+ \{aka .+int \(\*\)\(struct _ThunarOrgFreedesktopFileManager1 \*, struct _GDBusMethodInvocation \*, char \*\*, const char \*, struct _ThunarDBusService \*\).+\} for variadic argument 2 of .+ap.+ \[CWE-686\] \[-Wanalyzer-va-arg-type-mismatch\]
+
+# not super obvious, but if we get there and err == NULL then target_filenames[0] != NULL
+# and there is at least one file in target_file_list
+thunar-dbus-service.c:[0-9]+:[0-9]+: warning: dereference of NULL .+target_file_list.+ \[CWE-476\] \[-Wanalyzer-null-dereference\]
+thunar-dbus-service.c:[0-9]+:[0-9]+: warning: dereference of NULL .+target_file_list.+ \[CWE-476\] \[-Wanalyzer-null-dereference\]
+thunar-dbus-service.c:[0-9]+:[0-9]+: warning: dereference of NULL .+target_file_list.+ \[CWE-476\] \[-Wanalyzer-null-dereference\]
+
+# this is from plugins/thunar-uca/thunar-uca-model.c:285:11:
+# g_warning ("Failed to load `%s': %s", filename, error->message);
+# in normal operating mode (i.e. no g_return_val_if_fail()) error is set
+glib-2.0/glib/gmessages.h:[0-9]+:[0-9]+: warning: dereference of NULL .+error.+ \[CWE-476\] \[-Wanalyzer-null-dereference\]

.gitignore

@@ -28,7 +28,6 @@ core.*
 core
 *.core
 *.desktop
-*.desktop.in
 *.service
 *.policy
 org.xfce.thunar.appdata.xml
@@ -53,7 +52,7 @@ docs/reference/thunarx/.*.swp
 docs/reference/thunarx/*.bak
 docs/reference/thunarx/thunarx-decl-list.txt
 docs/reference/thunarx/thunarx-decl.txt
-docs/reference/thunarx/thunarx-overrides.txt
+docs/reference/thunarx/thunarx-docs.xml
 docs/reference/thunarx/thunarx-undeclared.txt
 docs/reference/thunarx/thunarx-undocumented.txt
 docs/reference/thunarx/thunarx-unused.txt
@@ -67,31 +66,6 @@ docs/reference/thunarx/version.xml
 docs/reference/thunarx/tmpl/*.bak
 docs/reference/thunarx/tmpl/.*.swp
 docs/reference/thunarx/tmpl/thunarx-unused.sgml
-docs/reference/thunar/xml
-docs/reference/thunar/html
-docs/reference/thunar/*.stamp
-docs/reference/thunar/.*.swp
-docs/reference/thunar/*.bak
-docs/reference/thunar/thunar-decl-list.txt
-docs/reference/thunar/thunar-decl.txt
-docs/reference/thunar/thunar-header.txt
-docs/reference/thunar/thunar-overrides.txt
-docs/reference/thunar/thunar-scan.c
-docs/reference/thunar/thunar-sections.txt
-docs/reference/thunar/thunar-undeclared.txt
-docs/reference/thunar/thunar-undocumented.txt
-docs/reference/thunar/thunar-unused.txt
-docs/reference/thunar/thunar.args
-docs/reference/thunar/thunar.actions
-docs/reference/thunar/thunar.hierarchy
-docs/reference/thunar/thunar.interfaces
-docs/reference/thunar/thunar.prerequisites
-docs/reference/thunar/thunar.signals
-docs/reference/thunar/thunar.types
-docs/reference/thunar/version.xml
-docs/reference/thunar/tmpl/*.bak
-docs/reference/thunar/tmpl/.*.swp
-docs/reference/thunar/tmpl/thunar-unused.sgml
 examples/.*.swp
 examples/tex-open-terminal/.*.swp
 icons/.*.swp
@@ -106,9 +80,8 @@ plugins/thunar-sbr/.*.swp
 plugins/thunar-sendto-email/thunar-sendto-email
 plugins/thunar-sendto-email/thunar-sendto-email.desktop
 plugins/thunar-sendto-email/.*.swp
-plugins/thunar-tpa/thunar-tpa-bindings.*
+plugins/thunar-tpa/thunar-tpa-bindings.[ch]
 plugins/thunar-tpa/thunar-tpa.desktop
-plugins/thunar-tpa/thunar-tpa.desktop.in
 plugins/thunar-tpa/.*.swp
 plugins/thunar-tpa/thunar-tpa
 plugins/thunar-uca/.*.swp
@@ -150,17 +123,29 @@ thunarx/.*.swp
 thunarx/*.pc
 thunarx/*.gir
 thunarx/*.typelib
-thunarx/thunarx-alias*.[ch]
+thunarx/thunarx-visibility.[ch]
 thunarx/thunarx-config.h
+*~
 *.o
 *.lo
 *.la
 .libs
 .deps
 thunar-vfs
-config.h.in~
-configure.ac
 gtk-doc.m4
 test-driver
 m4/*
 !m4/introspection.m4
+ABOUT-NLS
+config.rpath
+po/Makevars.template
+po/Rules-quot
+po/boldquot.sed
+po/en@boldquot.header
+po/en@quot.header
+po/insert-header.sin
+po/quot.sed
+po/remove-potcdate.sin
+thunar/libthunar.a
+po/remove-potcdate.sed
+po/thunar.pot

.gitlab/issue_templates/Default.md

+<!-- Please drop all sections which are not relevant for your concrete use-case -->
+<!-- For enhancements and new features only the section 'Version information' might be relevant -->
+
+## Version information
+<!-- Which version of this software are you using? -->
+<!-- Which distribution are you using? -->
+
+## Steps to reproduce
+<!-- Please, explain as detailed as possible the sequence of actions necessary to reproduce the issue -->
+
+ 1. ...
+ 2. ...
+ 3. ...
+
+## Current behavior
+<!-- Please describe the current behaviour -->
+
+## Expected outcome
+<!-- Please describe the expected outcome -->
+
+## Backtrace
+<!--
+For crashes, it's best to get a backtrace to see which method failed to execute.
+
+To get a meaningful backtrace, you will need to install debug symbols. Check the Xfce wiki to see how to do so:
+https://docs.xfce.org/contribute/bugs/start#backtraces
+
+It's basically `ulimit -c unlimited` to produce coredumps on crashes and then using gdb on it to get the backtrace out of the coredump.
+-->
+
+## Additional information
+<!--
+ - Screenshots are useful for visual errors
+ - Please report any warning or message printed on the terminal
+-->
\ No newline at end of file

.scan-build-false-positives

+# generated code
+Thunarx-3.0.c:[0-9]+:[0-9]+: warning: Access to field 'message' results in a dereference of a null pointer \(loaded from variable 'error'\) \[core.NullDereference\]
+thunar-tpa-bindings.c:[0-9]+:[0-9]+: warning: Value stored to 'skeleton' during its initialization is never read \[deadcode.DeadStores\]
+thunar-dbus-freedesktop-interfaces.c:[0-9]+:[0-9]+: warning: Value stored to 'skeleton' during its initialization is never read \[deadcode.DeadStores\]
+thunar-thumbnailer-proxy.c:[0-9]+:[0-9]+: warning: Value stored to 'skeleton' during its initialization is never read \[deadcode.DeadStores\]
+thunar-dbus-service-infos.c:[0-9]+:[0-9]+: warning: Value stored to 'skeleton' during its initialization is never read \[deadcode.DeadStores\]
+thunar-dbus-service-infos.c:[0-9]+:[0-9]+: warning: Value stored to 'skeleton' during its initialization is never read \[deadcode.DeadStores\]
+thunar-dbus-service-infos.c:[0-9]+:[0-9]+: warning: Value stored to 'skeleton' during its initialization is never read \[deadcode.DeadStores\]
+thunar-thumbnail-cache-proxy.c:[0-9]+:[0-9]+: warning: Value stored to 'skeleton' during its initialization is never read \[deadcode.DeadStores\]
+
+# n_files = g_list_length (file_infos) so files[n] is initialized for all n
+thunar-uca-model.c:[0-9]+:[0-9]+: warning: The left operand of '&' is a garbage value \[core.UndefinedBinaryOperatorResult\]
+thunar-uca-model.c:[0-9]+:[0-9]+: warning: 1st function call argument is an uninitialized value \[core.CallAndMessage\]
+
+# not super obvious, but if we get there and err == NULL then target_filenames[0] != NULL
+# and there is at least one file in target_file_list
+thunar-dbus-service.c:[0-9]+:[0-9]+: warning: Access to field 'data' results in a dereference of a null pointer \(loaded from variable 'target_file_list'\) \[core.NullDereference\]
+
+# item_count = g_list_length (toolbar_items) so target_order[i] and current_order[j] are initialized for all i,j
+thunar-toolbar-editor.c:[0-9]+:[0-9]+: warning: Assigned value is garbage or undefined \[core.uninitialized.Assign\]
+thunar-toolbar-editor.c:[0-9]+:[0-9]+: warning: Assigned value is garbage or undefined \[core.uninitialized.Assign\]
+
+# the only case where new_name isn't reassigned is the else branch, where there is a g_assert
+thunar-util.c:[0-9]+:[0-9]+: warning: Use of memory after it is freed \[unix.Malloc\]
+
+# needed to avoid -Wunused-result
+thunar-window.c:[0-9]+:[0-9]+: warning: Value stored to 'list' is never read \[deadcode.DeadStores\]
+
+# zero size array is a legal thing and is consistent with i < item_count in for loops
+thunar-window.c:[0-9]+:[0-9]+: warning: Declared variable-length array \(VLA\) has zero size \[core.VLASize\]
+thunar-window.c:[0-9]+:[0-9]+: warning: Declared variable-length array \(VLA\) has zero size \[core.VLASize\]
+
+# item_count = g_list_length (toolbar_items) so current_order[j] is initialized for all j
+thunar-window.c:[0-9]+:[0-9]+: warning: Assigned value is garbage or undefined \[core.uninitialized.Assign\]

Makefile.am

@@ -21,12 +21,12 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS =								\
 	icons								\
-	po								\
 	thunarx								\
 	thunar								\
 	docs								\
 	examples							\
-	plugins
+	plugins                                                         \
+	po
 
 distclean-local:
 	rm -rf *.cache *~
@@ -46,22 +46,21 @@ ChangeLog: Makefile
 dist-hook: ChangeLog
 
 desktopdir = $(datadir)/applications
-desktop_in_in_files = 							\
-	thunar.desktop.in.in						\
-	thunar-bulk-rename.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-%.desktop.in: %.desktop.in.in Makefile
-	$(AM_V_GEN) $(SED) -e "s,\@HELPERDIR\@,$(HELPER_PATH_PREFIX),g" < $< > $@
+desktop_in_files = 							\
+	thunar.desktop.in						\
+	thunar-bulk-rename.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+%.desktop: %.desktop.in Makefile
+	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 #
 # .appdata
 #
-@INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/metainfo
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 appdata_in_files = org.xfce.thunar.appdata.xml.in
+%.appdata.xml: %.appdata.xml.in Makefile
+	$(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.xfce.FileManager.service.in	\
@@ -83,37 +82,41 @@ polkit_in_files = $(polkit_in_in_files:.policy.in.in=.policy.in)
 %.policy.in: %.policy.in.in Makefile
 	sed -e "s,\@bindir\@,$(bindir),g" < $< > $@
 polkit_policy_DATA = $(polkit_in_files:.policy.in=.policy)
-@INTLTOOL_POLICY_RULE@
+# Not using HAVE_POLKIT because a lot of distributions put
+# polkit.{its,loc} in binary package instead of development package.
+# E.g. Debian puts in polkitd instead of libpolkit-gobject-1-dev
+%.policy: %.policy.in Makefile
+	$(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ || \
+		cp $< $@
 
 EXTRA_DIST =								\
 	FAQ								\
 	HACKING								\
 	README.md								\
-	intltool-extract.in						\
-	intltool-merge.in						\
-	intltool-update.in						\
-	$(desktop_in_in_files)						\
+	$(desktop_in_files)						\
 	$(service_in_files)						\
 	$(systemd_user_in_files)					\
 	$(appdata_in_files)						\
 	$(polkit_in_in_files)					\
-	m4/introspection.m4
+	its/xfce.loc							\
+	its/xfce.its							\
+	m4/introspection.m4 \
+	po/meson.build \
+	meson_options.txt \
+	meson.build \
+	xfce-revision.h.in \
+	$(NULL)
 
 CLEANFILES		= $(appdata_DATA)
 
 DISTCLEANFILES =							\
-	intltool-extract						\
-	intltool-merge							\
-	intltool-update							\
-	$(desktop_in_files)						\
 	$(desktop_DATA)							\
 	$(service_DATA)							\
 	$(systemd_user_DATA)					\
 	$(polkit_in_files)						\
-	$(polkit_policy_DATA)					\
-	po/.intltool-merge-cache.lock
+	$(polkit_policy_DATA)
 
-DISTCHECK_CONFIGURE_FLAGS =						\
+AM_DISTCHECK_CONFIGURE_FLAGS =						\
 	--enable-gtk-doc							\
 	--enable-gen-doc							\
 	--enable-introspection

NEWS

+4.20.0 (2024-12-15)
+======
+
+- Translation Updates:
+  Finnish, Hebrew, Latvian, Polish, Romanian, Spanish
+
+4.19.5 (2024-12-01)
+======
+- Bump year in about dialog
+- I18n: Update po/LINGUAS list (#939)
+- I18n: I18n translation ru (#939)
+- Attempt to fully read into buffer during file compare (#1495)
+- File operation dialog: always show "apply to all" box
+- Fix string leak in thunar_thumbnailer_file_is_supported
+- Translation Updates:
+  , Chinese (China), Czech, English (United Kingdom), Finnish,
+  Galician, German, Greek, Indonesian, Kazakh, Occitan (post 1500),
+  Panjabi (Punjabi), Polish, Portuguese (Brazil), Spanish, Telugu,
+  Turkish, Urdu, Urdu (Pakistan), Vietnamese
+
+4.19.4 (2024-11-01)
+======
+- Add missing return statements (#1480)
+- Verify copied destination file using direct I/O (#1471)
+- Drop optional POLKIT dependency (#1403)
+- Fix GCancellable leaks in trash applet
+- Add emblem and type description to mount points (#1388)
+- Show "Properties" menu entry for unmounted devices
+- Support second shortcut for tab switch (#1472)
+- Verify by compare instead of checksum (#1471)
+- Fix path entry DnD code (#1470)
+- Apply .clang-format to all *.c and *.h files
+- Use G_VALUE_INIT over custom initializer
+- adding .clang-format file
+- Fix accel map loading (#1047)
+- build: Bump requirements for Xfce 4.20
+- Fix use-after-free in thunar_dialogs_show_job_ask_replace (#1466)
+- Regression: Fix "middle click open" (#1455)
+- Dont change selection on activate
+- Fix selection changed throttle (#1429)
+- Increase location button max with (#1430)
+- Rework handling of location buttons (#951)
+- Fix string leak in thunar_io_jobs_load_statusbar_text_for_folder
+- Fix color string leaks in properties dialog
+- Fix color leak in thunar_util_clip_view_background
+- Fix string leak in thunar_history_error_not_found
+- Fix GFile leak in thunar_job_operation_restore_from_trash
+- Fix string leak in thunar_emblem_chooser_file_changed
+- Fix GFile leak in thunar_transfer_job_move_file_with_rename
+- Fix GFileInfo leak in thunar_job_operation_restore_from_trash
+- Fix GAppInfo leaks in thunar_g_app_info_launch
+- Fix string leak in thunar_job_operation_restore_from_trash
+- Add NULL check before folder usage
+- Fix g_hash_table_get_keys leak
+- Fix ThunarRenamerPair leak when using bulk renamer
+- Fix string leak in thunar_uca_editor_load
+- Show name of parent folder in replace dialog (#62)
+- Fix crash when connecting via gvfs (#1450)
+- Fix GHashTable leak in thunar_tree_view_model_file_count_callback
+- Fix string leak in thunar_io_jobs_util_next_renamed_file
+- Add check that widget is a window as expected (#1454)
+- Fix GFile leak when using intermediate file on copy setting
+- Fix string leak in thunar_dialogs_show_job_ask_replace
+- Fix string leak in thunar_uca_model_remove
+- Avoid critical when thumbnailer_proxy is NULL
+- Fix leaks in thunar_apr_image_page_file_changed
+- Fix AtkRelationSet leaks in bulk renamer dialog
+- Fix AtkRelationSet leaks in apr plug-in
+- Fix leak in thunar_details_view_button_press_event
+- Fix leak in thunar_window_open_files_in_location
+- Call ThunarStatusbar's parent finalizer to prevent leaks
+- Fix leak in thunar_details_view_button_press_event
+- Fix leak when middle-clicking on directory row
+- Fix leaks when using Open Item Location menu item
+- Fix leak in _thunar_search_folder
+- Fix leak of search_query string
+- Fix leaks in thunar_application_command_line
+- Fix leak in thunar-gtk-extensions (#1451)
+- Fix leak in thunar_application_accel_map_init
+- Fix typo in status bar text for Edit > Preferences menu item
+- Fix g_object_get leak in thunar_window_init
+- Fix two leaks in _thunar_search_folder
+- Fix g_object_get leaks in status bar code
+- Wrap single-word filenames in delete dialog (#1412)
+- Add command line option to force new window
+- Change width calculation of rename dialog (#1392)
+- Make location "admin:///" work again
+- Rework padding in replace dialog
+- Improve handling of long filenames in replace dialog
+- Statusbar: Count "backup" files as hidden files
+- Fix criticals about unset GIO attributes (#1063)
+- Show full context menu during search (#837)
+- Prevent double free for hidden files (#1438)
+- Fix icon-name leaks in thunar_window_view_switcher_update
+- Fix minor memory leak in uca provider
+- twp: Prevent crash in wayland (#1437)
+- Transfer files dialog use less buttons (#58)
+- Remove filter model in toolbar editor code
+- Revert "Increase max location selector button size (#1430)"
+- Increase max location selector button size (#1430)
+- List view: Empty size column for directories (#543)
+- Add tooltip to special columns in column editor
+- Fix handling of special columns in list view
+- Revert "Remove 'Date Deleted' from 'Configure Column' List (#750)"
+- Fix overlapping UCA editor dialog widgets (startup notification)
+- Revert signal handler setup for RadioToolButtons (#1426)
+- Use unique enum names for alternative shortcuts (#1421)
+- Use initial widget variables when calling unref
+- Tweak header bar margins
+- Add View Switcher item to toolbar
+- UCA - improve shortcuts handling (#1410)
+- Reduce events monitored by UCA file monitor
+- Fix Toolbar bug when CSD is used (#1414)
+- I18n: Update po/LINGUAS list
+- Fix CSD label text
+- Option to use client side decorations (CSD)
+- Use top-window as fallback for dialogs (#1398)
+- Support copy/link within a folder via CTRL+drag (#63)
+- Rework the "Show Menubar" toolbar button (#936)
+- Optionally show hidden files count in statusbar (#1387)
+- Translation Updates:
+  Albanian, Arabic, Armenian, Armenian (Armenia), Asturian, Basque,
+  Belarusian, Bengali, Bulgarian, Catalan, Chinese (China), Chinese
+  (Hong Kong), Chinese (Taiwan), Czech, Danish, Dutch, Eastern
+  Armenian, English (Australia), English (United Kingdom), Esperanto,
+  Estonian, Finnish, French, Galician, German, Greek, Hebrew,
+  Hungarian, Icelandic, Interlingue, Italian, Japanese, Kazakh,
+  Latvian, Malay, Norwegian Bokmål, Norwegian Nynorsk, Occitan (post
+  1500), Persian (Iran), Polish, Portuguese, Portuguese (Brazil),
+  Romanian, Serbian, Slovak, Slovenian, Spanish, Swedish, Thai,
+  Turkish, Uyghur, Vietnamese
+
+4.19.3 (2024-07-30)
+======
+- Allow type ahead search the treeview sidepane
+- Added a hidden setting to toggle tree-lines
+- Pass toplevel window to emblem chooser error dialog  (#1393)
+- Use parent windows for undo/redo dialog (#1393)
+- Simplify reload after rename (#1395)
+- Dont destroy ThunarFiles on request (#1357)
+- Always re-add files to cache on reload (#1357)
+- Rework event handling for toolbar context menu
+- Don't work with ThunarFolder in separate jobs
+- Do not request thumbnails unconditionally (#1385)
+- Add default bindings for special keys (#1386)
+- Prevent preleminary destruction of ThunarFiles
+- Only add successfully opened files to Recent
+- Add files opened via the location entry to Recent (#1349)
+- Improve behavior of split view separator (#1107)
+- Option to disable ctrl+scroll to zoom (#1379)
+- Hide single tab in split view
+- Immediately focus split view pane on DnD events
+- Re-enable toolbar overflow menu (#1240)
+- Adding an default issue template
+- Reduce width of the toolbar editor
+- Hide OpenItemLocation/Restore menu entry in tree view
+- Fix leaking ThunarFile (#573)
+- Add preferences settings for usage of symbolic icons
+- Do not enter folder when DnD menu is shown
+- Fix for "misc_open_new_windows_in_split_view" (#889)
+- thunar-uca: Use regular icons in editor
+- thunar-uca: Update info text in chooser dialog
+- Optionally use symbolic icons in location bar
+- Show warn on selecting too many emblems (#1368)
+- Dont add directories to recent:/// (#1372)
+- Update the sidepane/toolbar when toggling symbolic icons
+- Make symbolic icons in sidepane theme-color aware
+- Rework toolbar configuration storage (#1028)
+- Always render up to 4 emblems (#1368)
+- Prevent icon emblems from overlapping (#1368)
+- Prevent double-restore (#1369)
+- Fix ThunarxMenuItem sensitive property
+- clang build Fixes
+- build: Use AM_DISTCHECK_CONFIGURE_FLAGS
+- Fix workaround for icon "inode-directory"
+- Add missing top border to tree pane
+- Prevent g_malloc_n build warnings (#1362)
+- Add "symbolic" value to cached icons (#1363)
+- Enter folders automatically while dragging files (#5)
+- Focus split view pane on DnD events (#1243)
+- Shorten symbolic xfconf property names
+- Optionally use symbolic icons in the sidepane (#252)
+- Usage of window-close-symbolic (#960)
+- Use symbolic insons only for the toolbar
+- Fix several out of sync bugs (#1326)
+- Rework focus indicator for split view (#730)
+- Improve various aspects of the Image Preview pane (#932)
+- prefs-dialog: Change order of RECURSIVE_SEARCH options
+- prefs-dialog: Improve PARALLEL_COPY_MODE strings
+- Move TRASH_DELETE keyboard shortcuts to MOVE_TO_TRASH section
+- Always show "Paste" entry in Edit menu
+- Reveal keyboard shortcut for "Open with Application" menu entry
+- Add keyboard shortcut for "Invert Selection"
+- Add "Remove from Recent" to Edit menu
+- Improve "Open Item Location" menu entry
+- Show "Open With Default Applications" entry only for multiple files
+- Move "Edit Launcher" menu entry into "Open" section
+- Fix location of "Create" menu section in Location Bar / Side Pane
+- Fix location of "Restore" menu section
+- Fix Regression: Tabs order on restore (#1341)
+- Clear current selection when requesting a new one (#1338)
+- Refactor "select after reload" mechanics (#1338)
+- Resolve conflicting mnemonics and add missing ones
+- Statusbar: re-add last-modified time for folders (#1348)
+- Fix regression during device eject (#1347)
+- Use GHashTable to store files (#1337)
+- Restore tabs when launched with uri arg. (#1233)
+- Dont reload folder when "draw_frames" is set (#1337)
+- Add New Tab and New Window icons to toolbar (#1263)
+- Fix icon view regression (#1315)
+- Improve icon view performance (#1315)
+- Performance improvements (#1315)
+- tree-view-model: Fix gettext warning about empty string
+- build: Optional require polkit for l10n xml files
+- build: Get rid of intltool
+- po/sl.po: Fix unmatched format specifier
+- build: fix automake non standard library name
+- Fix leak during search
+- Fix a leak in statusbar code
+- Fix parentheses-equality warning
+- Allow sumenu UCAs in toolbar (#780)
+- Fix shortcuts for ucas in subfolders (#1043)
+- Display cached thumbnails as themselves (#1331)
+- Load statusbar text in separate job (#1315)
+- Move statusbar text method to thunar-util
+- Improve statusbar performance (#1315)
+- Fix possible NULL pointer dereference (#1330)
+- Consider display_name=NULL cases (#1329)
+- re-enable file monitor for search files (#1320)
+- Fix possible deadlock during search (#1321)
+- Initialize variable in thunar_details_view_button_press_event
+- Prevent use after free (#1325)
+- Initialize variable in thunar_tree_view_model_dir_files_changed
+- Fix leaks during file duplication (#1322)
+- Use xfce_dialog_show_error (#1320)
+- Disconnect ShortcutModel on finalize (#1314)
+- Prevent crash on open non-readable folder
+- Prevent warning in tree-view
+- Dont save bookmarks on trash change (#141)
+- Fix support for bookmark reloading
+- Fix bulk renamer crash on close (#1307)
+- Prevent CRITICAL when leaving search
+- Fix regression: Missing window icon
+- No view-switch while searching (#1293)
+- Fix mem leak in action-manager (#573)
+- Fix memory leak in thunar-history (#573)
+- Various Refactorings in "ThunarWindow"
+- Show complete file paths in tooltips (#1213)
+- Fix bug in file_watch (#1300)
+- Prevent double-free for ThunarJob (#1299)
+- Fix memory leak in statusbar (#573)
+- Fix various memory leaks on ThunarJobs
+- Fix possible double-free on thunar job (#1299)
+- Improve handling of "loading" property (#1296)
+- Dont show 'open location' on recent icon(#1297)
+- Simplify ThunarFile destruction in shortcut-model
+- Prevent re-creation of shortcut model on exit
+- Minor simplification for tree-view pane
+- Properly release job when finished (#1192)
+- Fix "files-changed" handling for tree-pane (#1292)
+- Properly remove timeout source (#1077)
+- Throttle selection changed (#1077)
+- Refactored "thunar_folder_monitor"
+- move file-monitoring into thunar-folder
+- Fix for image preview visibility (#1285)
+- Dont raise progress dialog for short jobs (#35)
+- Prevent focus stealing of file transfer dialog (#643)
+- Add text to toolbar config dialog (#1282)
+- Dont update "last-view" when searching (#1278)
+- Wrapping labels containing local variable definitions to its own scope
+- Translation Updates:
+  , Albanian, Arabic, Armenian, Armenian (Armenia), Asturian, Basque,
+  Bengali, Bulgarian, Chinese (China), Chinese (Hong Kong), Chinese
+  (Taiwan), Czech, Danish, Dutch, Eastern Armenian, English
+  (Australia), English (United Kingdom), Esperanto, Estonian, Finnish,
+  French, Galician, German, Greek, Hebrew, Hungarian, Icelandic,
+  Interlingue, Italian, Japanese, Kazakh, Latvian, Malay, Norwegian
+  Bokmål, Norwegian Nynorsk, Occitan (post 1500), Persian (Iran),
+  Polish, Portuguese, Portuguese (Brazil), Romanian, Serbian, Slovak,
+  Slovenian, Spanish, Swedish, Telugu, Thai, Turkish, Urdu, Urdu
+  (Pakistan), Uyghur, Vietnamese
+
+4.19.2 (2023-12-30)
+======
+- Prevent infinite reload loop for symlinks (#1270)
+- Translation Updates:
+  Japanese, Portuguese (Brazil)
+
+4.19.1 (2023-12-28)
+======
+- Properly handle renaming of hidden files (#1259)
+- Use libxfce4ui API to create dialog when renaming launchers
+- Dont copy/move thumbnails for symlink which are copied/moved
+- Use ThunarFile as key instead of gFile (#1231)
+- Replace g_assert statements in tree-view-model
+- Remove configure~
+- Use g_file_get_basename over realpath (#1030)
+- Fix and simplify symlink resolver (#1260)
+- Fix thumbnailer symlink support (#1260)
+- Use file-monitor for thumb-updated signal (#1229)
+- Make sure parent exists before usage (#1256)
+- Use "g_signal_handlers_disconnect_by_data"
+- Fix reference counting for thumbnailer and proxy
+- Restart thumbnailer proxy after failure (#1252)
+- Prevent GLib GIO CRITICAL (#1204)
+- Preload image-preview thumbnails
+- Minor image-preview fixes
+- Unify way to request thumbnails for preview (#949)
+- Request thumbnails in replace dialog (#737)
+- Thumbnailer: Agregate requests and make use of READY signal
+- Thumbnailer: Simplify loading logic
+- Thumbnailer: Dont process ready/error in 'idle'
+- Thumbnailer: Always provide a request id
+- Thumbnailer: Remove unused "lazy" flag
+- prefs-dialog: Fix xfce_titled_dialog_create_action_area deprecation
+- standard-view: Reset drag data in one place
+- Allow to use stringv type via get_metadata_setting
+- Usage of io-jobs to set emblems (#892)
+- Dont force "thunar" prefix for metadata
+- Allow to use stringv type via set_metadata_setting
+- Improve UCA parameter description (#1235)
+- Prevent reload loop when thumnailing fails (#1225)
+- Bump min exo version to 4.19,0 (#1226)
+- Translation Updates:
+  Albanian, Arabic, Armenian, Armenian (Armenia), Asturian, Basque,
+  Bengali, Bulgarian, Chinese (China), Chinese (Hong Kong), Chinese
+  (Taiwan), Czech, Danish, Dutch, Eastern Armenian, English
+  (Australia), English (United Kingdom), Esperanto, Estonian, Finnish,
+  French, Galician, German, Greek, Hebrew, Hungarian, Icelandic,
+  Interlingue, Italian, Japanese, Kazakh, Latvian, Malay, Norwegian
+  Bokmål, Norwegian Nynorsk, Occitan (post 1500), Persian (Iran),
+  Polish, Portuguese, Portuguese (Brazil), Romanian, Serbian, Slovak,
+  Spanish, Swedish, Telugu, Thai, Turkish, Urdu, Urdu (Pakistan),
+  Uyghur, Vietnamese
+
+4.19.0 (2023-10-10)
+======
+- thunar-settings: Let Thunar guess the right display to use
+- Load content types in a separate job (#1192)
+- Add possibility to change metadata via a ThunarJob
+- Remove thumbnail request in properties dialog
+- Use a fallback file basename when unknown (#1219)
+- Prevent deadlock during thumbnail loading (#1217)
+- Remember the bulk renamer dialog size (Issue #1040)
+- Apply scale factor as well to thumbnails (#1143)
+- Move thumbnail request handling to the icon-renderer
+- Support ipv6 remote URLs (#864)
+- Handled Expand/Collapse in single-click mode (#1148)
+- Fix DnD for expandable folders (#1144)
+- Change toggle sort order menu item to check menu item (#781)
+- Add a setting for window title style (#1130)
+- Change state of split view button in the toolbar when needed
+- Fix thunar critical and leak (#1179)
+- Convert toolbar view buttons into radio buttons (Issue #925)
+- Fix property dialog file count (#1173)
+- Remove GHashTable/GList dualism in ThunarFolder
+- Fix crash when build with --disable-debug (#1181)
+- Improved performance & responsive in details view
+- Fix ThunarFolder crash (#1175)
+- Change 'File Manager' to 'Thunar' (Issue #1136)
+- Change menu item 'Rename' to 'Bulk Rename' on multi select (#913)
+- Improve 'Untrusted Application Launcher' Dialog (#963)
+- Option to queue operations on busy disks (#1029)
+- Support launcher rename options via dbus
+- Fix criticals about unset GIO attributes (#1063)
+- Don't reload folder twice on manual reload (#937)
+- Ignore extension on dir rename (#1150)
+- Add dialog to ask what to do with script (#1070)
+- Make horizontal spacing consistent (#118)
+- New TreeViewModel model implemented (#41)
+- New StandarViewModelInterface interface (#41)
+- Option to show launcher name instead of filename (#451)
+- Add folder to history only for new tab (Issue #1072)
+- Improve folder monitor and move some logic from file monitor there
+- Don't check for file exists on "deleted" event
+- Fix job operation crash on error
+- Limit number of templates to prevent lag (#472)
+- Remove outline on filenames while using keyboard nav.
+- Prevent crash on multi-file-activate (#1121)
+- Add new attributes to default namespace (#1104)
+- Use enum to store sidepane type (#1102)
+- Focus split pane on any tab click (#1103)
+- Ignore attribute FILESYSTEM_USE_PREVIEW (#298)
+- Prevent glib-critical - followup of (#912)
+- Solving issue of overlapping highlights (#980)
+- Keep location selector state on focus lost (#912)
+- Harden thunarx module loading (#1094)
+- Don't reload the directory on copy or cut (#1060)
+- Prevent minor memory leak (#573)
+- Revert ce43203b to prevent high CPU usage in list-view (#1089)
+- Various properties dialog tweaks
+- Prevent overflow via g_ascii methods (#1084)
+- ThunarFile: Use recursive mutex for cache (#1060)
+- Use new window for history signal handler (#1073)
+- Prevent using CSD in properties dialog (#1056)
+- Keep alpha when cutting read-only files (#1060)
+- Dont reload the current folder on copy/cut (#1060)
+- Update selected notebook on tab press (#1067)
+- Make sure that accel_group is set before using it (#1067)
+- Add job to list of jobs, not a view (#1029)
+- Undo/Redo: Improve error handling
+- Dont store accel map on startup (#1047)
+- Optioanlly show prop-dialog hightlight tab (#1056)
+- Simplify Bulk Renamer buttons (#1032)
+- Dont open folder when mounting device (Issue #919)
+- Dont show full menu for unmounted devices (#1049)
+- Support handling URIs via desktop file (#1044)
+- Focus correct split pane on mouse click (#1039)
+- Use realpath only if available on platform (#1030)
+- Fix include/check for 'realpath' (#1030)
+- Prevent wrong undo/redo notify (#1036)
+- Support undo trash for linked pathes (#1030)
+- Always ask before delete files via undo (#1027)
+- Fix use after free fault (#1031)
+- Allow symlink creation on remote locations (#875)
+- Prevent crash when closing window (#884)
+- Keep directory specific sort details (#1017)
+- Dont add extra-dot when creating links (#1019)
+- Add Shortcut to switch split-view panes (#1005)
+- Undo/Redo: Show detailed tooltips (issue #938)
+- Make view margin/spacing depend on zoom level (Issue #839)
+- Add fallback to shared zoom-level (#832)
+- Directory specific settings - zoom improvm. (#832)
+- Keep hidden toolbar hidden after Ctrl+L (#1011)
+- Prevent jumping cursor on file deletion (#910)
+- Properly handle resident thunar plugins (#1007)
+- Prevent crash for copy+overwrite via DBus (#1002)
+- Make 'empty trash' sensitive on tab-switch (#1001)
+- Prevent segfault for location selector (Issue #994)
+- Dialog when closing split-pane with multiple tabs
+- split-view: prevent loosing open tabs (Issue #986)
+- Use GtkIconTheme properly when passing UI scale
+- Shrink rename dialog only in height
+- Improve alignment of XfceFileNameInput
+- Revert "Prevent focus stealing of file transfer dialog (Issue #643)"
+- Prevent rare crash when closing thunar (issue #698)
+- Prevent crash after closing windows (Issue #995)
+- bulk renamer: Remember LastActiveMode (Issue #989)
+- Add optional confirmation message to move to trash (Issue #464)
+- Re-add symlink target in type column (issue #985)
+- Few thumbnails missing after scroll (Issue #843)
+- Dont show toolbar menu for back/forward (Issue #983)
+- 'replace' option fixed for partial copy (Issue #974)
+- Preserve trusted state when launchers are copied
+- separate method for thunar_g_file_is_in_xdg_data_dir
+- Moved 'set executable flag' into separate method
+- Only attach toolbar after toolbar items were set up (Issue #927)
+- Dont reset zoom-level for directory specific settings (issue #970)
+- Prevent build failure for NixOS (Issue #972)
+- Prevent location bar crash (Issue #968)
+- Translation Updates:
+  Albanian, Arabic, Armenian, Armenian (Armenia), Asturian, Basque,
+  Bengali, Bulgarian, Catalan, Chinese (China), Chinese (Hong Kong),
+  Chinese (Taiwan), Czech, Danish, Dutch, Eastern Armenian, English
+  (Australia), English (United Kingdom), Esperanto, Estonian, Finnish,
+  French, Galician, German, Greek, Hebrew, Hungarian, Icelandic,
+  Indonesian, Interlingue, Italian, Japanese, Kazakh, Korean, Latvian,
+  Malay, Norwegian Bokmål, Norwegian Nynorsk, Occitan (post 1500),
+  Persian (Iran), Polish, Portuguese, Portuguese (Brazil), Romanian,
+  Serbian, Slovak, Spanish, Swedish, Telugu, Thai, Turkish, Urdu, Urdu
+  (Pakistan), Uyghur, Vietnamese
+
 4.18.0 (2022-12-15)
 ======
 - Fix minor mem leak (Issue #961)

acinclude.m4

@@ -55,7 +55,7 @@ AC_DEFUN([BM_THUNAR_PLUGIN_TPA],
 AC_ARG_ENABLE([tpa-plugin], AS_HELP_STRING([--disable-tpa-plugin], [Don't build the thunar-tpa plugin, see plugins/thunar-tpa/README.md]),
   [ac_bm_thunar_plugin_tpa=$enableval], [ac_bm_thunar_plugin_tpa=yes])
 if test x"$ac_bm_thunar_plugin_tpa" = x"yes"; then
-  XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.12.0],
+  XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.14.0],
   [
     ac_bm_thunar_plugin_tpa=yes
   ],

autogen.sh

@@ -29,4 +29,4 @@ EOF
   exit 1
 }
 
-XDT_AUTOGEN_REQUIRED_VERSION="4.14.0" exec xdt-autogen $@
+XDT_AUTOGEN_REQUIRED_VERSION="4.19.2" exec xdt-autogen "$@"

configure.ac.in → configure.ac

@@ -2,7 +2,7 @@
 #-
 # Copyright (c) 2004-2007 Benedikt Meurer <benny@xfce.org>
 # Copyright (c) 2009-2011 Jannis Pohlmann <jannis@xfce.org>
-# Copyright (c) 2004-2015 Xfce Development Team <xfce4-dev@xfce.org>
+# Copyright (c) 2004-2024 Xfce Development Team <xfce4-dev@xfce.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -24,28 +24,23 @@ dnl *** Version information ***
 dnl ***************************
 m4_define([thunarx_verinfo], [0:0:0])
 m4_define([thunarx_version_api], [3])
-m4_define([thunar_version_major], [4])
-m4_define([thunar_version_minor], [18])
-m4_define([thunar_version_micro], [0])
-m4_define([thunar_version_nano], [])
-m4_define([thunar_version_build], [@REVISION@])
-m4_define([thunar_version_tag], [git])
-m4_define([thunar_version], [thunar_version_major().thunar_version_minor().thunar_version_micro()ifelse(thunar_version_nano(), [], [], [.thunar_version_nano()])ifelse(thunar_version_tag(), [git], [thunar_version_tag()-thunar_version_build()], [thunar_version_tag()])])
+m4_define([copyright_year], [2025])
 
-dnl *******************************************
-dnl *** Debugging support for GIT snapshots ***
-dnl *******************************************
-m4_define([thunar_debug_default], [ifelse(thunar_version_tag(), [git], [yes], [minimum])])
+XDT_VERSION_INIT([4.20.0], [git])
 
 dnl ***************************
 dnl *** Initialize autoconf ***
 dnl ***************************
-AC_COPYRIGHT([Copyright (c) 2004-2022 The Thunar development team. All rights reserved.])
-AC_INIT([thunar], [thunar_version], [https://gitlab.xfce.org/xfce/thunar], [thunar])
-AC_PREREQ([2.60])
+AC_COPYRIGHT([Copyright (c) 2004-copyright_year() The Thunar development team. All rights reserved.])
+AC_INIT([thunar], [xdt_version], [https://gitlab.xfce.org/xfce/thunar], [thunar])
+AC_PREREQ([2.69])
 AC_CONFIG_MACRO_DIRS([m4])
 AC_CANONICAL_TARGET()
-AC_REVISION([thunar_version_build])
+AC_REVISION([xdt_version_build])
+AC_DEFINE([VERSION_FULL], [PACKAGE_VERSION], [Alias for VERSION and PACKAGE_VERSION for meson compatibility])
+COPYRIGHT_YEAR=copyright_year()
+AC_DEFINE_UNQUOTED([COPYRIGHT_YEAR], ["$COPYRIGHT_YEAR"], [Copyright year])
+AC_SUBST([COPYRIGHT_YEAR])
 
 dnl ***************************
 dnl *** Initialize automake ***
@@ -59,11 +54,6 @@ dnl *******************************
 dnl *** Check for UNIX variants ***
 dnl *******************************
 AC_USE_SYSTEM_EXTENSIONS
-AC_SEARCH_LIBS([strerror],[cposix])
-
-if test "x$target_os" = "xlinux-gnu"; then
-  AC_DEFINE([HAVE_LINUX], [], [Whether we are building on Linux or not])
-fi
 
 dnl ********************************
 dnl *** Check for basic programs ***
@@ -72,8 +62,7 @@ AC_PROG_CC()
 LT_PATH_LD()
 AM_PROG_CC_C_O()
 AC_PROG_INSTALL()
-IT_PROG_INTLTOOL()
-AC_CHECK_PROGS([PERL], [perl5 perl])
+AC_PATH_PROG([XDT_GEN_VISIBILITY], [xdt-gen-visibility])
 m4_ifdef([AC_PROG_SED], [AC_PROG_SED], [AC_CHECK_PROG(SED, sed, sed)])
 
 dnl **************************
@@ -87,9 +76,9 @@ dnl *** Substitute version information ***
 dnl **************************************
 THUNARX_VERINFO=thunarx_verinfo()
 THUNARX_VERSION_API=thunarx_version_api()
-THUNAR_VERSION_MAJOR=thunar_version_major()
-THUNAR_VERSION_MINOR=thunar_version_minor()
-THUNAR_VERSION_MICRO=thunar_version_micro()
+THUNAR_VERSION_MAJOR=xdt_version_major()
+THUNAR_VERSION_MINOR=xdt_version_minor()
+THUNAR_VERSION_MICRO=xdt_version_micro()
 AC_SUBST([THUNARX_VERINFO])
 AC_SUBST([THUNARX_VERSION_API])
 AC_SUBST([THUNAR_VERSION_MAJOR])
@@ -134,7 +123,7 @@ AC_SYS_LARGEFILE()
 dnl **********************************
 dnl *** Check for standard headers ***
 dnl **********************************
-AC_CHECK_HEADERS([ctype.h errno.h fcntl.h grp.h limits.h locale.h memory.h \
+AC_CHECK_HEADERS([ctype.h errno.h fcntl.h grp.h limits.h locale.h malloc.h memory.h \
                   paths.h pwd.h sched.h signal.h stdarg.h stdlib.h string.h \
                   sys/mman.h sys/param.h sys/stat.h sys/time.h sys/types.h \
                   sys/uio.h sys/wait.h time.h])
@@ -144,17 +133,20 @@ dnl *** Check for standard functions ***
 dnl ************************************
 AC_FUNC_MMAP()
 AC_CHECK_FUNCS([localeconv mkdtemp pread pwrite sched_yield setgroupent \
-                setpassent strcoll strlcpy strptime symlink atexit])
+                setpassent strcoll strlcpy strptime symlink atexit realpath \
+                statx])
 
 dnl ******************************
 dnl *** Check for i18n support ***
 dnl ******************************
-XDT_I18N([@LINGUAS@])
-
-dnl *********************
-dnl *** Check for X11 ***
-dnl *********************
-XDT_CHECK_LIBX11_REQUIRE()
+GETTEXT_PACKAGE="$PACKAGE"
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Name of default gettext domain])
+AC_SUBST([GETTEXT_PACKAGE])
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AC_SEARCH_LIBS([bind_textdomain_codeset], [intl],
+	       [AC_DEFINE([HAVE_BIND_TEXTDOMAIN_CODESET], [1], [Define to 1 if you have the 'bind_textdomain_codeset' function.])],
+	       [])
 
 dnl *************************
 dnl *** Check for gtk-doc ***
@@ -164,37 +156,50 @@ GTK_DOC_CHECK([1.9])
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-XDT_CHECK_PACKAGE([EXO], [exo-2], [4.17.0])
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.66.0])
-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.66.0])
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.66.0])
-XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.66.0])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.72.0])
+XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.72.0])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.72.0])
+XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.72.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.24.0])
-XDT_CHECK_PACKAGE([GDK_PIXBUF], [gdk-pixbuf-2.0], [2.40.0])
+XDT_CHECK_PACKAGE([GDK_PIXBUF], [gdk-pixbuf-2.0], [2.42.8])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.17.2])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.17.6])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.21.0])
 XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], [libxfce4kbd-private-3], [4.17.2])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0])
 XDT_CHECK_PACKAGE([PANGO], [pango], [1.38.0])
 
-AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_66, [Ignore post 2.66 deprecations])
-AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_66, [Prevent post 2.66 APIs])
-
 dnl ******************************
 dnl *** GObject Instrospection ***
 dnl ******************************
-GOBJECT_INTROSPECTION_CHECK([1.66.0])
+GOBJECT_INTROSPECTION_CHECK([1.72.0])
 
-dnl ********************************************
-dnl *** Check for session management support ***
-dnl ********************************************
-XDT_CHECK_LIBSM()
+dnl **********************************
+dnl *** Optional X11 dependencies  ***
+dnl **********************************
+XDT_CHECK_OPTIONAL_FEATURE([X11],
+                           [x11],
+                           [
+                             XDT_FEATURE_DEPENDENCY([GDK_X11], [gdk-x11-3.0], [3.24.0])
+                             XDT_FEATURE_DEPENDENCY([LIBX11], [x11], [1.6.7])
+                           ],
+                           [the X11 windowing system])
+if test x"$ENABLE_X11" != x"yes"; then
+  dnl Do not check for optional X11 packages if X11 is disabled
+  enable_libsm=no
+fi
+XDT_CHECK_OPTIONAL_FEATURE([LIBSM],
+                           [libsm],
+                           [
+                             XDT_FEATURE_DEPENDENCY([LIBICE], [ice], [1.0.10])
+                             XDT_FEATURE_DEPENDENCY([LIBSM], [sm], [1.2.3])
+                           ],
+                           [session management library])
 
 dnl **********************************
 dnl *** Optional GIO UNIX features ***
 dnl **********************************
 XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0],
-                           [2.66.0], [gio-unix], [GIO UNIX features])
+                           [2.72.0], [gio-unix], [GIO UNIX features])
 
 dnl ***************************************************************
 dnl *** Optional support for GUDev (required for thunar-volman) ***
@@ -205,13 +210,13 @@ XDT_CHECK_OPTIONAL_PACKAGE([GUDEV], [gudev-1.0], [145], [gudev],
 dnl **************************************
 dnl *** Optional support for libnotify ***
 dnl **************************************
-XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY], [libnotify], [0.4.0], [notifications],
+XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY], [libnotify], [0.7.0], [notifications],
                            [Mount notification support], [yes])
 
 dnl ***********************************
 dnl *** Check for debugging support ***
 dnl ***********************************
-XDT_FEATURE_DEBUG([thunar_debug_default])
+XDT_FEATURE_DEBUG([xdt_debug_default])
 
 dnl **************************************
 dnl *** Check for linker optimizations ***
@@ -221,7 +226,41 @@ XDT_FEATURE_LINKER_OPTS()
 dnl dnl ****************************************
 dnl dnl *** Check for ELF visibility support ***
 dnl dnl ****************************************
-dnl XDT_FEATURE_VISIBILITY()
+AC_ARG_ENABLE([visibility],
+              AS_HELP_STRING([--disable-visibility],
+                             [Do not use ELF visibility attributes]),
+              [enable_visibility=$enableval], [enable_visibility=yes])
+have_gnuc_visibility=no
+if test "x$enable_visibility" != "xno"; then
+  XDT_SUPPORTED_FLAGS([xdt_vis_test_cflags], [-Wall -Werror -Wno-unused-parameter -fvisibility=hidden])
+  saved_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $xdt_vis_test_cflags"
+  AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute])
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+  [
+    void test_default(void);
+    void test_hidden(void);
+    void __attribute__((visibility("default"))) test_default(void) {}
+    void __attribute__((visibility("hidden"))) test_hidden(void) {}
+    int main(int argc, char **argv) {
+      test_default();
+      test_hidden();
+      return 0;
+    }
+  ])],
+  [
+    have_gnuc_visibility=yes
+    AC_MSG_RESULT([yes])
+  ],
+  [
+    AC_MSG_RESULT([no])
+  ])
+  CFLAGS="$saved_CFLAGS"
+fi
+if test "x$have_gnuc_visibility" = "xyes"; then
+  CPPFLAGS="$CPPFLAGS -DENABLE_SYMBOL_VISIBILITY=1"
+  CFLAGS="$CFLAGS -fvisibility=hidden"
+fi
 
 dnl *********************************
 dnl *** Substitute platform flags ***
@@ -252,9 +291,6 @@ docs/design/Makefile
 docs/papers/Makefile
 docs/reference/Makefile
 docs/reference/thunarx/Makefile
-docs/reference/thunarx/version.xml
-docs/reference/thunar/Makefile
-docs/reference/thunar/version.xml
 examples/Makefile
 examples/tex-open-terminal/Makefile
 icons/Makefile

docs/Makefile.am

@@ -17,6 +17,8 @@ endif
 EXTRA_DIST =								\
 	$(doc_DATA)							\
 	$(man_MANS)							\
-	Thunar.xml
+	Thunar.xml \
+	meson.build \
+	$(NULL)
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

docs/design/overview.xmi

@@ -30,7 +30,6 @@
     <UML:DataType stereotype="62" isSpecification="false" isLeaf="false" visibility="public" xmi.id="183" isRoot="false" isAbstract="false" name="ino_t" />
     <UML:DataType stereotype="62" isSpecification="false" isLeaf="false" visibility="public" xmi.id="185" isRoot="false" isAbstract="false" name="dev_t" />
     <UML:DataType stereotype="62" isSpecification="false" isLeaf="false" visibility="public" xmi.id="422" isRoot="false" isAbstract="false" name="ThunarVfsURI" />
-    <UML:DataType stereotype="62" isSpecification="false" isLeaf="false" visibility="public" xmi.id="744" isRoot="false" isAbstract="false" name="ExoMimeInfo" />
     <UML:DataType stereotype="62" isSpecification="false" isLeaf="false" visibility="public" xmi.id="767" isRoot="false" isAbstract="false" name="ThunarVfsFileSize" />
     <UML:DataType stereotype="62" isSpecification="false" isLeaf="false" visibility="public" xmi.id="768" isRoot="false" isAbstract="false" name="ThunarVfsFileTime" />
     <UML:DataType stereotype="62" isSpecification="false" isLeaf="false" visibility="public" xmi.id="769" isRoot="false" isAbstract="false" name="ThunarVfsFileInode" />
@@ -212,11 +211,6 @@
      <UML:EnumerationLiteral isSpecification="false" isLeaf="false" visibility="public" xmi.id="155" isRoot="false" isAbstract="false" name="NONE" />
      <UML:EnumerationLiteral isSpecification="false" isLeaf="false" visibility="public" xmi.id="156" isRoot="false" isAbstract="false" name="SYMLINK" />
     </UML:Enumeration>
-    <UML:Package isSpecification="false" isLeaf="false" visibility="public" xmi.id="162" isRoot="false" isAbstract="false" name="exo" >
-     <UML:Namespace.ownedElement>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="163" isRoot="false" isAbstract="false" name="ExoMimeInfo" />
-     </UML:Namespace.ownedElement>
-    </UML:Package>
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="195" isRoot="false" isAbstract="false" name="ThunarListModel" />
     <UML:Package isSpecification="false" isLeaf="false" visibility="public" xmi.id="198" isRoot="false" isAbstract="false" name="gobject" >
      <UML:Namespace.ownedElement>
@@ -1419,7 +1413,6 @@ fixed, better use ThunarListModel here." font="helvetica,12,-1,5,50,0,0,0,0,0" /
    <diagram snapgrid="1" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="966" snapy="10" showatts="1" xmi.id="534" documentation="" type="402" showops="1" showpackage="0" name="MIME actions" localid="30000" showstereotype="0" showscope="1" snapcsgrid="1" font="helvetica,12,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="796" >
     <widgets>
      <classwidget usesdiagramfillcolour="0" width="160" showattsigs="601" usesdiagramusefillcolour="0" x="220" linecolour="#ff0000" y="200" showopsigs="601" linewidth="none" usesdiagramlinewidth="1" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="40" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="535" showoperations="0" showpackage="0" showscope="1" showstereotype="0" font="helvetica,12,-1,5,75,0,0,0,0,0" />
-     <notewidget usesdiagramfillcolour="1" width="190" usesdiagramusefillcolour="1" x="445" linecolour="none" y="185" linewidth="none" usesdiagramlinewidth="1" usesdiagramlinecolour="1" fillcolour="none" height="50" usefillcolor="1" isinstance="0" xmi.id="537" text="This should probably be handled in exo as well." font="helvetica,12,-1,5,50,0,0,0,0,0" />
     </widgets>
     <messages/>
     <associations>
@@ -3106,31 +3099,6 @@ In addition, kqueue() and FAM can be used. dnotify is not thread-safe." font="he
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="exo" id="163" parent_class="163" fileExt=".cpp" fileName="exomimeinfo" >
-     <textblocks>
-      <codeblockwithcomments tag="includes" text="#include &quot;exomimeinfo.h&quot;&amp;#010;" >
-       <header>
-        <cppcodedocumentation tag="" writeOutText="false" />
-       </header>
-      </codeblockwithcomments>
-      <hierarchicalcodeblock tag="constructionMethodsBlock" canDelete="false" >
-       <header>
-        <cppcodedocumentation tag="" text="Constructors/Destructors" />
-       </header>
-       <textblocks/>
-      </hierarchicalcodeblock>
-      <hierarchicalcodeblock tag="otherMethodsBlock" canDelete="false" >
-       <header>
-        <cppcodedocumentation tag="" text="Methods" />
-       </header>
-       <textblocks/>
-      </hierarchicalcodeblock>
-     </textblocks>
-     <header>
-      <codecomment tag="" text="/************************************************************************&amp;#010;  			exomimeinfo.cpp - Copyright bmeurer&amp;#010;&amp;#010;Here you can write a license for your code, some comments or any other&amp;#010;information you want to have in your generated code. To to this simply&amp;#010;configure the &quot;headings&quot; directory in uml to point to a directory&amp;#010;where you have your heading files.&amp;#010;&amp;#010;or you can just replace the contents of this file with your own.&amp;#010;If you want to do this, this file is located at&amp;#010;&amp;#010;/usr/local/share/apps/umbrello/headings/heading.cpp&amp;#010;&amp;#010;-->Code Generators searches for heading files based on the file extension&amp;#010;   i.e. it will look for a file name ending in &quot;.h&quot; to include in C++ header&amp;#010;   files, and for a file name ending in &quot;.java&quot; to include in all generated&amp;#010;   java code.&amp;#010;   If you name the file &quot;heading.&lt;extension>&quot;, Code Generator will always&amp;#010;   choose this file even if there are other files with the same extension in the&amp;#010;   directory. If you name the file something else, it must be the only one with that&amp;#010;   extension in the directory to guarantee that Code Generator will choose it.&amp;#010;&amp;#010;you can use variables in your heading files which are replaced at generation&amp;#010;time. possible variables are : author, date, time, filename and filepath.&amp;#010;just write %variable_name%&amp;#010;&amp;#010;This file was generated on Tue Jun 14 2005 at 22:14:17&amp;#010;The original location of this file is exo&amp;#010;**************************************************************************/&amp;#010;" />
-     </header>
-     <classfields/>
-    </classifiercodedocument>
     <classifiercodedocument writeOutCode="true" package="" id="195" parent_class="195" fileExt=".cpp" fileName="thunarlistmodel" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;thunarlistmodel.h&quot;&amp;#010;" >
@@ -4885,11 +4853,6 @@ In addition, kqueue() and FAM can be used. dnotify is not thread-safe." font="he
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock parent_id="743" tag="tblock_3" canDelete="false" indentLevel="1" text=" ExoMimeInfo mime_info;" >
-               <header>
-                <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
-               </header>
-              </ccfdeclarationcodeblock>
               <ccfdeclarationcodeblock parent_id="772" tag="tblock_32" canDelete="false" indentLevel="1" role_id="0" text=" ThunarVfsInfo info;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
@@ -5021,11 +4984,6 @@ In addition, kqueue() and FAM can be used. dnotify is not thread-safe." font="he
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock parent_id="743" tag="tblock_3" canDelete="false" indentLevel="1" text=" ExoMimeInfo mime_info;" >
-        <header>
-         <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
-        </header>
-       </ccfdeclarationcodeblock>
        <codeaccessormethod accessType="0" parent_id="743" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="743" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
@@ -7842,212 +7800,6 @@ In addition, kqueue() and FAM can be used. dnotify is not thread-safe." font="he
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="exo" id="cppheader163" parent_class="163" fileExt=".h" fileName="exomimeinfo" >
-     <textblocks>
-      <codeblockwithcomments tag="hashDefBlock" text="#ifndef EXOMIMEINFO_H&amp;#010;#define EXOMIMEINFO_H" >
-       <header>
-        <cppcodedocumentation tag="" writeOutText="false" />
-       </header>
-      </codeblockwithcomments>
-      <codeblockwithcomments tag="includes" text="#include &lt;string>&amp;#010;" >
-       <header>
-        <cppcodedocumentation tag="" writeOutText="false" />
-       </header>
-      </codeblockwithcomments>
-      <codeblockwithcomments tag="using" writeOutText="false" >
-       <header>
-        <cppcodedocumentation tag="" writeOutText="false" />
-       </header>
-      </codeblockwithcomments>
-      <hierarchicalcodeblock tag="namespace" canDelete="false" >
-       <header>
-        <cppcodedocumentation tag="" writeOutText="false" text="Namespace" />
-       </header>
-       <textblocks>
-        <codeblockwithcomments tag="enums" writeOutText="false" >
-         <header>
-          <cppcodedocumentation tag="" writeOutText="false" />
-         </header>
-        </codeblockwithcomments>
-        <cppheaderclassdeclarationblock parent_id="163" tag="classDeclarationBlock" canDelete="false" >
-         <header>
-          <cppcodedocumentation tag="" text="Class ExoMimeInfo&amp;#010;" />
-         </header>
-         <textblocks>
-          <hierarchicalcodeblock tag="publicBlock" canDelete="false" >
-           <header>
-            <cppcodedocumentation tag="" text="Public stuff" />
-           </header>
-           <textblocks>
-            <hierarchicalcodeblock tag="publicFieldsDecl" canDelete="false" indentLevel="1" >
-             <header>
-              <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
-             </header>
-             <textblocks/>
-            </hierarchicalcodeblock>
-            <hierarchicalcodeblock tag="pubMethodsBlock" canDelete="false" indentLevel="1" >
-             <header>
-              <cppcodedocumentation tag="" indentLevel="1" />
-             </header>
-             <textblocks>
-              <hierarchicalcodeblock tag="constructionMethods" canDelete="false" indentLevel="1" >
-               <header>
-                <cppcodedocumentation tag="" indentLevel="1" text="Constructors" />
-               </header>
-               <textblocks>
-                <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="ExoMimeInfo ( ) { }" >
-                 <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="Empty Constructor" />
-                 </header>
-                </codeblockwithcomments>
-               </textblocks>
-              </hierarchicalcodeblock>
-              <hierarchicalcodeblock tag="accessorMethods" canDelete="false" indentLevel="1" >
-               <header>
-                <cppcodedocumentation tag="" indentLevel="1" text="Accessor Methods" />
-               </header>
-               <textblocks>
-                <hierarchicalcodeblock tag="pubStaticAccessorMethods" canDelete="false" indentLevel="1" >
-                 <header>
-                  <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
-                 </header>
-                 <textblocks/>
-                </hierarchicalcodeblock>
-                <hierarchicalcodeblock tag="pubRegularAccessorMethods" canDelete="false" indentLevel="1" >
-                 <header>
-                  <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
-                 </header>
-                 <textblocks/>
-                </hierarchicalcodeblock>
-               </textblocks>
-              </hierarchicalcodeblock>
-              <hierarchicalcodeblock tag="operationMethods" canDelete="false" indentLevel="1" >
-               <header>
-                <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
-               </header>
-               <textblocks/>
-              </hierarchicalcodeblock>
-             </textblocks>
-            </hierarchicalcodeblock>
-           </textblocks>
-          </hierarchicalcodeblock>
-          <hierarchicalcodeblock tag="protectedBlock" canDelete="false" >
-           <header>
-            <cppcodedocumentation tag="" text="Protected stuff" />
-           </header>
-           <textblocks>
-            <hierarchicalcodeblock tag="protectedFieldsDecl" canDelete="false" indentLevel="1" >
-             <header>
-              <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
-             </header>
-             <textblocks/>
-            </hierarchicalcodeblock>
-            <hierarchicalcodeblock tag="protMethodsBlock" canDelete="false" indentLevel="1" >
-             <header>
-              <cppcodedocumentation tag="" indentLevel="1" />
-             </header>
-             <textblocks>
-              <hierarchicalcodeblock tag="constructionMethods" canDelete="false" indentLevel="1" >
-               <header>
-                <cppcodedocumentation tag="" indentLevel="1" text="Constructors" />
-               </header>
-               <textblocks/>
-              </hierarchicalcodeblock>
-              <hierarchicalcodeblock tag="accessorMethods" canDelete="false" indentLevel="1" >
-               <header>
-                <cppcodedocumentation tag="" indentLevel="1" text="Accessor Methods" />
-               </header>
-               <textblocks>
-                <hierarchicalcodeblock tag="protStaticAccessorMethods" canDelete="false" indentLevel="1" >
-                 <header>
-                  <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
-                 </header>
-                 <textblocks/>
-                </hierarchicalcodeblock>
-                <hierarchicalcodeblock tag="protRegularAccessorMethods" canDelete="false" indentLevel="1" >
-                 <header>
-                  <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
-                 </header>
-                 <textblocks/>
-                </hierarchicalcodeblock>
-               </textblocks>
-              </hierarchicalcodeblock>
-              <hierarchicalcodeblock tag="operationMethods" canDelete="false" indentLevel="1" >
-               <header>
-                <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
-               </header>
-               <textblocks/>
-              </hierarchicalcodeblock>
-             </textblocks>
-            </hierarchicalcodeblock>
-           </textblocks>
-          </hierarchicalcodeblock>
-          <hierarchicalcodeblock tag="privateBlock" canDelete="false" >
-           <header>
-            <cppcodedocumentation tag="" text="Private stuff" />
-           </header>
-           <textblocks>
-            <hierarchicalcodeblock tag="privateFieldsDecl" canDelete="false" indentLevel="1" >
-             <header>
-              <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
-             </header>
-             <textblocks/>
-            </hierarchicalcodeblock>
-            <hierarchicalcodeblock tag="privMethodsBlock" canDelete="false" indentLevel="1" >
-             <header>
-              <cppcodedocumentation tag="" indentLevel="1" />
-             </header>
-             <textblocks>
-              <hierarchicalcodeblock tag="constructionMethods" canDelete="false" indentLevel="1" >
-               <header>
-                <cppcodedocumentation tag="" indentLevel="1" text="Constructors" />
-               </header>
-               <textblocks/>
-              </hierarchicalcodeblock>
-              <hierarchicalcodeblock tag="accessorMethods" canDelete="false" indentLevel="1" >
-               <header>
-                <cppcodedocumentation tag="" indentLevel="1" text="Accessor Methods" />
-               </header>
-               <textblocks>
-                <hierarchicalcodeblock tag="privStaticAccessorMethods" canDelete="false" indentLevel="1" >
-                 <header>
-                  <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
-                 </header>
-                 <textblocks/>
-                </hierarchicalcodeblock>
-                <hierarchicalcodeblock tag="privRegularAccessorMethods" canDelete="false" indentLevel="1" >
-                 <header>
-                  <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
-                 </header>
-                 <textblocks/>
-                </hierarchicalcodeblock>
-               </textblocks>
-              </hierarchicalcodeblock>
-              <hierarchicalcodeblock tag="operationMethods" canDelete="false" indentLevel="1" >
-               <header>
-                <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
-               </header>
-               <textblocks/>
-              </hierarchicalcodeblock>
-             </textblocks>
-            </hierarchicalcodeblock>
-           </textblocks>
-          </hierarchicalcodeblock>
-         </textblocks>
-        </cppheaderclassdeclarationblock>
-       </textblocks>
-      </hierarchicalcodeblock>
-      <codeblockwithcomments tag="hashDefBlockEnd" text="#endif //EXOMIMEINFO_H" >
-       <header>
-        <cppcodedocumentation tag="" writeOutText="false" />
-       </header>
-      </codeblockwithcomments>
-     </textblocks>
-     <header>
-      <codecomment tag="" text="/************************************************************************&amp;#010;  			exomimeinfo.h - Copyright bmeurer&amp;#010;&amp;#010;Here you can write a license for your code, some comments or any other&amp;#010;information you want to have in your generated code. To to this simply&amp;#010;configure the &quot;headings&quot; directory in uml to point to a directory&amp;#010;where you have your heading files.&amp;#010;&amp;#010;or you can just replace the contents of this file with your own.&amp;#010;If you want to do this, this file is located at&amp;#010;&amp;#010;/usr/local/share/apps/umbrello/headings/heading.h&amp;#010;&amp;#010;-->Code Generators searches for heading files based on the file extension&amp;#010;   i.e. it will look for a file name ending in &quot;.h&quot; to include in C++ header&amp;#010;   files, and for a file name ending in &quot;.java&quot; to include in all generated&amp;#010;   java code.&amp;#010;   If you name the file &quot;heading.&lt;extension>&quot;, Code Generator will always&amp;#010;   choose this file even if there are other files with the same extension in the&amp;#010;   directory. If you name the file something else, it must be the only one with that&amp;#010;   extension in the directory to guarantee that Code Generator will choose it.&amp;#010;&amp;#010;you can use variables in your heading files which are replaced at generation&amp;#010;time. possible variables are : author, date, time, filename and filepath.&amp;#010;just write %variable_name%&amp;#010;&amp;#010;This file was generated on Tue Jun 14 2005 at 22:14:17&amp;#010;The original location of this file is exo&amp;#010;**************************************************************************/&amp;#010;" />
-     </header>
-     <classfields/>
-    </classifiercodedocument>
     <classifiercodedocument writeOutCode="true" package="" id="cppheader195" parent_class="195" fileExt=".h" fileName="thunarlistmodel" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef THUNARLISTMODEL_H&amp;#010;#define THUNARLISTMODEL_H" >

docs/meson.build

+custom_target(
+  'Thunar.1',
+  input: 'Thunar.xml',
+  output: 'Thunar.1',
+  command: [xsltproc, '--nonet', '--output', '@OUTPUT@', 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl', '@INPUT@'],
+  install: true,
+  install_dir: get_option('prefix') / get_option('datadir') / 'man' / 'man1',
+)
+
+install_data(
+  'README.gtkrc',
+  install_dir: get_option('prefix') / get_option('datadir') / 'doc' / 'thunar',
+)

docs/reference/Makefile.am

 SUBDIRS =								\
-	thunar								\
 	thunarx
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

docs/reference/thunar/Makefile.am

-# The name of the module.
-DOC_MODULE=thunar
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
-
-# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="EXO_DISABLE_DEPRECATED" --rebuild-sections --rebuild-types
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=$(top_srcdir)/thunar
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--xml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=
-
-# Used for dependencies
-HFILE_GLOB=$(top_srcdir)/thunar/*.h
-CFILE_GLOB=$(top_srcdir)/thunar/*.c
-
-# Header files to ignore when scanning
-IGNORE_HFILES=							\
-	thunar-private.h					\
-	thunar-dbus-freedesktop-interfaces.h			\
-	thunar-dbus-service-infos.h				\
-	thunar-marshal.h					\
-	stamp-thunar-marshal.h					\
-	thunar-thumbnailer-proxy.h				\
-	thunar-thumbnail-cache-proxy.h				\
-	thunar-resources.h
-
-
-# Extra files to add when scanning (relative to $srcdir)
-EXTRA_HFILES=
-
-# Images to copy into HTML directory
-HTML_IMAGES =
-
-# Extra SGML files that are included by DOC_MAIN_SGML_FILE
-content_files =
-
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
-GTKDOC_CFLAGS =	 							\
-	-I$(top_srcdir) 						\
-	-I$(top_srcdir)/thunar			\
-	-I$(top_builddir) 					\
-	$(GTK_CFLAGS)								\
-	$(GTK_DOC_EXTRA_CFLAGS)			\
-	$(EXO_CFLAGS)								\
-	$(GIO_CFLAGS)								\
-	$(GTHREAD_CFLAGS)						\
-	$(GUDEV_CFLAGS)							\
-	$(LIBNOTIFY_CFLAGS)						\
-	$(LIBSM_CFLAGS)							\
-	$(LIBXFCE4UI_CFLAGS)						\
-	$(LIBXFCE4KBD_PRIVATE_CFLAGS) 					\
-	$(XFCONF_CFLAGS)						\
-	$(PANGO_CFLAGS)							\
-	$(PLATFORM_CFLAGS)
-
-GTKDOC_LIBS =  								\
-	$(GTK_LIBS)							\
-	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la	\
-	$(top_builddir)/thunar/thunar.a					\
-	$(EXO_LIBS)							\
-	$(GIO_LIBS)							\
-	$(GTHREAD_LIBS)							\
-	$(GMODULE_LIBS)							\
-	$(GUDEV_LIBS)							\
-	$(LIBNOTIFY_LIBS)						\
-	$(LIBSM_LIBS)							\
-	$(LIBXFCE4UI_LIBS)						\
-	$(LIBXFCE4KBD_PRIVATE_LIBS)					\
-	$(XFCONF_LIBS)							\
-	$(PANGO_LIBS)
-
-include $(top_srcdir)/gtk-doc.make
-
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

docs/reference/thunar/thunar-docs.xml

-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY ThunarNotify SYSTEM "xml/thunar-notify.xml">
-  <!ENTITY ThunarMenu SYSTEM "xml/thunar-menu.xml">
-  <!ENTITY ThunarDbusService SYSTEM "xml/thunar-dbus-service.xml">
-  <!ENTITY ThunarRenamerProgress SYSTEM "xml/thunar-renamer-progress.xml">
-  <!ENTITY ThunarGioExtensions SYSTEM "xml/thunar-gio-extensions.xml">
-  <!ENTITY ThunarPropertiesDialog SYSTEM "xml/thunar-properties-dialog.xml">
-  <!ENTITY ThunarShortcutsModel SYSTEM "xml/thunar-shortcuts-model.xml">
-  <!ENTITY ThunarIconRenderer SYSTEM "xml/thunar-icon-renderer.xml">
-  <!ENTITY ThunarIoScanDirectory SYSTEM "xml/thunar-io-scan-directory.xml">
-  <!ENTITY ThunarShortcutsIconRenderer SYSTEM "xml/thunar-shortcuts-icon-renderer.xml">
-  <!ENTITY ThunarPreferencesDialog SYSTEM "xml/thunar-preferences-dialog.xml">
-  <!ENTITY ThunarTreePane SYSTEM "xml/thunar-tree-pane.xml">
-  <!ENTITY ThunarApplication SYSTEM "xml/thunar-application.xml">
-  <!ENTITY ThunarRenamerPair SYSTEM "xml/thunar-renamer-pair.xml">
-  <!ENTITY ThunarShortcutsView SYSTEM "xml/thunar-shortcuts-view.xml">
-  <!ENTITY ThunarLocationButtons SYSTEM "xml/thunar-location-buttons.xml">
-  <!ENTITY ThunarBrowser SYSTEM "xml/thunar-browser.xml">
-  <!ENTITY ThunarSendtoModel SYSTEM "xml/thunar-sendto-model.xml">
-  <!ENTITY ThunarUtil SYSTEM "xml/thunar-util.xml">
-  <!ENTITY ThunarPreferences SYSTEM "xml/thunar-preferences.xml">
-  <!ENTITY ThunarStandardView SYSTEM "xml/thunar-standard-view.xml">
-  <!ENTITY ThunarHistory SYSTEM "xml/thunar-history.xml">
-  <!ENTITY ThunarSidePane SYSTEM "xml/thunar-side-pane.xml">
-  <!ENTITY ThunarEnumTypes SYSTEM "xml/thunar-enum-types.xml">
-  <!ENTITY ThunarGobjectExtensions SYSTEM "xml/thunar-gobject-extensions.xml">
-  <!ENTITY ThunarFileMonitor SYSTEM "xml/thunar-file-monitor.xml">
-  <!ENTITY ThunarDetailsView SYSTEM "xml/thunar-details-view.xml">
-  <!ENTITY ThunarDialogs SYSTEM "xml/thunar-dialogs.xml">
-  <!ENTITY ThunarImage SYSTEM "xml/thunar-image.xml">
-  <!ENTITY ThunarUser SYSTEM "xml/thunar-user.xml">
-  <!ENTITY ThunarLocationButton SYSTEM "xml/thunar-location-button.xml">
-  <!ENTITY ThunarRenamerModel SYSTEM "xml/thunar-renamer-model.xml">
-  <!ENTITY ThunarSizeLabel SYSTEM "xml/thunar-size-label.xml">
-  <!ENTITY ThunarClipboardManager SYSTEM "xml/thunar-clipboard-manager.xml">
-  <!ENTITY ThunarAbstractDialog SYSTEM "xml/thunar-abstract-dialog.xml">
-  <!ENTITY ThunarAbstractIconView SYSTEM "xml/thunar-abstract-icon-view.xml">
-  <!ENTITY ThunarDeviceMonitor SYSTEM "xml/thunar-device-monitor.xml">
-  <!ENTITY ThunarIoJobs SYSTEM "xml/thunar-io-jobs.xml">
-  <!ENTITY ThunarDeepCountJob SYSTEM "xml/thunar-deep-count-job.xml">
-  <!ENTITY ThunarIconView SYSTEM "xml/thunar-icon-view.xml">
-  <!ENTITY ThunarChooserButton SYSTEM "xml/thunar-chooser-button.xml">
-  <!ENTITY ThunarPermissionsChooser SYSTEM "xml/thunar-permissions-chooser.xml">
-  <!ENTITY ThunarFolder SYSTEM "xml/thunar-folder.xml">
-  <!ENTITY ThunarIoJobsUtil SYSTEM "xml/thunar-io-jobs-util.xml">
-  <!ENTITY ThunarRenamerDialog SYSTEM "xml/thunar-renamer-dialog.xml">
-  <!ENTITY ThunarGtkExtensions SYSTEM "xml/thunar-gtk-extensions.xml">
-  <!ENTITY ThunarLocationEntry SYSTEM "xml/thunar-location-entry.xml">
-  <!ENTITY ThunarDnd SYSTEM "xml/thunar-dnd.xml">
-  <!ENTITY ThunarActionManager SYSTEM "xml/thunar-action-manager.xml">
-  <!ENTITY ThunarEmblemChooser SYSTEM "xml/thunar-emblem-chooser.xml">
-  <!ENTITY ThunarSessionClient SYSTEM "xml/thunar-session-client.xml">
-  <!ENTITY ThunarShortcutsPane SYSTEM "xml/thunar-shortcuts-pane.xml">
-  <!ENTITY ThunarJob SYSTEM "xml/thunar-job.xml">
-  <!ENTITY ThunarJobOperation SYSTEM "xml/thunar-job-operation.xml">
-  <!ENTITY ThunarJobOperation SYSTEM "xml/thunar-job-operation-history.xml">
-  <!ENTITY ThunarPangoExtensions SYSTEM "xml/thunar-pango-extensions.xml">
-  <!ENTITY ThunarStatusbar SYSTEM "xml/thunar-statusbar.xml">
-  <!ENTITY ThunarLocationBar SYSTEM "xml/thunar-location-bar.xml">
-  <!ENTITY ThunarColumnEditor SYSTEM "xml/thunar-column-editor.xml">
-  <!ENTITY ThunarListModel SYSTEM "xml/thunar-list-model.xml">
-  <!ENTITY ThunarIce SYSTEM "xml/thunar-ice.xml">
-  <!ENTITY ThunarWindow SYSTEM "xml/thunar-window.xml">
-  <!ENTITY ThunarFile SYSTEM "xml/thunar-file.xml">
-  <!ENTITY ThunarIconFactory SYSTEM "xml/thunar-icon-factory.xml">
-  <!ENTITY ThunarPathEntry SYSTEM "xml/thunar-path-entry.xml">
-  <!ENTITY ThunarSimpleJob SYSTEM "xml/thunar-simple-job.xml">
-  <!ENTITY ThunarChooserDialog SYSTEM "xml/thunar-chooser-dialog.xml">
-  <!ENTITY ThunarComponent SYSTEM "xml/thunar-component.xml">
-  <!ENTITY ThunarTransferJob SYSTEM "xml/thunar-transfer-job.xml">
-  <!ENTITY ThunarTreeView SYSTEM "xml/thunar-tree-view.xml">
-  <!ENTITY ThunarDevice SYSTEM "xml/thunar-device.xml">
-  <!ENTITY ThunarView SYSTEM "xml/thunar-view.xml">
-  <!ENTITY ThunarChooserModel SYSTEM "xml/thunar-chooser-model.xml">
-  <!ENTITY ThunarNavigator SYSTEM "xml/thunar-navigator.xml">
-  <!ENTITY ThunarCompactView SYSTEM "xml/thunar-compact-view.xml">
-  <!ENTITY ThunarColumnModel SYSTEM "xml/thunar-column-model.xml">
-  <!ENTITY ThunarTreeModel SYSTEM "xml/thunar-tree-model.xml">
-  <!ENTITY ThunarProgressDialog SYSTEM "xml/thunar-progress-dialog.xml">
-  <!ENTITY ThunarGdkExtensions SYSTEM "xml/thunar-gdk-extensions.xml">
-  <!ENTITY ThunarProgressView SYSTEM "xml/thunar-progress-view.xml">
-
-  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-  <!ENTITY % gtkdocentities SYSTEM "xml/gtkdocentities.ent">
-  %gtkdocentities;
-]>
-
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
-  <bookinfo>
-    <title>Thunar Internal Functions Reference Manual</title>
-    <releaseinfo>
-      For &package_string;.
-      The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="https://developer.xfce.org/&package_name;/index.html">https://developer.xfce.org/&package_name;/</ulink>.
-    </releaseinfo>
-    <copyright>
-      <year>2021</year>
-      <holder>The Xfce Development Team</holder>
-    </copyright>
-  </bookinfo>
-
-  <part id="glib-gtk-extensions">
-    <title>Glib/GTK Extensions</title>
-    <xi:include href="xml/thunar-gobject-extensions.xml"/>
-    <xi:include href="xml/thunar-gio-extensions.xml"/>
-    <xi:include href="xml/thunar-gtk-extensions.xml"/>
-    <xi:include href="xml/thunar-gdk-extensions.xml"/>
-    <xi:include href="xml/thunar-pango-extensions.xml"/>
-  </part>
-  <part id="thunar-objects">
-    <title>Thunar Backend Objects</title>
-
-    <chapter>
-      <title>File Abstraction</title>
-      <xi:include href="xml/thunar-file.xml"/>
-      <xi:include href="xml/thunar-file-monitor.xml"/>
-      <xi:include href="xml/thunar-folder.xml"/>
-    </chapter>
-
-    <chapter>
-      <title>Device Management</title>
-      <xi:include href="xml/thunar-device.xml"/>
-      <xi:include href="xml/thunar-device-monitor.xml"/>
-      <xi:include href="xml/thunar-notify.xml"/>
-    </chapter>
-
-    <chapter>
-      <title>Parallel Tasks</title>
-      <xi:include href="xml/thunar-job.xml"/>
-      <xi:include href="xml/thunar-simple-job.xml"/>
-      <xi:include href="xml/thunar-io-jobs.xml"/>
-      <xi:include href="xml/thunar-io-jobs-util.xml"/>
-      <xi:include href="xml/thunar-io-scan-directory.xml"/>
-      <xi:include href="xml/thunar-deep-count-job.xml"/>
-      <xi:include href="xml/thunar-transfer-job.xml"/>
-    </chapter>
-
-    <chapter>
-      <title>X Session / DBus Management</title>
-      <xi:include href="xml/thunar-session-client.xml"/>
-      <xi:include href="xml/thunar-ice.xml"/>
-      <xi:include href="xml/thunar-dbus-service.xml"/>
-    </chapter>
-
-    <chapter>
-      <title>Miscellaneous</title>
-      <xi:include href="xml/thunar-util.xml"/>
-      <xi:include href="xml/thunar-enum-types.xml"/>
-      <xi:include href="xml/thunar-preferences.xml"/>
-      <xi:include href="xml/thunar-user.xml"/>
-      <xi:include href="xml/thunar-job-operation.xml"/>
-      <xi:include href="xml/thunar-job-operation-history.xml"/>
-    </chapter>
-  </part>
-
-  <part id="thunar-view">
-    <title>Main Screen UI Widgets</title>
-    <chapter>
-      <title>Navigation Control</title>
-      <xi:include href="xml/thunar-window.xml"/>
-      <xi:include href="xml/thunar-navigator.xml"/>
-      <xi:include href="xml/thunar-browser.xml"/>
-      <xi:include href="xml/thunar-history.xml"/>
-    </chapter>
-
-    <chapter>
-      <title>Main View</title>
-      <xi:include href="xml/thunar-view.xml"/>
-      <xi:include href="xml/thunar-standard-view.xml"/>
-      <xi:include href="xml/thunar-abstract-icon-view.xml"/>
-      <xi:include href="xml/thunar-icon-view.xml"/>
-      <xi:include href="xml/thunar-details-view.xml"/>
-      <xi:include href="xml/thunar-compact-view.xml"/>
-    </chapter>
-
-    <chapter>
-      <title>Side Pane</title>
-      <xi:include href="xml/thunar-side-pane.xml"/>
-      <xi:include href="xml/thunar-shortcuts-pane.xml"/>
-      <xi:include href="xml/thunar-shortcuts-view.xml"/>
-      <xi:include href="xml/thunar-tree-pane.xml"/>
-      <xi:include href="xml/thunar-tree-view.xml"/>
-    </chapter>
-
-    <chapter>
-      <title>Location Bar</title>
-      <xi:include href="xml/thunar-location-bar.xml"/>
-      <xi:include href="xml/thunar-location-buttons.xml"/>
-      <xi:include href="xml/thunar-location-button.xml"/>
-      <xi:include href="xml/thunar-location-entry.xml"/>
-      <xi:include href="xml/thunar-path-entry.xml"/>
-    </chapter>
-
-    <chapter>
-      <title>Status Bar</title>
-      <xi:include href="xml/thunar-statusbar.xml"/>
-    </chapter>
-  </part>
-
-  <part id="thunar-widgets">
-    <title>Other Thunar UI Widgets</title>
-    <chapter>
-      <title>Chooser</title>
-      <xi:include href="xml/thunar-emblem-chooser.xml"/>
-      <xi:include href="xml/thunar-chooser-dialog.xml"/>
-      <xi:include href="xml/thunar-permissions-chooser.xml"/>
-      <xi:include href="xml/thunar-chooser-button.xml"/>
-      <xi:include href="xml/thunar-chooser-model.xml"/>
-    </chapter>
-
-    <chapter>
-      <title>Dialog</title>
-      <xi:include href="xml/thunar-dialogs.xml"/>
-      <xi:include href="xml/thunar-abstract-dialog.xml"/>
-      <xi:include href="xml/thunar-column-editor.xml"/>
-      <xi:include href="xml/thunar-preferences-dialog.xml"/>
-      <xi:include href="xml/thunar-progress-dialog.xml"/> <!-- Duplicated on purpose -->
-      <xi:include href="xml/thunar-properties-dialog.xml"/>
-      <xi:include href="xml/thunar-renamer-dialog.xml"/> <!-- Duplicated on purpose -->
-      <xi:include href="xml/thunar-size-label.xml"/>
-    </chapter>
-
-    <chapter>
-      <title>Entry Model</title>
-      <xi:include href="xml/thunar-column-model.xml"/>
-      <xi:include href="xml/thunar-list-model.xml"/>
-      <xi:include href="xml/thunar-renamer-model.xml"/> <!-- Duplicated on purpose -->
-      <xi:include href="xml/thunar-shortcuts-model.xml"/>
-      <xi:include href="xml/thunar-sendto-model.xml"/>
-      <xi:include href="xml/thunar-tree-model.xml"/>
-    </chapter>
-
-    <chapter>
-      <title>File Selection</title>
-      <xi:include href="xml/thunar-clipboard-manager.xml"/>
-      <xi:include href="xml/thunar-dnd.xml"/>
-      <xi:include href="xml/thunar-component.xml"/>
-    </chapter>
-
-    <chapter>
-      <title>Applicaton</title>
-      <xi:include href="xml/thunar-application.xml"/>
-    </chapter>
-
-    <chapter>
-      <title>Menu Entries</title>
-      <xi:include href="xml/thunar-menu.xml"/>
-      <xi:include href="xml/thunar-action-manager.xml"/>
-    </chapter>
-
-    <chapter>
-      <title>Image/Icon</title>
-      <xi:include href="xml/thunar-image.xml"/>
-      <xi:include href="xml/thunar-icon-factory.xml"/>
-      <xi:include href="xml/thunar-icon-renderer.xml"/>
-      <xi:include href="xml/thunar-shortcuts-icon-renderer.xml"/>
-    </chapter>
-
-    <chapter>
-      <title>Progress</title>
-      <xi:include href="xml/thunar-progress-view.xml"/>
-      <xi:include href="xml/thunar-progress-dialog.xml"/> <!-- Duplicated on purpose -->
-    </chapter>
-
-    <chapter>
-      <title>Renamer</title>
-      <xi:include href="xml/thunar-renamer-progress.xml"/>
-      <xi:include href="xml/thunar-renamer-model.xml"/> <!-- Duplicated on purpose -->
-      <xi:include href="xml/thunar-renamer-dialog.xml"/> <!-- Duplicated on purpose -->
-      <xi:include href="xml/thunar-renamer-pair.xml"/>
-    </chapter>
-  </part>
-  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
-</book>

docs/reference/thunar/version.xml.in

-@PACKAGE_VERSION@

docs/reference/thunarx/Makefile.am

@@ -5,7 +5,7 @@ DOC_MODULE=thunarx
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 
 # Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="EXO_DISABLE_DEPRECATED"
+SCAN_OPTIONS=
 
 # The directory containing the source code. Relative to $(srcdir)
 DOC_SOURCE_DIR=$(top_srcdir)/thunarx
@@ -21,7 +21,10 @@ HFILE_GLOB=
 CFILE_GLOB=
 
 # Header files to ignore when scanning
-IGNORE_HFILES=thunarx-alias.h
+IGNORE_HFILES = \
+	thunarx-private.h \
+	thunarx-visibility.h \
+	$(NULL)
 
 # Extra files to add when scanning (relative to $srcdir)
 EXTRA_HFILES=
@@ -50,4 +53,17 @@ GTKDOC_LIBS =  								\
 
 include $(top_srcdir)/gtk-doc.make
 
+$(top_builddir)/docs/reference/$(DOC_MODULE)-docs.xml: $(DOC_MODULE)-docs.xml.in
+	$(AM_V_GEN) $(SED) -e "s,\@COPYRIGHT_YEAR\@,@COPYRIGHT_YEAR@,g" $< >$@
+
+EXTRA_DIST += \
+	gtkdocentities.ent.in \
+	$(DOC_MODULE)-docs.xml.in \
+	meson.build \
+	$(NULL)
+
+DISTCLEANFILES = \
+	$(DOC_MODULE)-docs.xml \
+	$(NULL)
+
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

docs/reference/thunarx/gtkdocentities.ent.in

+<!ENTITY package_name @PACKAGE_NAME@>
+<!ENTITY package_version @PACKAGE_VERSION@>
+<!ENTITY package_string @PACKAGE_STRING@>