diff --git a/configure.ac b/configure.ac
index da3a3442941e6400a9ca48fde86412181aa63326..71ce07717a77423eb9461852d47169e2911f5932 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,7 +156,6 @@ GTK_DOC_CHECK([1.9])
dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
-XDT_CHECK_PACKAGE([EXO], [exo-2], [4.19.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])
@@ -164,7 +163,7 @@ 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.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])
diff --git a/docs/design/overview.xmi b/docs/design/overview.xmi
index 79ce09d633c3658116aaf0bef7491184bc5050e8..6cf7bf55488cf81cf230806f5288a98e32f9141b 100644
--- a/docs/design/overview.xmi
+++ b/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 "exomimeinfo.h"&#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="/************************************************************************&#010; exomimeinfo.cpp - Copyright bmeurer&#010;&#010;Here you can write a license for your code, some comments or any other&#010;information you want to have in your generated code. To to this simply&#010;configure the "headings" directory in uml to point to a directory&#010;where you have your heading files.&#010;&#010;or you can just replace the contents of this file with your own.&#010;If you want to do this, this file is located at&#010;&#010;/usr/local/share/apps/umbrello/headings/heading.cpp&#010;&#010;-->Code Generators searches for heading files based on the file extension&#010; i.e. it will look for a file name ending in ".h" to include in C++ header&#010; files, and for a file name ending in ".java" to include in all generated&#010; java code.&#010; If you name the file "heading.<extension>", Code Generator will always&#010; choose this file even if there are other files with the same extension in the&#010; directory. If you name the file something else, it must be the only one with that&#010; extension in the directory to guarantee that Code Generator will choose it.&#010;&#010;you can use variables in your heading files which are replaced at generation&#010;time. possible variables are : author, date, time, filename and filepath.&#010;just write %variable_name%&#010;&#010;This file was generated on Tue Jun 14 2005 at 22:14:17&#010;The original location of this file is exo&#010;**************************************************************************/&#010;" />
- </header>
- <classfields/>
- </classifiercodedocument>
<classifiercodedocument writeOutCode="true" package="" id="195" parent_class="195" fileExt=".cpp" fileName="thunarlistmodel" >
<textblocks>
<codeblockwithcomments tag="includes" text="#include "thunarlistmodel.h"&#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&#010;#define EXOMIMEINFO_H" >
- <header>
- <cppcodedocumentation tag="" writeOutText="false" />
- </header>
- </codeblockwithcomments>
- <codeblockwithcomments tag="includes" text="#include <string>&#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&#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="/************************************************************************&#010; exomimeinfo.h - Copyright bmeurer&#010;&#010;Here you can write a license for your code, some comments or any other&#010;information you want to have in your generated code. To to this simply&#010;configure the "headings" directory in uml to point to a directory&#010;where you have your heading files.&#010;&#010;or you can just replace the contents of this file with your own.&#010;If you want to do this, this file is located at&#010;&#010;/usr/local/share/apps/umbrello/headings/heading.h&#010;&#010;-->Code Generators searches for heading files based on the file extension&#010; i.e. it will look for a file name ending in ".h" to include in C++ header&#010; files, and for a file name ending in ".java" to include in all generated&#010; java code.&#010; If you name the file "heading.<extension>", Code Generator will always&#010; choose this file even if there are other files with the same extension in the&#010; directory. If you name the file something else, it must be the only one with that&#010; extension in the directory to guarantee that Code Generator will choose it.&#010;&#010;you can use variables in your heading files which are replaced at generation&#010;time. possible variables are : author, date, time, filename and filepath.&#010;just write %variable_name%&#010;&#010;This file was generated on Tue Jun 14 2005 at 22:14:17&#010;The original location of this file is exo&#010;**************************************************************************/&#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&#010;#define THUNARLISTMODEL_H" >
diff --git a/docs/reference/thunarx/Makefile.am b/docs/reference/thunarx/Makefile.am
index 2872190843b5c09dbe80d78829f8966dba467e31..9794c9126df9877d826462b35ea522663169ae42 100644
--- a/docs/reference/thunarx/Makefile.am
+++ b/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
diff --git a/examples/tex-open-terminal/tex-open-terminal.c b/examples/tex-open-terminal/tex-open-terminal.c
index b952ed160ddd183c996116eb778c002afaa116c4..dc317c3deb6b5bd2034c2ae030226bfe3930911b 100644
--- a/examples/tex-open-terminal/tex-open-terminal.c
+++ b/examples/tex-open-terminal/tex-open-terminal.c
@@ -157,7 +157,7 @@ tex_open_terminal_activated (ThunarxMenuItem *item,
return;
/* build up the command line for the terminal */
- command = g_strdup_printf ("exo-open --launch TerminalEmulator --working-directory \"%s\"", path);
+ command = g_strdup_printf ("xfce-open --launch TerminalEmulator --working-directory \"%s\"", path);
/* try to run the terminal command */
if (!xfce_spawn_command_line (NULL, command, FALSE, FALSE, TRUE, &error))
diff --git a/meson.build b/meson.build
index a493a68c5e51dc6cd1f6ac20090263b17d60dbd3..cf57b3d8c5e9651084758833d38be80499d5c0dc 100644
--- a/meson.build
+++ b/meson.build
@@ -19,11 +19,10 @@ i18n = import('i18n')
fs = import('fs')
dependency_versions = {
- 'exo': '>= 4.19.0',
'glib': '>= 2.72.0',
'gtk': '>= 3.24.0',
'gdk-pixbuf': '>= 2.42.8',
- 'libxfce4ui': '>= 4.17.6',
+ 'libxfce4ui': '>= 4.21.0',
'libxfce4util': '>= 4.17.2',
'xfconf': '>= 4.12.0',
'pango': '>= 1.38.0',
@@ -41,7 +40,6 @@ dependency_versions = {
'libxfce4panel': '>= 4.14.0',
}
-exo = dependency('exo-2', version: dependency_versions['exo'])
glib = dependency('glib-2.0', version: dependency_versions['glib'])
gio = dependency('gio-2.0', version: dependency_versions['glib'])
gthread = dependency('gthread-2.0', version: dependency_versions['glib'])
diff --git a/plugins/thunar-apr/Makefile.am b/plugins/thunar-apr/Makefile.am
index 2ef2dfcca6f1d58786e336a2708e02d214beecf7..4bad86d8bd6dc88f980dc906d22b6e77e87270bf 100644
--- a/plugins/thunar-apr/Makefile.am
+++ b/plugins/thunar-apr/Makefile.am
@@ -26,7 +26,6 @@ thunar_apr_la_SOURCES = \
thunar_apr_la_CFLAGS = \
$(EXIF_CFLAGS) \
- $(EXO_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
$(GLIB_CFLAGS) \
@@ -44,7 +43,6 @@ thunar_apr_la_LDFLAGS = \
thunar_apr_la_LIBADD = \
$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la \
$(EXIF_LIBS) \
- $(EXO_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_LIBS) \
$(GLIB_LIBS) \
diff --git a/plugins/thunar-apr/meson.build b/plugins/thunar-apr/meson.build
index d776273d1f5981c39296e9d0d1d68ce9f565df54..e60d20125d0d59d96696db11ffd95e79429fa384 100644
--- a/plugins/thunar-apr/meson.build
+++ b/plugins/thunar-apr/meson.build
@@ -25,7 +25,6 @@ shared_module(
dependencies: [
glib,
gtk,
- exo,
libxfce4ui,
libxfce4util,
exif,
diff --git a/plugins/thunar-apr/thunar-apr-image-page.c b/plugins/thunar-apr/thunar-apr-image-page.c
index 8bed59e7a39315aaa9ab640e444ece08b9ac0067..80df6a68d03d69f97b385a22dd360ed8775fd27f 100644
--- a/plugins/thunar-apr/thunar-apr-image-page.c
+++ b/plugins/thunar-apr/thunar-apr-image-page.c
@@ -22,7 +22,7 @@
#include <config.h>
#endif
-#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
#include <thunar-apr/thunar-apr-image-page.h>
#ifdef HAVE_EXIF
diff --git a/plugins/thunar-apr/thunar-apr-private.c b/plugins/thunar-apr/thunar-apr-private.c
index 1c61c351dd9b63b60df24690e60e878ba20c80c9..417bcbbc274b3ad475445eba1f0a5a5cfabd5531 100644
--- a/plugins/thunar-apr/thunar-apr-private.c
+++ b/plugins/thunar-apr/thunar-apr-private.c
@@ -29,7 +29,7 @@
#include <locale.h>
#endif
-#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
#include <thunar-apr/thunar-apr-private.h>
diff --git a/plugins/thunar-sbr/Makefile.am b/plugins/thunar-sbr/Makefile.am
index fb0c2c3b94cbe9b43655b10c4838717a5eba64e5..494840a85b96eb2eb18fa426b6a6cbd179fea66e 100644
--- a/plugins/thunar-sbr/Makefile.am
+++ b/plugins/thunar-sbr/Makefile.am
@@ -31,8 +31,9 @@ thunar_sbr_la_SOURCES = \
thunar_sbr_la_CFLAGS = \
$(EXIF_CFLAGS) \
- $(EXO_CFLAGS) \
$(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
$(PCRE2_CFLAGS) \
$(PLATFORM_CFLAGS)
@@ -47,8 +48,9 @@ thunar_sbr_la_LDFLAGS = \
thunar_sbr_la_LIBADD = \
$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la \
$(EXIF_LIBS) \
- $(EXO_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
$(GLIB_LIBS) \
+ $(GTK_LIBS) \
$(PCRE2_LIBS)
thunar_sbr_la_DEPENDENCIES = \
diff --git a/plugins/thunar-sbr/meson.build b/plugins/thunar-sbr/meson.build
index 34c6bc311a0eb844c05fe104093565384284adcb..bb1ab2fcd1f85bcad3406154ef975d91e0e1851e 100644
--- a/plugins/thunar-sbr/meson.build
+++ b/plugins/thunar-sbr/meson.build
@@ -32,7 +32,7 @@ shared_module(
dependencies: [
glib,
gtk,
- exo,
+ libxfce4util,
exif,
pcre2,
],
diff --git a/plugins/thunar-sbr/thunar-sbr-case-renamer.c b/plugins/thunar-sbr/thunar-sbr-case-renamer.c
index dfe8b2034bf49c846a3243a001cd8bef47bbc9ac..778b665d255cdbf507447959bd80d9d901b7e5ad 100644
--- a/plugins/thunar-sbr/thunar-sbr-case-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-case-renamer.c
@@ -22,7 +22,7 @@
#include <config.h>
#endif
-#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
#include <thunar-sbr/thunar-sbr-case-renamer.h>
diff --git a/plugins/thunar-sbr/thunar-sbr-remove-renamer.c b/plugins/thunar-sbr/thunar-sbr-remove-renamer.c
index 17ed54707cd08861534bc4ef56caaba053c6d580..7c8891b92aa65a5ca2968afd432d8d886f617ae4 100644
--- a/plugins/thunar-sbr/thunar-sbr-remove-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-remove-renamer.c
@@ -22,7 +22,7 @@
#include <config.h>
#endif
-#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
#include <thunar-sbr/thunar-sbr-remove-renamer.h>
diff --git a/plugins/thunar-sendto-email/Makefile.am b/plugins/thunar-sendto-email/Makefile.am
index ecb91dc2eae74bb1935d11b0f30c7f0f8ef9d1a1..09424e5325ff1243c782f3a1ab214b804c9032a5 100644
--- a/plugins/thunar-sendto-email/Makefile.am
+++ b/plugins/thunar-sendto-email/Makefile.am
@@ -17,12 +17,16 @@ thunar_sendto_email_SOURCES = \
main.c
thunar_sendto_email_CFLAGS = \
- $(EXO_CFLAGS) \
+ $(GIO_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(LIBXFCE4UI_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(PLATFORM_CFLAGS)
thunar_sendto_email_LDADD = \
- $(EXO_LIBS) \
+ $(GIO_LIBS) \
+ $(GTK_LIBS) \
+ $(LIBXFCE4UI_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(PLATFORM_LDFLAGS)
diff --git a/plugins/thunar-sendto-email/README.md b/plugins/thunar-sendto-email/README.md
index 4d3b19890b78221b41b543e5f48ce60d83807963..96ccde2d0f8716b93cccee9fc5e2c77c3b9b5567 100644
--- a/plugins/thunar-sendto-email/README.md
+++ b/plugins/thunar-sendto-email/README.md
@@ -1,6 +1,6 @@
Thunar Sendto Email (thunar-sendto-email)
=========================================
-Thunar-sendto-email is an extension to Thunar, which adds an additional entry to the "Send To" sub menu, named "Mail Recipient", that starts the mail composer and attaches the selected files (using the exo-open mechanism).
+Thunar-sendto-email is an extension to Thunar, which adds an additional entry to the "Send To" sub menu, named "Mail Recipient", that starts the mail composer and attaches the selected files (using the xfce-open mechanism).
The extension uses the zip command to compress folders prior to sending them to the mail client, since most mail clients cannot handle directories as attachments. For regular files, larger than 200KiB, the extension prompts the user whether to compress the files (using the zip command) prior to sending them to the mail client.
diff --git a/plugins/thunar-sendto-email/main.c b/plugins/thunar-sendto-email/main.c
index b16d8d2b1f98424d2b7331bf6dcb04660002b5cf..3485a1b3200569a535b71bb53f58a213ee88511e 100644
--- a/plugins/thunar-sendto-email/main.c
+++ b/plugins/thunar-sendto-email/main.c
@@ -54,11 +54,11 @@
#include <unistd.h>
#endif
-#include <exo/exo.h>
#include <gio/gio.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
+#include <libxfce4ui/libxfce4ui.h>
#include <libxfce4util/libxfce4util.h>
@@ -680,7 +680,7 @@ main (int argc, char **argv)
g_strfreev (attachments);
/* open the mail composer */
- if (!exo_execute_preferred_application ("MailReader", mailto->str, NULL, NULL, &error))
+ if (!xfce_execute_preferred_application ("MailReader", mailto->str, NULL, NULL, &error))
{
/* tell the user that we failed */
tse_error (error, _("Failed to compose new email"));
diff --git a/plugins/thunar-sendto-email/meson.build b/plugins/thunar-sendto-email/meson.build
index 73a9a793f3a027e85cedc204f56f2225f979ecf4..3e6875a0ce52e16d1f9965856830df94187be253 100644
--- a/plugins/thunar-sendto-email/meson.build
+++ b/plugins/thunar-sendto-email/meson.build
@@ -12,7 +12,7 @@ executable(
dependencies: [
glib,
gtk,
- exo,
+ libxfce4ui,
libxfce4util,
],
install: true,
diff --git a/plugins/thunar-uca/Makefile.am b/plugins/thunar-uca/Makefile.am
index 4e0d6776839a3114efd43277606eaa178b305b46..b11d38a16b12ca623eaa407331d68e166b80c5b7 100644
--- a/plugins/thunar-uca/Makefile.am
+++ b/plugins/thunar-uca/Makefile.am
@@ -30,7 +30,6 @@ thunar_uca_la_SOURCES = \
thunar-uca.gresource.c
thunar_uca_la_CFLAGS = \
- $(EXO_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
$(LIBXFCE4KBD_PRIVATE_CFLAGS) \
@@ -46,7 +45,6 @@ thunar_uca_la_LDFLAGS = \
thunar_uca_la_LIBADD = \
$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la \
- $(EXO_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_LIBS) \
$(LIBXFCE4KBD_PRIVATE_LIBS)
diff --git a/plugins/thunar-uca/meson.build b/plugins/thunar-uca/meson.build
index 7229310fb2fd3ec935192400dd0b437519630c27..5b1c1082f1a1f7336e854d7b6683989c297a8ee0 100644
--- a/plugins/thunar-uca/meson.build
+++ b/plugins/thunar-uca/meson.build
@@ -34,7 +34,6 @@ shared_module(
dependencies: [
glib,
gtk,
- exo,
libxfce4ui,
libxfce4kbd,
libxfce4util,
diff --git a/plugins/thunar-uca/thunar-uca-editor.c b/plugins/thunar-uca/thunar-uca-editor.c
index 0b0a406d3e84bec5dbc79084cb71c70cabcf4253..5de4bed009a040245cd26cfe0b61a476ec7feafe 100644
--- a/plugins/thunar-uca/thunar-uca-editor.c
+++ b/plugins/thunar-uca/thunar-uca-editor.c
@@ -30,7 +30,6 @@
#include <string.h>
#endif
-#include <exo/exo.h>
#include <libxfce4kbd-private/xfce-shortcut-dialog.h>
#include <libxfce4ui/libxfce4ui.h>
#include <thunar-uca/thunar-uca-editor.h>
@@ -451,23 +450,23 @@ thunar_uca_editor_icon_clicked (ThunarUcaEditor *uca_editor)
/* allocate the chooser dialog */
title = g_strdup_printf (_("Select an Icon for \"%s\""), name);
- chooser = exo_icon_chooser_dialog_new (title, GTK_WINDOW (uca_editor),
- _("_Cancel"), GTK_RESPONSE_CANCEL,
- _("_OK"), GTK_RESPONSE_ACCEPT,
- NULL);
+ chooser = xfce_icon_chooser_dialog_new (title, GTK_WINDOW (uca_editor),
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_ACCEPT,
+ NULL);
gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT);
g_free (title);
/* setup the currently selected icon */
icon = g_object_get_data (G_OBJECT (uca_editor->icon_button), "thunar-uca-icon-name");
if (G_LIKELY (icon != NULL && *icon != '\0'))
- exo_icon_chooser_dialog_set_icon (EXO_ICON_CHOOSER_DIALOG (chooser), icon);
+ xfce_icon_chooser_dialog_set_icon (XFCE_ICON_CHOOSER_DIALOG (chooser), icon);
/* run the icon chooser dialog */
if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_ACCEPT)
{
/* remember the selected icon from the chooser */
- icon = exo_icon_chooser_dialog_get_icon (EXO_ICON_CHOOSER_DIALOG (chooser));
+ icon = xfce_icon_chooser_dialog_get_icon (XFCE_ICON_CHOOSER_DIALOG (chooser));
thunar_uca_editor_set_icon_name (uca_editor, icon);
g_free (icon);
}
diff --git a/plugins/thunar-uca/thunar-uca-private.c b/plugins/thunar-uca/thunar-uca-private.c
index da3ddad30649771243a2c4607d6e956d1c19cb68..1cdcf1069e8db35d893d96a707dfd43b128343db 100644
--- a/plugins/thunar-uca/thunar-uca-private.c
+++ b/plugins/thunar-uca/thunar-uca-private.c
@@ -29,7 +29,7 @@
#include <locale.h>
#endif
-#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
#include <thunar-uca/thunar-uca-private.h>
diff --git a/plugins/thunar-uca/uca.xml.in b/plugins/thunar-uca/uca.xml.in
index bb1924211343dbb190ef36ab3f1d02ea9d4c96db..4876bdc3e3d706a8662f9901507e187dbdab0bb5 100644
--- a/plugins/thunar-uca/uca.xml.in
+++ b/plugins/thunar-uca/uca.xml.in
@@ -40,7 +40,7 @@
<patterns>*</patterns>
<range></range>
<name>Open Terminal Here</name>
- <command>exo-open --working-directory %f --launch TerminalEmulator</command>
+ <command>xfce-open --working-directory %f --launch TerminalEmulator</command>
<description>Example for a custom action</description>
<startup-notify/>
<directories/>
diff --git a/plugins/thunar-wallpaper/Makefile.am b/plugins/thunar-wallpaper/Makefile.am
index 4d9ef168d40208f473fcdd2088d6b7c6355e9ae5..f387aa6877f4be49f210051ca78f862615a870ca 100644
--- a/plugins/thunar-wallpaper/Makefile.am
+++ b/plugins/thunar-wallpaper/Makefile.am
@@ -2,7 +2,6 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"thunar-wallpaper-plugin\" \
- -DEXO_API_SUBJECT_TO_CHANGE \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
$(PLATFORM_CPPFLAGS)
@@ -16,10 +15,10 @@ thunar_wallpaper_plugin_la_SOURCES = \
thunar-wallpaper-plugin.c
thunar_wallpaper_plugin_la_CFLAGS = \
- $(EXO_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBX11_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
$(XFCONF_CFLAGS) \
$(PLATFORM_CFLAGS)
@@ -33,9 +32,9 @@ thunar_wallpaper_plugin_la_LDFLAGS = \
thunar_wallpaper_plugin_la_LIBADD = \
$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la \
- $(EXO_LIBS) \
$(GLIB_LIBS) \
$(GTK_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
$(XFCONF_LIBS) \
$(LIBX11_LIBS)
diff --git a/plugins/thunar-wallpaper/meson.build b/plugins/thunar-wallpaper/meson.build
index 4963d9a42b94828969b5dca8c056cd4c7f6557ab..c590f3d535ee6f541467f0c833bd1ae010d3bd97 100644
--- a/plugins/thunar-wallpaper/meson.build
+++ b/plugins/thunar-wallpaper/meson.build
@@ -16,7 +16,7 @@ shared_module(
dependencies: [
glib,
gtk,
- exo,
+ libxfce4util,
xfconf,
x11_deps,
libintl,
diff --git a/plugins/thunar-wallpaper/thunar-wallpaper-plugin.c b/plugins/thunar-wallpaper/thunar-wallpaper-plugin.c
index 67e23a0043ce80d87ba67777a752f4293bd14b1e..233d8f91ec752ae04bf13f63a349d69d3c7f86d1 100644
--- a/plugins/thunar-wallpaper/thunar-wallpaper-plugin.c
+++ b/plugins/thunar-wallpaper/thunar-wallpaper-plugin.c
@@ -24,7 +24,7 @@
#include "twp-provider.h"
-#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index 5b34360b8b6c53462ef26773c7e2006f88d8c2ad..3aac681c0761430bb66d2665611728bdfba6f314 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -5,7 +5,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-DBINDIR=\"$(bindir)\" \
-DDATADIR=\"$(datadir)\" \
- -DEXO_DISABLE_DEPRECATED \
-DG_LOG_DOMAIN=\"thunar\" \
-DLIBDIR=\"$(libdir)\" \
-DHELPERDIR=\"$(HELPER_PATH_PREFIX)\" \
@@ -214,9 +213,9 @@ thunar_SOURCES = \
thunar-window.h
thunar_CFLAGS = \
- $(EXO_CFLAGS) \
$(GIO_CFLAGS) \
$(GTHREAD_CFLAGS) \
+ $(GTK_CFLAGS) \
$(GUDEV_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(LIBSM_CFLAGS) \
@@ -234,9 +233,9 @@ thunar_LDFLAGS = \
thunar_LDADD = \
$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la \
- $(EXO_LIBS) \
$(GIO_LIBS) \
$(GTHREAD_LIBS) \
+ $(GTK_LIBS) \
$(GUDEV_LIBS) \
$(LIBNOTIFY_LIBS) \
$(LIBSM_LIBS) \
diff --git a/thunar/meson.build b/thunar/meson.build
index face0e65896b3ab4f8389f8fda6dc49ba1773487..f3f56cf9294cac1bfbb401122b6ae3a750f01b7e 100644
--- a/thunar/meson.build
+++ b/thunar/meson.build
@@ -217,7 +217,6 @@ executable(
gio_unix,
gthread,
gtk,
- exo,
libxfce4ui,
libxfce4kbd,
libxfce4util,
diff --git a/thunar/thunar-abstract-dialog.h b/thunar/thunar-abstract-dialog.h
index 0a5310c0803207b34ce486e07805b49f911b5698..ac9c135392ae7f42d1cb9c5389ce0ad517532864 100644
--- a/thunar/thunar-abstract-dialog.h
+++ b/thunar/thunar-abstract-dialog.h
@@ -20,7 +20,7 @@
#ifndef __THUNAR_ABSTRACT_DIALOG_H__
#define __THUNAR_ABSTRACT_DIALOG_H__
-#include <exo/exo.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS;
diff --git a/thunar/thunar-abstract-icon-view.c b/thunar/thunar-abstract-icon-view.c
index 8e662c86f2b737774de2749f2a90574742876895..7931d56f6385713100fc37b37abd28c7aaf5c857 100644
--- a/thunar/thunar-abstract-icon-view.c
+++ b/thunar/thunar-abstract-icon-view.c
@@ -70,31 +70,31 @@ static void
thunar_abstract_icon_view_highlight_path (ThunarStandardView *standard_view,
GtkTreePath *path);
static void
-thunar_abstract_icon_view_notify_model (ExoIconView *view,
+thunar_abstract_icon_view_notify_model (XfceIconView *view,
GParamSpec *pspec,
ThunarAbstractIconView *abstract_icon_view);
static gboolean
-thunar_abstract_icon_view_button_press_event (ExoIconView *view,
+thunar_abstract_icon_view_button_press_event (XfceIconView *view,
GdkEventButton *event,
ThunarAbstractIconView *abstract_icon_view);
static gboolean
-thunar_abstract_icon_view_button_release_event (ExoIconView *view,
+thunar_abstract_icon_view_button_release_event (XfceIconView *view,
GdkEventButton *event,
ThunarAbstractIconView *abstract_icon_view);
static gboolean
-thunar_abstract_icon_view_draw (ExoIconView *view,
+thunar_abstract_icon_view_draw (XfceIconView *view,
cairo_t *cr,
ThunarAbstractIconView *abstract_icon_view);
static gboolean
-thunar_abstract_icon_view_key_press_event (ExoIconView *view,
+thunar_abstract_icon_view_key_press_event (XfceIconView *view,
GdkEventKey *event,
ThunarAbstractIconView *abstract_icon_view);
static gboolean
-thunar_abstract_icon_view_motion_notify_event (ExoIconView *view,
+thunar_abstract_icon_view_motion_notify_event (XfceIconView *view,
GdkEventMotion *event,
ThunarAbstractIconView *abstract_icon_view);
static void
-thunar_abstract_icon_view_item_activated (ExoIconView *view,
+thunar_abstract_icon_view_item_activated (XfceIconView *view,
GtkTreePath *path,
ThunarAbstractIconView *abstract_icon_view);
static void
@@ -160,7 +160,7 @@ thunar_abstract_icon_view_class_init (ThunarAbstractIconViewClass *klass)
"column-spacing",
"column-spacing",
0, G_MAXINT, 6,
- EXO_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* ThunarAbstractIconView:row-spacing:
@@ -173,7 +173,7 @@ thunar_abstract_icon_view_class_init (ThunarAbstractIconViewClass *klass)
"row-spacing",
"row-spacing",
0, G_MAXINT, 6,
- EXO_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
}
@@ -190,7 +190,7 @@ thunar_abstract_icon_view_init (ThunarAbstractIconView *abstract_icon_view)
g_signal_connect (G_OBJECT (abstract_icon_view), "notify::zoom-level", G_CALLBACK (thunar_abstract_icon_view_zoom_level_changed), NULL);
/* create the real view */
- view = exo_icon_view_new ();
+ view = xfce_icon_view_new ();
g_signal_connect (G_OBJECT (view), "notify::model", G_CALLBACK (thunar_abstract_icon_view_notify_model), abstract_icon_view);
g_signal_connect (G_OBJECT (view), "button-press-event", G_CALLBACK (thunar_abstract_icon_view_button_press_event), abstract_icon_view);
g_signal_connect (G_OBJECT (view), "key-press-event", G_CALLBACK (thunar_abstract_icon_view_key_press_event), abstract_icon_view);
@@ -200,8 +200,8 @@ thunar_abstract_icon_view_init (ThunarAbstractIconView *abstract_icon_view)
gtk_widget_show (view);
/* initialize the abstract icon view properties */
- exo_icon_view_set_enable_search (EXO_ICON_VIEW (view), TRUE);
- exo_icon_view_set_selection_mode (EXO_ICON_VIEW (view), GTK_SELECTION_MULTIPLE);
+ xfce_icon_view_set_enable_search (XFCE_ICON_VIEW (view), TRUE);
+ xfce_icon_view_set_selection_mode (XFCE_ICON_VIEW (view), GTK_SELECTION_MULTIPLE);
/* add the abstract icon renderer */
g_object_set (G_OBJECT (THUNAR_STANDARD_VIEW (abstract_icon_view)->icon_renderer), "follow-state", TRUE, "rounded-corners", TRUE, NULL);
@@ -240,8 +240,8 @@ thunar_abstract_icon_view_style_set (GtkWidget *widget,
gtk_widget_style_get (widget, "column-spacing", &column_spacing, "row-spacing", &row_spacing, NULL);
/* apply the column/row spacing to the icon view */
- exo_icon_view_set_column_spacing (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (widget))), column_spacing);
- exo_icon_view_set_row_spacing (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (widget))), row_spacing);
+ xfce_icon_view_set_column_spacing (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (widget))), column_spacing);
+ xfce_icon_view_set_row_spacing (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (widget))), row_spacing);
/* call the parent handler */
(*GTK_WIDGET_CLASS (thunar_abstract_icon_view_parent_class)->style_set) (widget, previous_style);
@@ -252,7 +252,7 @@ thunar_abstract_icon_view_style_set (GtkWidget *widget,
static GList *
thunar_abstract_icon_view_get_selected_items (ThunarStandardView *standard_view)
{
- return exo_icon_view_get_selected_items (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))));
+ return xfce_icon_view_get_selected_items (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))));
}
@@ -261,7 +261,7 @@ static void
thunar_abstract_icon_view_select_all (ThunarStandardView *standard_view)
{
_thunar_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
- exo_icon_view_select_all (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))));
+ xfce_icon_view_select_all (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))));
}
@@ -270,7 +270,7 @@ static void
thunar_abstract_icon_view_unselect_all (ThunarStandardView *standard_view)
{
_thunar_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
- exo_icon_view_unselect_all (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))));
+ xfce_icon_view_unselect_all (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))));
}
@@ -279,7 +279,7 @@ static void
thunar_abstract_icon_view_selection_invert (ThunarStandardView *standard_view)
{
_thunar_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
- exo_icon_view_selection_invert (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))));
+ xfce_icon_view_selection_invert (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))));
}
@@ -289,7 +289,7 @@ thunar_abstract_icon_view_select_path (ThunarStandardView *standard_view,
GtkTreePath *path)
{
_thunar_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
- exo_icon_view_select_path (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))), path);
+ xfce_icon_view_select_path (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))), path);
}
@@ -308,7 +308,7 @@ thunar_abstract_icon_view_set_cursor (ThunarStandardView *standard_view,
g_object_set (G_OBJECT (standard_view->name_renderer), "mode", GTK_CELL_RENDERER_MODE_EDITABLE, NULL);
/* tell the abstract_icon view to start editing the given item */
- exo_icon_view_set_cursor (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))), path, standard_view->name_renderer, start_editing);
+ xfce_icon_view_set_cursor (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))), path, standard_view->name_renderer, start_editing);
/* reset the name renderer mode */
g_object_set (G_OBJECT (standard_view->name_renderer), "mode", mode, NULL);
@@ -324,7 +324,7 @@ thunar_abstract_icon_view_scroll_to_path (ThunarStandardView *standard_view,
gfloat col_align)
{
_thunar_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
- exo_icon_view_scroll_to_path (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))), path, use_align, row_align, col_align);
+ xfce_icon_view_scroll_to_path (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))), path, use_align, row_align, col_align);
}
@@ -335,7 +335,7 @@ thunar_abstract_icon_view_get_path_at_pos (ThunarStandardView *standard_view,
gint y)
{
_thunar_return_val_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view), NULL);
- return exo_icon_view_get_path_at_pos (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))), x, y);
+ return xfce_icon_view_get_path_at_pos (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))), x, y);
}
@@ -346,7 +346,7 @@ thunar_abstract_icon_view_get_visible_range (ThunarStandardView *standard_view,
GtkTreePath **end_path)
{
_thunar_return_val_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view), FALSE);
- return exo_icon_view_get_visible_range (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))), start_path, end_path);
+ return xfce_icon_view_get_visible_range (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))), start_path, end_path);
}
@@ -356,7 +356,7 @@ thunar_abstract_icon_view_highlight_path (ThunarStandardView *standard_view,
GtkTreePath *path)
{
_thunar_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
- exo_icon_view_set_drag_dest_item (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))), path, EXO_ICON_VIEW_DROP_INTO);
+ xfce_icon_view_set_drag_dest_item (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))), path, XFCE_ICON_VIEW_DROP_INTO);
}
@@ -399,20 +399,20 @@ thunar_abstract_icon_view_gesture_action (ThunarAbstractIconView *abstract_icon_
static void
-thunar_abstract_icon_view_notify_model (ExoIconView *view,
+thunar_abstract_icon_view_notify_model (XfceIconView *view,
GParamSpec *pspec,
ThunarAbstractIconView *abstract_icon_view)
{
- /* We need to set the search column here, as ExoIconView resets it
+ /* We need to set the search column here, as XfceIconView resets it
* whenever a new model is set.
*/
- exo_icon_view_set_search_column (view, THUNAR_COLUMN_NAME);
+ xfce_icon_view_set_search_column (view, THUNAR_COLUMN_NAME);
}
static gboolean
-thunar_abstract_icon_view_button_press_event (ExoIconView *view,
+thunar_abstract_icon_view_button_press_event (XfceIconView *view,
GdkEventButton *event,
ThunarAbstractIconView *abstract_icon_view)
{
@@ -426,15 +426,15 @@ thunar_abstract_icon_view_button_press_event (ExoIconView *view,
if (event->type == GDK_BUTTON_PRESS && event->button == 3)
{
/* open the context menu on right clicks */
- if (exo_icon_view_get_item_at_pos (view, event->x, event->y, &path, NULL))
+ if (xfce_icon_view_get_item_at_pos (view, event->x, event->y, &path, NULL))
{
/* select the path on which the user clicked if not selected yet */
- if (!exo_icon_view_path_is_selected (view, path))
+ if (!xfce_icon_view_path_is_selected (view, path))
{
/* we don't unselect all other items if Control is active */
if ((event->state & GDK_CONTROL_MASK) == 0)
- exo_icon_view_unselect_all (view);
- exo_icon_view_select_path (view, path);
+ xfce_icon_view_unselect_all (view);
+ xfce_icon_view_select_path (view, path);
}
gtk_tree_path_free (path);
@@ -446,7 +446,7 @@ thunar_abstract_icon_view_button_press_event (ExoIconView *view,
/* user clicked on an empty area, so we unselect everything
* to make sure that the folder context menu is opened.
*/
- exo_icon_view_unselect_all (view);
+ xfce_icon_view_unselect_all (view);
/* open the context menu */
thunar_standard_view_context_menu (THUNAR_STANDARD_VIEW (abstract_icon_view));
@@ -457,13 +457,13 @@ thunar_abstract_icon_view_button_press_event (ExoIconView *view,
else if (event->type == GDK_BUTTON_PRESS && event->button == 2)
{
/* unselect all currently selected items */
- exo_icon_view_unselect_all (view);
+ xfce_icon_view_unselect_all (view);
/* determine the path to the item that was middle-clicked */
- if (exo_icon_view_get_item_at_pos (view, event->x, event->y, &path, NULL))
+ if (xfce_icon_view_get_item_at_pos (view, event->x, event->y, &path, NULL))
{
/* select only the path to the item on which the user clicked */
- exo_icon_view_select_path (view, path);
+ xfce_icon_view_select_path (view, path);
/* try to open the path as new window/tab, if possible */
_thunar_standard_view_open_on_middle_click (THUNAR_STANDARD_VIEW (abstract_icon_view), path, event->state);
@@ -496,14 +496,14 @@ thunar_abstract_icon_view_button_press_event (ExoIconView *view,
static gboolean
-thunar_abstract_icon_view_button_release_event (ExoIconView *view,
+thunar_abstract_icon_view_button_release_event (XfceIconView *view,
GdkEventButton *event,
ThunarAbstractIconView *abstract_icon_view)
{
const XfceGtkActionEntry *action_entry;
GtkWidget *window;
- _thunar_return_val_if_fail (EXO_IS_ICON_VIEW (view), FALSE);
+ _thunar_return_val_if_fail (XFCE_IS_ICON_VIEW (view), FALSE);
_thunar_return_val_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (abstract_icon_view), FALSE);
_thunar_return_val_if_fail (abstract_icon_view->priv->gesture_expose_id > 0, FALSE);
_thunar_return_val_if_fail (abstract_icon_view->priv->gesture_motion_id > 0, FALSE);
@@ -537,7 +537,7 @@ thunar_abstract_icon_view_button_release_event (ExoIconView *view,
static gboolean
-thunar_abstract_icon_view_draw (ExoIconView *view,
+thunar_abstract_icon_view_draw (XfceIconView *view,
cairo_t *cr,
ThunarAbstractIconView *abstract_icon_view)
{
@@ -547,7 +547,7 @@ thunar_abstract_icon_view_draw (ExoIconView *view,
gint x, y;
gint scale_factor;
- _thunar_return_val_if_fail (EXO_IS_ICON_VIEW (view), FALSE);
+ _thunar_return_val_if_fail (XFCE_IS_ICON_VIEW (view), FALSE);
_thunar_return_val_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (abstract_icon_view), FALSE);
_thunar_return_val_if_fail (abstract_icon_view->priv->gesture_expose_id > 0, FALSE);
_thunar_return_val_if_fail (abstract_icon_view->priv->gesture_motion_id > 0, FALSE);
@@ -599,7 +599,7 @@ thunar_abstract_icon_view_draw (ExoIconView *view,
static gboolean
-thunar_abstract_icon_view_key_press_event (ExoIconView *view,
+thunar_abstract_icon_view_key_press_event (XfceIconView *view,
GdkEventKey *event,
ThunarAbstractIconView *abstract_icon_view)
{
@@ -616,13 +616,13 @@ thunar_abstract_icon_view_key_press_event (ExoIconView *view,
static gboolean
-thunar_abstract_icon_view_motion_notify_event (ExoIconView *view,
+thunar_abstract_icon_view_motion_notify_event (XfceIconView *view,
GdkEventMotion *event,
ThunarAbstractIconView *abstract_icon_view)
{
GdkRectangle area;
- _thunar_return_val_if_fail (EXO_IS_ICON_VIEW (view), FALSE);
+ _thunar_return_val_if_fail (XFCE_IS_ICON_VIEW (view), FALSE);
_thunar_return_val_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (abstract_icon_view), FALSE);
_thunar_return_val_if_fail (abstract_icon_view->priv->gesture_expose_id > 0, FALSE);
_thunar_return_val_if_fail (abstract_icon_view->priv->gesture_motion_id > 0, FALSE);
@@ -654,7 +654,7 @@ thunar_abstract_icon_view_motion_notify_event (ExoIconView *view,
static void
-thunar_abstract_icon_view_item_activated (ExoIconView *view,
+thunar_abstract_icon_view_item_activated (XfceIconView *view,
GtkTreePath *path,
ThunarAbstractIconView *abstract_icon_view)
{
diff --git a/thunar/thunar-action-manager.c b/thunar/thunar-action-manager.c
index e48e17d8213896093a6ddbf236fd2da551034038..f92ecbf97dad0d18b97bf4e8dfa95a3cfc9d249e 100644
--- a/thunar/thunar-action-manager.c
+++ b/thunar/thunar-action-manager.c
@@ -448,7 +448,7 @@ thunar_action_manager_class_init (ThunarActionManagerClass *klass)
"widget",
"widget",
GTK_TYPE_WIDGET,
- EXO_PARAM_WRITABLE);
+ G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS);
/**
* ThunarActionManager:select-device:
diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index 5575b222d791740b9a80e9b861407b7cb1f5d082..0de501fd1678233163fbec5adcbdcb3d847045f8 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -310,7 +310,7 @@ thunar_application_class_init (ThunarApplicationClass *klass)
"daemon",
"daemon",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-application.h b/thunar/thunar-application.h
index 8c7ba6dce1d0465f27691754f92f9d0da238edc7..e766e457e7459c5eb9834f953808e67d2f151a27 100644
--- a/thunar/thunar-application.h
+++ b/thunar/thunar-application.h
@@ -27,6 +27,8 @@
#include "thunar/thunar-thumbnail-cache.h"
#include "thunar/thunar-window.h"
+#include <gio/gio.h>
+
G_BEGIN_DECLS;
typedef struct _ThunarApplicationClass ThunarApplicationClass;
diff --git a/thunar/thunar-chooser-button.c b/thunar/thunar-chooser-button.c
index e8baf47e6ce68ed1db49000d16989d4e9080bb82..6b693f95d3bc11297c5d8e8b67be699c026c9a24 100644
--- a/thunar/thunar-chooser-button.c
+++ b/thunar/thunar-chooser-button.c
@@ -33,6 +33,8 @@
#include "thunar/thunar-pango-extensions.h"
#include "thunar/thunar-private.h"
+#include <libxfce4util/libxfce4util.h>
+
/* Property identifiers */
@@ -134,7 +136,7 @@ thunar_chooser_button_class_init (ThunarChooserButtonClass *klass)
PROP_FILE,
g_param_spec_object ("file", "file", "file",
THUNAR_TYPE_FILE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-chooser-dialog.c b/thunar/thunar-chooser-dialog.c
index fe6ffd533347af03446b5a96cb2f20566f875822..51f43aa87b143824760001a45d7abde23a4825f1 100644
--- a/thunar/thunar-chooser-dialog.c
+++ b/thunar/thunar-chooser-dialog.c
@@ -176,7 +176,7 @@ thunar_chooser_dialog_class_init (ThunarChooserDialogClass *klass)
PROP_FILE,
g_param_spec_object ("file", "file", "file",
THUNAR_TYPE_FILE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarChooserDialog::open:
@@ -187,7 +187,7 @@ thunar_chooser_dialog_class_init (ThunarChooserDialogClass *klass)
PROP_OPEN,
g_param_spec_boolean ("open", "open", "open",
FALSE,
- G_PARAM_CONSTRUCT | EXO_PARAM_READWRITE));
+ G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
@@ -254,7 +254,7 @@ thunar_chooser_dialog_init (ThunarChooserDialog *dialog)
/* append the tree view column */
column = g_object_new (GTK_TYPE_TREE_VIEW_COLUMN, "expand", TRUE, NULL);
- renderer = g_object_new (EXO_TYPE_CELL_RENDERER_ICON, "follow-state", FALSE, "size", 24, NULL);
+ renderer = g_object_new (XFCE_TYPE_CELL_RENDERER_ICON, "follow-state", FALSE, "size", 24, NULL);
gtk_tree_view_column_pack_start (column, renderer, FALSE);
gtk_tree_view_column_set_attributes (column, renderer,
"gicon", THUNAR_CHOOSER_MODEL_COLUMN_ICON,
diff --git a/thunar/thunar-chooser-model.c b/thunar/thunar-chooser-model.c
index b2cf063fd167807b05271160d1dce245f130eee8..98704df76ecfb05715c739a4e1e3817b564f9e29 100644
--- a/thunar/thunar-chooser-model.c
+++ b/thunar/thunar-chooser-model.c
@@ -34,6 +34,8 @@
#include "thunar/thunar-icon-factory.h"
#include "thunar/thunar-private.h"
+#include <libxfce4util/libxfce4util.h>
+
/* Property identifiers */
@@ -104,7 +106,7 @@ thunar_chooser_model_class_init (ThunarChooserModelClass *klass)
"content-type",
"content-type",
NULL,
- G_PARAM_CONSTRUCT_ONLY | EXO_PARAM_READWRITE));
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-clipboard-manager.c b/thunar/thunar-clipboard-manager.c
index 2a1fcde64adc124a272c00ecd6ebb5e4eddeaed5..9661e789709675e97039978c69c90c2ce65c2a36 100644
--- a/thunar/thunar-clipboard-manager.c
+++ b/thunar/thunar-clipboard-manager.c
@@ -165,7 +165,7 @@ thunar_clipboard_manager_class_init (ThunarClipboardManagerClass *klass)
PROP_CAN_PASTE,
g_param_spec_boolean ("can-paste", "can-paste", "can-paste",
FALSE,
- EXO_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* ThunarClipboardManager::changed:
diff --git a/thunar/thunar-column-editor.c b/thunar/thunar-column-editor.c
index 7d2798f3a35714e888f789890f3ba7b5b2cbe093..a1ba74c7e2df13b60469fdc48e62c7024ac24b27 100644
--- a/thunar/thunar-column-editor.c
+++ b/thunar/thunar-column-editor.c
@@ -29,7 +29,6 @@
#include "thunar/thunar-preferences.h"
#include "thunar/thunar-private.h"
-#include <exo/exo.h>
#include <libxfce4ui/libxfce4ui.h>
@@ -135,8 +134,8 @@ thunar_column_editor_init (ThunarColumnEditor *column_editor)
/* add the "Help" button */
button = gtk_button_new_with_mnemonic (_("_Help"));
g_signal_connect_swapped (G_OBJECT (button), "clicked", G_CALLBACK (thunar_column_editor_help_clicked), column_editor);
- gtk_box_pack_start (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (column_editor))), button, FALSE, FALSE, 0);
- gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (column_editor))), button, TRUE);
+ gtk_box_pack_start (GTK_BOX (xfce_gtk_dialog_get_action_area (GTK_DIALOG (column_editor))), button, FALSE, FALSE, 0);
+ gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (xfce_gtk_dialog_get_action_area (GTK_DIALOG (column_editor))), button, TRUE);
gtk_widget_show (button);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
diff --git a/thunar/thunar-column-model.h b/thunar/thunar-column-model.h
index bb544d5ae7a5b21b1d1f8a5009a9e66036ba8659..68921171b708f775a191055c5292a52a4f879c1f 100644
--- a/thunar/thunar-column-model.h
+++ b/thunar/thunar-column-model.h
@@ -22,6 +22,8 @@
#include "thunar/thunar-enum-types.h"
+#include <gtk/gtk.h>
+
G_BEGIN_DECLS;
typedef struct _ThunarColumnModelClass ThunarColumnModelClass;
diff --git a/thunar/thunar-compact-view.c b/thunar/thunar-compact-view.c
index 4cd6277b512f50051cf7caab3498d237385d5eb8..e847a75dc67fca0ab1d9f2d4851a587d7e31aa45 100644
--- a/thunar/thunar-compact-view.c
+++ b/thunar/thunar-compact-view.c
@@ -23,6 +23,8 @@
#include "thunar/thunar-compact-view.h"
+#include <libxfce4ui/libxfce4ui.h>
+
static AtkObject *
@@ -77,9 +79,9 @@ thunar_compact_view_init (ThunarCompactView *compact_view)
gboolean max_chars;
/* initialize the icon view properties */
- exo_icon_view_set_margin (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (compact_view))), 3);
- exo_icon_view_set_layout_mode (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (compact_view))), EXO_ICON_VIEW_LAYOUT_COLS);
- exo_icon_view_set_orientation (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (compact_view))), GTK_ORIENTATION_HORIZONTAL);
+ xfce_icon_view_set_margin (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (compact_view))), 3);
+ xfce_icon_view_set_layout_mode (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (compact_view))), XFCE_ICON_VIEW_LAYOUT_COLS);
+ xfce_icon_view_set_orientation (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (compact_view))), GTK_ORIENTATION_HORIZONTAL);
/* setup the icon renderer */
g_object_set (G_OBJECT (THUNAR_STANDARD_VIEW (compact_view)->icon_renderer),
diff --git a/thunar/thunar-component.c b/thunar/thunar-component.c
index 75b8a464648e2c2adcca757e8d77b40e8d5be4a6..1e235d521b8f35291030843e2b0a433f2bff6629 100644
--- a/thunar/thunar-component.c
+++ b/thunar/thunar-component.c
@@ -24,7 +24,7 @@
#include "thunar/thunar-component.h"
#include "thunar/thunar-private.h"
-#include <exo/exo.h>
+#include <libxfce4util/libxfce4util.h>
@@ -71,7 +71,7 @@ thunar_component_class_init (gpointer klass)
* The exact semantics of this property depend on the implementor
* of this interface. For example, #ThunarComponent<!---->s will update
* the property depending on the users selection with the
- * #GtkTreeComponent or #ExoIconComponent. While other components in a window,
+ * #GtkTreeComponent. While other components in a window,
* like the #ThunarShortcutsPane, will not update this property on
* their own, but rely on #ThunarWindow to synchronize the selected
* files list with the selected files list from the active #ThunarComponent.
@@ -85,7 +85,7 @@ thunar_component_class_init (gpointer klass)
"selected-files",
"selected-files",
THUNARX_TYPE_FILE_INFO_LIST,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-dbus-service.h b/thunar/thunar-dbus-service.h
index 1a54f429a38eede45040e8ef20ebc552d07a8296..ef29fa02f15c0f7b2cd8b614649ecea7b9e1b0ad 100644
--- a/thunar/thunar-dbus-service.h
+++ b/thunar/thunar-dbus-service.h
@@ -20,8 +20,6 @@
#ifndef __THUNAR_DBUS_SERVICE_H__
#define __THUNAR_DBUS_SERVICE_H__
-#include <exo/exo.h>
-
G_BEGIN_DECLS;
typedef struct _ThunarDBusServiceClass ThunarDBusServiceClass;
diff --git a/thunar/thunar-details-view.c b/thunar/thunar-details-view.c
index e0f3c0ab7b9f0f332277a4fd040ec4a4bc8c7499..6e9e6a2e6091ea65da146319b56d911645f3077a 100644
--- a/thunar/thunar-details-view.c
+++ b/thunar/thunar-details-view.c
@@ -194,7 +194,7 @@ struct _ThunarDetailsView
GtkCellRenderer *renderers[THUNAR_N_VISIBLE_COLUMNS];
- ExoTreeView *tree_view;
+ XfceTreeView *tree_view;
gboolean expandable_folders;
};
@@ -264,7 +264,7 @@ thunar_details_view_class_init (ThunarDetailsViewClass *klass)
"fixed-columns",
"fixed-columns",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarDetailsView:tree-view:
@@ -277,7 +277,7 @@ thunar_details_view_class_init (ThunarDetailsViewClass *klass)
"expandable-folders",
"expandable-folders",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
@@ -297,7 +297,7 @@ thunar_details_view_init (ThunarDetailsView *details_view)
g_signal_connect (G_OBJECT (details_view), "notify::zoom-level", G_CALLBACK (thunar_details_view_zoom_level_changed), NULL);
/* create the tree view to embed */
- details_view->tree_view = EXO_TREE_VIEW (exo_tree_view_new ());
+ details_view->tree_view = XFCE_TREE_VIEW (xfce_tree_view_new ());
g_signal_connect (G_OBJECT (details_view->tree_view), "notify::model",
G_CALLBACK (thunar_details_view_notify_model), details_view);
g_signal_connect (G_OBJECT (details_view->tree_view), "button-press-event",
@@ -1284,7 +1284,7 @@ thunar_details_view_select_cursor_row (GtkTreeView *tree_view,
* the "select-cursor-row" signal changes the selection to just the cursor row,
* which prevents multiple file selections being opened. Thus we bypass the gtk
* signal handler with g_signal_stop_emission_by_name, and emit the "open" action
- * directly. A better long-term solution would be to fix exo to avoid using the
+ * directly. A better long-term solution would be to fix libxfce4ui to avoid using the
* default gtk signal handler there.
*/
diff --git a/thunar/thunar-device-monitor.c b/thunar/thunar-device-monitor.c
index 8a84d5971dd905a238af6b01f71bad9393f7b7ac..d17540b02e7634304e5e8261071d7d497ff58c58 100644
--- a/thunar/thunar-device-monitor.c
+++ b/thunar/thunar-device-monitor.c
@@ -160,7 +160,7 @@ thunar_device_monitor_class_init (ThunarDeviceMonitorClass *klass)
NULL,
NULL,
G_TYPE_STRV,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
device_monitor_signals[DEVICE_ADDED] =
g_signal_new (I_ ("device-added"),
diff --git a/thunar/thunar-device.c b/thunar/thunar-device.c
index c9d175629c507daa6c83593a1510cae830d7cbaf..6af8facb006282136a6a99e4cd542bc6f45cab8a 100644
--- a/thunar/thunar-device.c
+++ b/thunar/thunar-device.c
@@ -27,6 +27,8 @@
#include "thunar/thunar-notify.h"
#include "thunar/thunar-private.h"
+#include <libxfce4util/libxfce4util.h>
+
typedef gboolean (*AsyncCallbackFinish) (GObject *object,
@@ -122,7 +124,7 @@ thunar_device_class_init (ThunarDeviceClass *klass)
"device",
"device",
G_TYPE_OBJECT,
- EXO_PARAM_READWRITE
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS
| G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (gobject_class,
@@ -131,7 +133,7 @@ thunar_device_class_init (ThunarDeviceClass *klass)
"hidden",
"hidden",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_KIND,
@@ -141,7 +143,7 @@ thunar_device_class_init (ThunarDeviceClass *klass)
THUNAR_DEVICE_KIND_VOLUME,
THUNAR_DEVICE_KIND_MOUNT_REMOTE,
THUNAR_DEVICE_KIND_VOLUME,
- EXO_PARAM_READWRITE
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS
| G_PARAM_CONSTRUCT_ONLY));
}
diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
index b0e4ff5b000cc9952801de4097c6610c79e5cec6..10c590636284e3a0a1f0f2c6fede4c81efecf202 100644
--- a/thunar/thunar-dialogs.c
+++ b/thunar/thunar-dialogs.c
@@ -1311,7 +1311,7 @@ thunar_dialog_ask_execute (const ThunarFile *file,
* @launcher : a #ThunarFile.
* @parent : a #GdkScreen, a #GtkWidget or %NULL. If %NULL is passed then the default screen will be used.
*
- * Calls the exo-desktop-item-edit command to edit the properties of a .desktop file.
+ * Calls the xfce-desktop-item-edit command to edit the properties of a .desktop file.
* A dialog with the current properties will appear.
**/
void
@@ -1330,7 +1330,7 @@ thunar_dialog_show_launcher_props (ThunarFile *launcher,
screen = thunar_util_parse_parent (parent, NULL);
uri = thunar_file_dup_uri (launcher);
display_name = gdk_display_get_name (gdk_screen_get_display (screen));
- cmd = g_strdup_printf ("exo-desktop-item-edit \"--display=%s\" \"%s\"", display_name, uri);
+ cmd = g_strdup_printf ("xfce-desktop-item-edit \"--display=%s\" \"%s\"", display_name, uri);
if (xfce_spawn_command_line (NULL, cmd, FALSE, FALSE, FALSE, &error) == FALSE)
thunar_dialogs_show_error (screen, error, _("Failed to edit launcher via command \"%s\""), cmd);
diff --git a/thunar/thunar-emblem-chooser.c b/thunar/thunar-emblem-chooser.c
index ccd0aae300bd7e56f96fad0bfc1d41da41ba1bba..5e278ffaee1c330d3db68e46300fdeb4809001f5 100644
--- a/thunar/thunar-emblem-chooser.c
+++ b/thunar/thunar-emblem-chooser.c
@@ -136,7 +136,7 @@ thunar_emblem_chooser_class_init (ThunarEmblemChooserClass *klass)
PROP_FILES,
g_param_spec_boxed ("files", "files", "files",
THUNARX_TYPE_FILE_INFO_LIST,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-enum-types.h b/thunar/thunar-enum-types.h
index 2916496ca0f007fdd233b16819773a7fa9c04eb6..84c5873b8f38d837704deeac2b99ab1050b4f235 100644
--- a/thunar/thunar-enum-types.h
+++ b/thunar/thunar-enum-types.h
@@ -21,7 +21,7 @@
#ifndef __THUNAR_ENUM_TYPES_H__
#define __THUNAR_ENUM_TYPES_H__
-#include <exo/exo.h>
+#include <glib-object.h>
G_BEGIN_DECLS;
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index c5b6de03edfa9415045036f074bb1031b5032731..f2708e7a658011436236f4adf213fff3e5766a33 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -1710,7 +1710,7 @@ thunar_file_execute (ThunarFile *file,
/* pass the URL to the webbrowser, this could be a bit strange,
* but then at least we are on the secure side */
argv = g_new (gchar *, 3);
- argv[0] = g_strdup ("exo-open");
+ argv[0] = g_strdup ("xfce-open");
argv[1] = url;
argv[2] = NULL;
}
@@ -1737,7 +1737,7 @@ thunar_file_execute (ThunarFile *file,
/* fake the Exec line */
escaped_location = g_shell_quote (location);
if (in_terminal)
- exec = g_strconcat ("exo-open --launch TerminalEmulator ", escaped_location, " %F", NULL);
+ exec = g_strconcat ("xfce-open --launch TerminalEmulator ", escaped_location, " %F", NULL);
else
exec = g_strconcat (escaped_location, " %F", NULL);
command = xfce_expand_desktop_entry_field_codes (exec, uri_list, NULL, NULL, NULL, FALSE);
@@ -1909,9 +1909,9 @@ thunar_file_launch (ThunarFile *file,
/* HACK: check if we're not trying to launch another file manager again, possibly
* ourselfs which will end in a loop */
- if (g_strcmp0 (g_app_info_get_id (app_info), "exo-file-manager.desktop") == 0
+ if (g_strcmp0 (g_app_info_get_id (app_info), "xfce-file-manager.desktop") == 0
|| g_strcmp0 (g_app_info_get_id (app_info), "thunar.desktop") == 0
- || g_strcmp0 (g_app_info_get_name (app_info), "exo-file-manager") == 0)
+ || g_strcmp0 (g_app_info_get_name (app_info), "xfce-file-manager") == 0)
{
g_object_unref (G_OBJECT (app_info));
thunar_show_chooser_dialog (parent, file, TRUE, FALSE);
diff --git a/thunar/thunar-folder.c b/thunar/thunar-folder.c
index 9e8982dd16e21b57776d976afd25da5c454beca8..f477d74fa80a5c05d73a770974e4a27587e91f37 100644
--- a/thunar/thunar-folder.c
+++ b/thunar/thunar-folder.c
@@ -28,6 +28,8 @@
#include "thunar/thunar-job.h"
#include "thunar/thunar-private.h"
+#include <libxfce4util/libxfce4util.h>
+
#define DEBUG_FILE_CHANGES FALSE
/* The maximum throttle interval (in ms) in which files will be added, removed or notified to be changed */
@@ -251,7 +253,7 @@ thunar_folder_class_init (ThunarFolderClass *klass)
"loading",
"loading",
FALSE,
- EXO_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* ThunarFolder::destroy:
* @folder : a #ThunarFolder.
diff --git a/thunar/thunar-gtk-extensions.c b/thunar/thunar-gtk-extensions.c
index 8b16db9b0f0609a2da9f2db172fd6df31d0b49c4..be410f8881b2dcd966210b75a157810592b30db0 100644
--- a/thunar/thunar-gtk-extensions.c
+++ b/thunar/thunar-gtk-extensions.c
@@ -30,7 +30,6 @@
#include "thunar/thunar-util.h"
#include "thunarx/thunarx.h"
-#include <exo/exo.h>
#include <libxfce4ui/libxfce4ui.h>
diff --git a/thunar/thunar-icon-factory.c b/thunar/thunar-icon-factory.c
index 5a5b785f3624435945f9c0482e1c0b270c483852..bb851dee9de12405f3cb2518a1ef8356ecba0310 100644
--- a/thunar/thunar-icon-factory.c
+++ b/thunar/thunar-icon-factory.c
@@ -36,6 +36,8 @@
#include "thunar/thunar-private.h"
#include "thunar/thunar-util.h"
+#include <libxfce4ui/libxfce4ui.h>
+
/* the timeout until the sweeper is run (in seconds) */
@@ -199,7 +201,7 @@ thunar_icon_factory_class_init (ThunarIconFactoryClass *klass)
"icon-theme",
"icon-theme",
GTK_TYPE_ICON_THEME,
- EXO_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* ThunarIconFactory:thumbnail-mode:
@@ -214,7 +216,7 @@ thunar_icon_factory_class_init (ThunarIconFactoryClass *klass)
"thumbnail-mode",
THUNAR_TYPE_THUMBNAIL_MODE,
THUNAR_THUMBNAIL_MODE_ONLY_LOCAL,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarIconFactory:thumbnail-draw-frames:
@@ -229,7 +231,7 @@ thunar_icon_factory_class_init (ThunarIconFactoryClass *klass)
"thumbnail-draw-frames",
"thumbnail-draw-frames",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarIconFactory:thumbnail-size:
@@ -243,7 +245,7 @@ thunar_icon_factory_class_init (ThunarIconFactoryClass *klass)
"thumbnail-size",
THUNAR_TYPE_THUMBNAIL_SIZE,
THUNAR_THUMBNAIL_SIZE_NORMAL,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarIconFactory:thumbnail-max-file-size:
@@ -256,7 +258,7 @@ thunar_icon_factory_class_init (ThunarIconFactoryClass *klass)
"thumbnail-max-file-size",
"thumbnail-max-file-size",
0, G_MAXUINT64, 0,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
@@ -571,7 +573,7 @@ thunar_icon_factory_load_from_file (ThunarIconFactory *factory,
if (G_LIKELY (width > max_width || height > max_height))
{
/* scale down to the required size */
- tmp = exo_gdk_pixbuf_scale_down (pixbuf, TRUE, MAX (1, max_height), MAX (1, max_height));
+ tmp = xfce_gdk_pixbuf_scale_down (pixbuf, TRUE, MAX (1, max_height), MAX (1, max_height));
g_object_unref (G_OBJECT (pixbuf));
pixbuf = tmp;
}
@@ -581,7 +583,7 @@ thunar_icon_factory_load_from_file (ThunarIconFactory *factory,
{
/* add a frame to the thumbnail */
frame = thunar_icon_factory_get_thumbnail_frame ();
- tmp = exo_gdk_pixbuf_frame (pixbuf, frame, 4, 3, 5, 6);
+ tmp = xfce_gdk_pixbuf_frame (pixbuf, frame, 4, 3, 5, 6);
g_object_unref (G_OBJECT (pixbuf));
pixbuf = tmp;
}
diff --git a/thunar/thunar-icon-renderer.c b/thunar/thunar-icon-renderer.c
index 2221682f5760dd1d5738374e88b5ce671a8c915b..9e4b09fc69dd64d2e8a59c201bd6811d4c9c6218 100644
--- a/thunar/thunar-icon-renderer.c
+++ b/thunar/thunar-icon-renderer.c
@@ -29,6 +29,8 @@
#include "thunar/thunar-private.h"
#include "thunar/thunar-util.h"
+#include <libxfce4ui/libxfce4ui.h>
+
enum
@@ -112,7 +114,7 @@ thunar_icon_renderer_class_init (ThunarIconRendererClass *klass)
"drop-file",
"drop-file",
THUNAR_TYPE_FILE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarIconRenderer:file:
@@ -123,7 +125,7 @@ thunar_icon_renderer_class_init (ThunarIconRendererClass *klass)
PROP_FILE,
g_param_spec_object ("file", "file", "file",
THUNAR_TYPE_FILE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarIconRenderer:emblems:
@@ -136,14 +138,14 @@ thunar_icon_renderer_class_init (ThunarIconRendererClass *klass)
"emblems",
"emblems",
TRUE,
- G_PARAM_CONSTRUCT | EXO_PARAM_READWRITE));
+ G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarIconRenderer:follow-state:
*
* Specifies whether the icon renderer should render icons
* based on the selection state of the items. This is necessary
- * for #ExoIconView, which doesn't draw any item state indicators
+ * for #XfceIconView, which doesn't draw any item state indicators
* itself.
**/
g_object_class_install_property (gobject_class,
@@ -152,7 +154,7 @@ thunar_icon_renderer_class_init (ThunarIconRendererClass *klass)
"follow-state",
"follow-state",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarIconRenderer:size:
@@ -165,7 +167,7 @@ thunar_icon_renderer_class_init (ThunarIconRendererClass *klass)
g_param_spec_enum ("size", "size", "size",
THUNAR_TYPE_ICON_SIZE,
THUNAR_ICON_SIZE_32,
- G_PARAM_CONSTRUCT | EXO_PARAM_READWRITE));
+ G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
@@ -178,7 +180,7 @@ thunar_icon_renderer_class_init (ThunarIconRendererClass *klass)
PROP_HIGHLIGHT_COLOR,
g_param_spec_string ("highlight-color", "highlight-color", "highlight-color",
NULL,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
@@ -192,7 +194,7 @@ thunar_icon_renderer_class_init (ThunarIconRendererClass *klass)
PROP_ROUNDED_CORNERS,
g_param_spec_boolean ("rounded-corners", "rounded-corners", "rounded-corners",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
@@ -205,7 +207,7 @@ thunar_icon_renderer_class_init (ThunarIconRendererClass *klass)
PROP_HIGHLIGHTING_ENABLED,
g_param_spec_boolean ("highlighting-enabled", "highlighting-enabled", "highlighting-enabled",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarIconRenderer:image-preview-enabled:
@@ -216,7 +218,7 @@ thunar_icon_renderer_class_init (ThunarIconRendererClass *klass)
PROP_IMAGE_PREVIEW_ENABLED,
g_param_spec_boolean ("image-preview-enabled", "image-preview-enabled", "image-preview-enabled",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarIconRenderer:use_symbolic_icons:
@@ -229,7 +231,7 @@ thunar_icon_renderer_class_init (ThunarIconRendererClass *klass)
"use-symbolic-icons",
"use-symbolic-icons",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
@@ -576,7 +578,7 @@ thunar_icon_renderer_render (GtkCellRenderer *renderer,
if (G_UNLIKELY (icon_area.width > cell_area->width || icon_area.height > cell_area->height))
{
/* scale down to fit */
- temp = exo_gdk_pixbuf_scale_down (icon, TRUE, MAX (1, cell_area->width * scale_factor), MAX (1, cell_area->height * scale_factor));
+ temp = xfce_gdk_pixbuf_scale_down (icon, TRUE, MAX (1, cell_area->width * scale_factor), MAX (1, cell_area->height * scale_factor));
g_object_unref (G_OBJECT (icon));
icon = temp;
@@ -660,7 +662,7 @@ thunar_icon_renderer_render (GtkCellRenderer *renderer,
if (G_UNLIKELY (MAX (emblem_area.width, emblem_area.height) > emblem_size))
{
/* scale down the emblem */
- temp = exo_gdk_pixbuf_scale_ratio (emblem, emblem_size * scale_factor);
+ temp = xfce_gdk_pixbuf_scale_ratio (emblem, emblem_size * scale_factor);
g_object_unref (G_OBJECT (emblem));
emblem = temp;
diff --git a/thunar/thunar-icon-view.c b/thunar/thunar-icon-view.c
index 218601800e30c99b3d1303357f67d2ae6e6082e1..2c9cc30d19815fc35a962f2ef0478af875d25da4 100644
--- a/thunar/thunar-icon-view.c
+++ b/thunar/thunar-icon-view.c
@@ -24,6 +24,8 @@
#include "thunar/thunar-icon-view.h"
#include "thunar/thunar-private.h"
+#include <libxfce4ui/libxfce4ui.h>
+
/* Property identifiers */
@@ -97,7 +99,7 @@ thunar_icon_view_class_init (ThunarIconViewClass *klass)
"text-beside-icons",
"text-beside-icons",
FALSE,
- EXO_PARAM_WRITABLE));
+ G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
}
@@ -138,7 +140,7 @@ thunar_icon_view_set_property (GObject *object,
case PROP_TEXT_BESIDE_ICONS:
if (G_UNLIKELY (g_value_get_boolean (value)))
{
- exo_icon_view_set_orientation (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))), GTK_ORIENTATION_HORIZONTAL);
+ xfce_icon_view_set_orientation (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))), GTK_ORIENTATION_HORIZONTAL);
g_object_set (G_OBJECT (standard_view->name_renderer), "wrap-width", 128, "yalign", 0.5f, "xalign", 0.0f, "alignment", PANGO_ALIGN_LEFT, NULL);
/* disconnect the "zoom-level" signal handler, since we're using a fixed wrap-width here */
@@ -149,7 +151,7 @@ thunar_icon_view_set_property (GObject *object,
}
else
{
- exo_icon_view_set_orientation (EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))), GTK_ORIENTATION_VERTICAL);
+ xfce_icon_view_set_orientation (XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view))), GTK_ORIENTATION_VERTICAL);
g_object_set (G_OBJECT (standard_view->name_renderer), "yalign", 0.0f, "xalign", 0.5f, "alignment", PANGO_ALIGN_CENTER, NULL);
/* connect the "zoom-level" signal handler as the wrap-width is now synced with the "zoom-level" */
@@ -204,25 +206,25 @@ static void
thunar_icon_view_set_consistent_horizontal_spacing (ThunarIconView *icon_view)
{
ThunarStandardView *standard_view = THUNAR_STANDARD_VIEW (icon_view);
- ExoIconView *exo_icon_view = EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view)));
+ XfceIconView *xfce_icon_view = XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view)));
gint wrap_width;
gint xpad;
gint column_spacing;
- if (exo_icon_view_get_orientation (exo_icon_view) == GTK_ORIENTATION_HORIZONTAL)
+ if (xfce_icon_view_get_orientation (xfce_icon_view) == GTK_ORIENTATION_HORIZONTAL)
{
/* reset consistent horizontal spacing if text is beside icon */
- exo_icon_view_set_item_width (exo_icon_view, -1);
+ xfce_icon_view_set_item_width (xfce_icon_view, -1);
return;
}
g_object_get (G_OBJECT (standard_view->name_renderer), "wrap-width", &wrap_width, NULL);
gtk_cell_renderer_get_padding (standard_view->name_renderer, &xpad, NULL);
- column_spacing = exo_icon_view_get_column_spacing (exo_icon_view);
+ column_spacing = xfce_icon_view_get_column_spacing (xfce_icon_view);
/* set consistent horizontal spacing */
- exo_icon_view_set_item_width (exo_icon_view, wrap_width + MAX (0, xpad * 2 - column_spacing));
+ xfce_icon_view_set_item_width (xfce_icon_view, wrap_width + MAX (0, xpad * 2 - column_spacing));
}
@@ -231,12 +233,12 @@ static void
thunar_icon_view_zoom_level_changed (ThunarStandardView *standard_view)
{
gint wrap_width;
- ExoIconView *exo_icon_view;
+ XfceIconView *xfce_icon_view;
ThunarZoomLevel zoom_level;
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
- exo_icon_view = EXO_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view)));
+ xfce_icon_view = XFCE_ICON_VIEW (gtk_bin_get_child (GTK_BIN (standard_view)));
zoom_level = thunar_view_get_zoom_level (THUNAR_VIEW (standard_view));
/* determine the "wrap-width" depending on the "zoom-level" */
@@ -271,5 +273,5 @@ thunar_icon_view_zoom_level_changed (ThunarStandardView *standard_view)
/* Like that rubber band selection can be done properly on high zoom levels */
/* Without margin adjustment it would be almost impossible to start the selection on the left */
- exo_icon_view_set_margin (exo_icon_view, thunar_zoom_level_to_view_margin (zoom_level));
+ xfce_icon_view_set_margin (xfce_icon_view, thunar_zoom_level_to_view_margin (zoom_level));
}
diff --git a/thunar/thunar-io-jobs-util.c b/thunar/thunar-io-jobs-util.c
index 1071a3ad0edaa332a7abc20fb4637e5c41680a40..ecfdf13fbe31ad1e22f23834bd5c750f9a4009b4 100644
--- a/thunar/thunar-io-jobs-util.c
+++ b/thunar/thunar-io-jobs-util.c
@@ -30,6 +30,7 @@
#include "thunar/thunar-util.h"
#include <gio/gio.h>
+#include <libxfce4util/libxfce4util.h>
diff --git a/thunar/thunar-io-scan-directory.c b/thunar/thunar-io-scan-directory.c
index 5f12145c92b31691f971776f7c066c6cb6101113..6c4544363a62241246801bb1a2e4f153888c664e 100644
--- a/thunar/thunar-io-scan-directory.c
+++ b/thunar/thunar-io-scan-directory.c
@@ -27,7 +27,6 @@
#include "thunar/thunar-job.h"
#include "thunar/thunar-private.h"
-#include <exo/exo.h>
#include <gio/gio.h>
diff --git a/thunar/thunar-io-scan-directory.h b/thunar/thunar-io-scan-directory.h
index 360381f36a4761d6d11ad5306930b0c8045beb78..4c898ccc5f0d9d37963a85474a428fd33fefe4ad 100644
--- a/thunar/thunar-io-scan-directory.h
+++ b/thunar/thunar-io-scan-directory.h
@@ -24,8 +24,6 @@
#include "thunar/thunar-job.h"
#include "thunar/thunar-private.h"
-#include <exo/exo.h>
-
G_BEGIN_DECLS
GList *
diff --git a/thunar/thunar-job-operation-history.c b/thunar/thunar-job-operation-history.c
index f554525aab1d25283c5f5a151debe46925d7705d..a623619e46aaf5ab410264a71bedbe6b36b6bd17 100644
--- a/thunar/thunar-job-operation-history.c
+++ b/thunar/thunar-job-operation-history.c
@@ -93,7 +93,7 @@ thunar_job_operation_history_class_init (ThunarJobOperationHistoryClass *klass)
"can-undo",
"can-undo",
FALSE,
- EXO_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_CAN_REDO,
@@ -101,7 +101,7 @@ thunar_job_operation_history_class_init (ThunarJobOperationHistoryClass *klass)
"can-redo",
"can-redo",
FALSE,
- EXO_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-job-operation-history.h b/thunar/thunar-job-operation-history.h
index df8c894f401e972cf0a86d301f768847dd23d8d7..98e506c278ae7f5896791c4523eb73549a277a15 100644
--- a/thunar/thunar-job-operation-history.h
+++ b/thunar/thunar-job-operation-history.h
@@ -21,7 +21,7 @@
#include "thunar-job-operation.h"
-#include <glib.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/thunar/thunar-job-operation.h b/thunar/thunar-job-operation.h
index 21b0690341bfb38169285507d0c96d4c528d1464..2e17d520696bf23b8f229ba14e10e9c7279ff526 100644
--- a/thunar/thunar-job-operation.h
+++ b/thunar/thunar-job-operation.h
@@ -21,7 +21,8 @@
#include "thunar/thunar-enum-types.h"
-#include <glib.h>
+#include <gio/gio.h>
+#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/thunar/thunar-location-button.c b/thunar/thunar-location-button.c
index 6ad045a5699a7924090b1644b8090d714416eb70..12e468f1a58ffa9fcd072bd976469878b5dca981 100644
--- a/thunar/thunar-location-button.c
+++ b/thunar/thunar-location-button.c
@@ -205,7 +205,7 @@ thunar_location_button_class_init (ThunarLocationButtonClass *klass)
"file",
"file",
THUNAR_TYPE_FILE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarLocationButton:max-width:
@@ -220,7 +220,7 @@ thunar_location_button_class_init (ThunarLocationButtonClass *klass)
"max-width",
-1, G_MAXINT,
-1,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarLocationButton::location-button-clicked:
diff --git a/thunar/thunar-navigator.c b/thunar/thunar-navigator.c
index 4503f41f20b967a7f039b50331900bf6aa557348..38ca8be7b8363a98b6038ccb206d24d79533c5f9 100644
--- a/thunar/thunar-navigator.c
+++ b/thunar/thunar-navigator.c
@@ -153,7 +153,7 @@ thunar_navigator_class_init (gpointer klass)
"current-directory",
"current-directory",
THUNAR_TYPE_FILE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-path-entry.c b/thunar/thunar-path-entry.c
index 2ec7e517ba30eb01c24e4c8be1e9b2e254345e95..f27da5661049d22e8b61c7d307c40ae67bd6db41 100644
--- a/thunar/thunar-path-entry.c
+++ b/thunar/thunar-path-entry.c
@@ -220,7 +220,7 @@ thunar_path_entry_class_init (ThunarPathEntryClass *klass)
"current-file",
"current-file",
THUNAR_TYPE_FILE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarPathEntry:icon-size:
@@ -231,7 +231,7 @@ thunar_path_entry_class_init (ThunarPathEntryClass *klass)
g_param_spec_int ("icon-size",
_("Icon size"),
_("The icon size for the path entry"),
- 1, G_MAXINT, 16, EXO_PARAM_READABLE));
+ 1, G_MAXINT, 16, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-permissions-chooser.c b/thunar/thunar-permissions-chooser.c
index e1a49550a016f271c991d286610191be12a5ebd4..19c7ade88ca484f5a136169fdda5b547aabca96d 100644
--- a/thunar/thunar-permissions-chooser.c
+++ b/thunar/thunar-permissions-chooser.c
@@ -44,7 +44,6 @@
#include "thunar/thunar-private.h"
#include "thunar/thunar-user.h"
-#include <exo/exo.h>
#include <libxfce4ui/libxfce4ui.h>
@@ -188,7 +187,7 @@ thunar_permissions_chooser_class_init (ThunarPermissionsChooserClass *klass)
PROP_FILES,
g_param_spec_boxed ("files", "files", "files",
THUNARX_TYPE_FILE_INFO_LIST,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarPermissionsChooser:mutable:
@@ -202,7 +201,7 @@ thunar_permissions_chooser_class_init (ThunarPermissionsChooserClass *klass)
"mutable",
"mutable",
FALSE,
- EXO_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-preferences-dialog.c b/thunar/thunar-preferences-dialog.c
index 5bb28ecc598796a350cb4846defb3e6a87014ee1..b8fec22a5d5bc1f7112bdebaa739f3f6dca462fb 100644
--- a/thunar/thunar-preferences-dialog.c
+++ b/thunar/thunar-preferences-dialog.c
@@ -271,10 +271,6 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_window_set_title (GTK_WINDOW (dialog), _("Thunar Preferences"));
-#if !LIBXFCE4UI_CHECK_VERSION(4, 19, 3)
- xfce_titled_dialog_create_action_area (XFCE_TITLED_DIALOG (dialog));
-#endif
-
/* add the "Close" button */
button = gtk_button_new_with_mnemonic (_("_Close"));
image = gtk_image_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_BUTTON);
diff --git a/thunar/thunar-preferences.c b/thunar/thunar-preferences.c
index bb800f1f95dea77d7f218473c367313401408ce1..2f8870720367cf2173495acd1797d3bc452b76e4 100644
--- a/thunar/thunar-preferences.c
+++ b/thunar/thunar-preferences.c
@@ -45,6 +45,10 @@
#include "thunar/thunar-private.h"
#include "xfconf/xfconf.h"
+#include <gtk/gtk.h>
+#include <libxfce4util/libxfce4util.h>
+
+
/* Property identifiers */
enum
@@ -222,7 +226,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"DefaultView",
NULL,
"void",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:hidden-bookmarks:
@@ -235,7 +239,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
NULL,
G_TYPE_STRV,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:hidden-devices:
@@ -249,7 +253,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
NULL,
G_TYPE_STRV,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-restore-tabs:
@@ -261,7 +265,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastRestoreTabs",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-tabs-left:
@@ -274,7 +278,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
NULL,
G_TYPE_STRV,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-tabs-right:
@@ -287,7 +291,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
NULL,
G_TYPE_STRV,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-focused-tab-left:
@@ -299,7 +303,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastFocusedTabLeft",
NULL,
0, G_MAXINT, 0,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-focused-tab-right:
@@ -311,7 +315,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastFocusedTabRight",
NULL,
0, G_MAXINT, 0,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-compact-view-zoom-level:
@@ -324,7 +328,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_ZOOM_LEVEL,
THUNAR_ZOOM_LEVEL_25_PERCENT,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
@@ -338,7 +342,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastDetailsViewColumnOrder",
NULL,
"THUNAR_COLUMN_NAME,THUNAR_COLUMN_SIZE,THUNAR_COLUMN_SIZE_IN_BYTES,THUNAR_COLUMN_TYPE,THUNAR_COLUMN_DATE_MODIFIED",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-details-view-column-widths:
@@ -351,7 +355,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastDetailsViewColumnWidths",
NULL,
"",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-details-view-fixed-columns:
@@ -364,7 +368,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastDetailsViewFixedColumns",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-details-view-visible-columns:
@@ -376,7 +380,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastDetailsViewVisibleColumns",
NULL,
"THUNAR_COLUMN_DATE_MODIFIED,THUNAR_COLUMN_NAME,THUNAR_COLUMN_SIZE,THUNAR_COLUMN_TYPE",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-details-view-zoom-level:
@@ -389,7 +393,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_ZOOM_LEVEL,
THUNAR_ZOOM_LEVEL_38_PERCENT,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-icon-view-zoom-level:
@@ -402,7 +406,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_ZOOM_LEVEL,
THUNAR_ZOOM_LEVEL_100_PERCENT,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-location-bar:
@@ -416,7 +420,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastLocationBar",
NULL,
"ThunarLocationEntry",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-menubar-visible:
@@ -428,7 +432,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastMenubarVisible",
NULL,
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-separator-position:
@@ -441,7 +445,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastSeparatorPosition",
NULL,
0, G_MAXINT, 170,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-splitview-separator-position:
@@ -454,7 +458,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastSplitviewSeparatorPosition",
NULL,
-1, G_MAXINT, -1,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-show-hidden:
@@ -466,7 +470,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastShowHidden",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-toolbar-visible-buttons:
@@ -482,7 +486,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastToolbarVisibleButtons",
NULL,
NULL,
- EXO_PARAM_READABLE);
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-toolbar-item-order:
@@ -496,7 +500,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastToolbarItemOrder",
NULL,
NULL,
- EXO_PARAM_READABLE);
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-directory-specific-settings:
@@ -508,7 +512,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscDirectorySpecificSettings",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-side-pane:
@@ -521,7 +525,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_SIDEPANE_TYPE,
THUNAR_SIDEPANE_TYPE_SHORTCUTS,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-sort-column:
@@ -534,7 +538,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_COLUMN,
THUNAR_COLUMN_NAME,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-sort-order:
@@ -547,7 +551,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
GTK_TYPE_SORT_TYPE,
GTK_SORT_ASCENDING,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-statusbar-visible:
*
@@ -558,7 +562,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastStatusbarVisible",
NULL,
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-image-preview-visible:
@@ -570,7 +574,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastImagePreviewVisible",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-view:
@@ -583,7 +587,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastView",
NULL,
"ThunarIconView",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-window-height:
@@ -596,7 +600,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastWindowHeight",
NULL,
1, G_MAXINT, 480,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-window-width:
@@ -609,7 +613,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastWindowWidth",
NULL,
1, G_MAXINT, 640,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-window-maximized:
@@ -622,7 +626,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastWindowMaximized",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-renamer-dialog-height:
@@ -635,7 +639,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastRenamerDialogHeight",
NULL,
1, G_MAXINT, 490,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-renamer-dialog-width:
@@ -648,7 +652,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastRenamerDialogWidth",
NULL,
1, G_MAXINT, 510,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-renamer-dialog-maximized:
@@ -661,7 +665,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"LastRenamerDialogMaximized",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:last-toolbar-items:
@@ -677,7 +681,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"undo:0,redo:0,zoom-out:0,zoom-in:0,zoom-reset:0,"
"view-as-icons:0,view-as-detailed-list:0,view-as-compact-list:0,view-switcher:0,"
"location-bar:1,reload:0,search:1",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-always-show-tabs:
@@ -689,7 +693,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-volume-management:
@@ -702,7 +706,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscVolumeManagement",
NULL,
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-case-sensitive:
@@ -714,7 +718,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscCaseSensitive",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-date-style:
@@ -727,7 +731,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_DATE_STYLE,
THUNAR_DATE_STYLE_SIMPLE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-date-custom-style:
@@ -739,7 +743,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscDateCustomStyle",
NULL,
"%Y-%m-%d %H:%M:%S",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-execute-shell-scripts-by-default:
@@ -756,7 +760,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_EXECUTE_SHELL_SCRIPT,
THUNAR_EXECUTE_SHELL_SCRIPT_NEVER,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-folders-first:
@@ -768,7 +772,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscFoldersFirst",
NULL,
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
@@ -781,7 +785,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscHiddenLast",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
@@ -795,7 +799,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_FOLDER_ITEM_COUNT,
THUNAR_FOLDER_ITEM_COUNT_NEVER,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-full-path-in-tab-title:
@@ -808,7 +812,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscFullPathInTabTitle",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-window-title-style:
@@ -822,7 +826,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_WINDOW_TITLE_STYLE,
THUNAR_WINDOW_TITLE_STYLE_FOLDER_NAME_WITH_THUNAR_SUFFIX,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-horizontal-wheel-navigates:
@@ -835,7 +839,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscHorizontalWheelNavigates",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-image-size-in-statusbar:
@@ -849,7 +853,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscImageSizeInStatusbar",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-middle-click-in-tab:
@@ -861,7 +865,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-open-new-window-as_tab:
@@ -874,7 +878,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscOpenNewWindowAsTab",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-recursive-permissions:
@@ -888,7 +892,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_RECURSIVE_PERMISSIONS,
THUNAR_RECURSIVE_PERMISSIONS_ASK,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-recursive-search:
@@ -901,7 +905,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_RECURSIVE_SEARCH,
THUNAR_RECURSIVE_SEARCH_ALWAYS,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-remember-geometry:
@@ -917,7 +921,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscRememberGeometry",
NULL,
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-show-about-templates:
@@ -930,7 +934,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscShowAboutTemplates",
NULL,
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-show-delete-action:
@@ -943,7 +947,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscShowDeleteAction",
NULL,
!thunar_g_vfs_is_uri_scheme_supported ("trash"),
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-single-click:
@@ -955,7 +959,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscSingleClick",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-single-click-timeout:
@@ -970,7 +974,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscSingleClickTimeout",
NULL,
0u, G_MAXUINT, 500u,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-small-toolbar-icons:
@@ -982,7 +986,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-tab-close-middle-click:
@@ -995,7 +999,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
NULL,
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-text-beside-icons:
@@ -1008,7 +1012,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscTextBesideIcons",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-thumbnail-mode:
@@ -1021,7 +1025,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_THUMBNAIL_MODE,
THUNAR_THUMBNAIL_MODE_ONLY_LOCAL,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-thumbnail-draw-frames:
@@ -1035,7 +1039,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-thumbnail-max-file-size:
@@ -1048,7 +1052,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
NULL,
0, G_MAXUINT64, 0,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-file-size-binary:
@@ -1060,7 +1064,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscFileSizeBinary",
NULL,
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-parallel-copy-mode:
@@ -1073,7 +1077,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_PARALLEL_COPY_MODE,
THUNAR_PARALLEL_COPY_MODE_ONLY_LOCAL_IDLE_DEVICE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-change-window-icon:
@@ -1085,7 +1089,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscChangeWindowIcon",
NULL,
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-transfer-use-partial:
@@ -1098,7 +1102,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_USE_PARTIAL_MODE,
THUNAR_USE_PARTIAL_MODE_DISABLED,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-transfer-verify-file:
@@ -1111,7 +1115,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_VERIFY_FILE_MODE,
THUNAR_VERIFY_FILE_MODE_DISABLED,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-image-preview-mode:
@@ -1125,7 +1129,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_IMAGE_PREVIEW_MODE,
THUNAR_IMAGE_PREVIEW_MODE_EMBEDDED,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-confirm-close-multiple-tabs:
@@ -1138,7 +1142,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"ConfirmCloseMultipleTabs",
NULL,
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-status-bar-active-info:
@@ -1152,7 +1156,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
0, G_MAXUINT,
THUNAR_STATUS_BAR_INFO_DISPLAY_NAME | THUNAR_STATUS_BAR_INFO_FILETYPE | THUNAR_STATUS_BAR_INFO_SIZE
| THUNAR_STATUS_BAR_INFO_SIZE_IN_BYTES,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:shortcuts-icon-emblems:
@@ -1165,7 +1169,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"ShortcutsIconEmblems",
NULL,
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:shortcuts-icon-size:
@@ -1179,7 +1183,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_ICON_SIZE,
THUNAR_ICON_SIZE_24,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:tree-icon-emblems:
@@ -1192,7 +1196,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"TreeIconEmblems",
NULL,
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:tree-icon-size:
@@ -1206,7 +1210,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
THUNAR_TYPE_ICON_SIZE,
THUNAR_ICON_SIZE_16,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-tree-lines-in-tree-sidepane:
@@ -1218,7 +1222,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"TreeLines",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-switch-to-new-tab:
@@ -1230,7 +1234,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"SwitchToNewTab",
NULL,
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
@@ -1245,7 +1249,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscVerticalSplitPane",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-open-new-windows-in-split-view:
@@ -1260,7 +1264,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscOpenNewWindowsInSplitView",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-always-enable-split-view:
@@ -1272,7 +1276,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscAlwaysEnableSplitView",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:compact-view-max-chars:
@@ -1285,7 +1289,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
G_MININT, G_MAXINT,
100,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-highlighting-enabled:
@@ -1298,7 +1302,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscHighlightingEnabled",
NULL,
thunar_g_vfs_metadata_is_supported (),
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-undo-redo-history-size:
@@ -1312,7 +1316,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
-1, G_MAXINT,
10,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-confirm-move-to-trash:
@@ -1324,7 +1328,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscConfirmMoveToTrash",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-max-number-of-templates:
@@ -1338,7 +1342,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
NULL,
0, G_MAXUINT,
100,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-expandable-folders:
@@ -1350,7 +1354,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscEnableExpandableFolders",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-display-launcher-name-as-filename:
@@ -1362,7 +1366,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscDisplayLauncherNameAsFilename",
NULL,
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-symbolic-icons-in-toolbar:
@@ -1374,7 +1378,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscSymbolicIconsInToolbar",
NULL,
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-symbolic-icons-in-sidepane:
@@ -1386,7 +1390,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscSymbolicIconsInSidepane",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-ctrl-scroll-wheel-to-zoom:
@@ -1398,7 +1402,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscCtrlScrollWheelToZoom",
NULL,
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarPreferences:misc-use-csd:
@@ -1410,7 +1414,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
"MiscUseCSD",
NULL,
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/* install all properties */
g_object_class_install_properties (gobject_class, N_PROPERTIES, preferences_props);
diff --git a/thunar/thunar-progress-view.c b/thunar/thunar-progress-view.c
index 070619ee8f804a6a0b5116ed3827df2e0d6d9806..552af221d0b32f5d571f7e26bd9079d383d6c5d5 100644
--- a/thunar/thunar-progress-view.c
+++ b/thunar/thunar-progress-view.c
@@ -31,7 +31,6 @@
#include "thunar/thunar-transfer-job.h"
#include "thunar/thunar-util.h"
-#include <exo/exo.h>
#include <libxfce4ui/libxfce4ui.h>
@@ -153,7 +152,7 @@ thunar_progress_view_class_init (ThunarProgressViewClass *klass)
PROP_JOB,
g_param_spec_object ("job", "job", "job",
THUNAR_TYPE_JOB,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_ICON_NAME,
@@ -161,7 +160,7 @@ thunar_progress_view_class_init (ThunarProgressViewClass *klass)
"icon-name",
"icon-name",
NULL,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_TITLE,
@@ -169,7 +168,7 @@ thunar_progress_view_class_init (ThunarProgressViewClass *klass)
"title",
"title",
NULL,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_signal_new ("need-attention",
THUNAR_TYPE_PROGRESS_VIEW,
diff --git a/thunar/thunar-properties-dialog.c b/thunar/thunar-properties-dialog.c
index 7f3536c1e9df5eb7666fba0dbb36c1ab49d14294..387e12714a22cdcf34a0423100e7cead753936c5 100644
--- a/thunar/thunar-properties-dialog.c
+++ b/thunar/thunar-properties-dialog.c
@@ -52,7 +52,6 @@
#include "thunar/thunar-size-label.h"
#include "thunar/thunar-util.h"
-#include <exo/exo.h>
#include <gdk/gdkkeysyms.h>
#include <libxfce4ui/libxfce4ui.h>
#include <libxfce4util/libxfce4util.h>
@@ -247,7 +246,7 @@ thunar_properties_dialog_class_init (ThunarPropertiesDialogClass *klass)
PROP_FILES,
g_param_spec_boxed ("files", "files", "files",
THUNARX_TYPE_FILE_INFO_LIST,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarPropertiesDialog:file_size_binary:
@@ -260,7 +259,7 @@ thunar_properties_dialog_class_init (ThunarPropertiesDialogClass *klass)
"FileSizeBinary",
NULL,
TRUE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarPropertiesDialog:show_file_highlight_tab:
@@ -273,7 +272,7 @@ thunar_properties_dialog_class_init (ThunarPropertiesDialogClass *klass)
"ShowFileHighlightTab",
NULL,
TRUE,
- EXO_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT));
/**
* ThunarPropertiesDialog::reload:
@@ -1207,23 +1206,23 @@ thunar_properties_dialog_icon_button_clicked (GtkWidget *button,
title = g_strdup_printf (_("Select an Icon for \"%s\" (%s)"), thunar_file_get_display_name (file), thunar_file_get_basename (file));
else
title = g_strdup_printf (_("Select an Icon for \"%s\""), thunar_file_get_display_name (file));
- chooser = exo_icon_chooser_dialog_new (title, GTK_WINDOW (dialog),
- _("_Cancel"), GTK_RESPONSE_CANCEL,
- _("_OK"), GTK_RESPONSE_ACCEPT,
- NULL);
+ chooser = xfce_icon_chooser_dialog_new (title, GTK_WINDOW (dialog),
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_ACCEPT,
+ NULL);
gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT);
g_free (title);
/* use the custom_icon of the file as default */
custom_icon = thunar_file_get_custom_icon (file);
if (G_LIKELY (custom_icon != NULL && *custom_icon != '\0'))
- exo_icon_chooser_dialog_set_icon (EXO_ICON_CHOOSER_DIALOG (chooser), custom_icon);
+ xfce_icon_chooser_dialog_set_icon (XFCE_ICON_CHOOSER_DIALOG (chooser), custom_icon);
/* run the icon chooser dialog and make sure the dialog still has a file */
if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_ACCEPT && file != NULL)
{
/* determine the selected icon and use it for the file */
- icon = exo_icon_chooser_dialog_get_icon (EXO_ICON_CHOOSER_DIALOG (chooser));
+ icon = xfce_icon_chooser_dialog_get_icon (XFCE_ICON_CHOOSER_DIALOG (chooser));
if (!thunar_file_set_custom_icon (file, icon, &err))
{
/* hide the icon chooser dialog first */
diff --git a/thunar/thunar-renamer-dialog.c b/thunar/thunar-renamer-dialog.c
index 7cd2367fd686ccc3a962132ff56ff3b12759738c..aafa68e6192ae9323a2255964cae8b32a92ca21e 100644
--- a/thunar/thunar-renamer-dialog.c
+++ b/thunar/thunar-renamer-dialog.c
@@ -292,7 +292,7 @@ thunar_renamer_dialog_class_init (ThunarRenamerDialogClass *klass)
"current-directory",
"current-directory",
THUNAR_TYPE_FILE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarRenamerDialog:selected-files:
@@ -306,7 +306,7 @@ thunar_renamer_dialog_class_init (ThunarRenamerDialogClass *klass)
"selected-files",
"selected-files",
THUNARX_TYPE_FILE_INFO_LIST,
- EXO_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* ThunarRenamerDialog:standalone:
@@ -324,7 +324,7 @@ thunar_renamer_dialog_class_init (ThunarRenamerDialogClass *klass)
"standalone",
"standalone",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-renamer-model.c b/thunar/thunar-renamer-model.c
index d74e45808aa79e19ca9ff05edcc1df8d2e19bea5..b6324a063c4398527beaca7bca37615fc24f4a17 100644
--- a/thunar/thunar-renamer-model.c
+++ b/thunar/thunar-renamer-model.c
@@ -231,7 +231,7 @@ thunar_renamer_model_class_init (ThunarRenamerModelClass *klass)
"can-rename",
"can-rename",
FALSE,
- EXO_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* ThunarRenamerModel:frozen:
@@ -246,7 +246,7 @@ thunar_renamer_model_class_init (ThunarRenamerModelClass *klass)
"frozen",
"frozen",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarRenamerModel:mode:
@@ -259,7 +259,7 @@ thunar_renamer_model_class_init (ThunarRenamerModelClass *klass)
g_param_spec_enum ("mode", "mode", "mode",
THUNAR_TYPE_RENAMER_MODE,
THUNAR_RENAMER_MODE_NAME,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarRenamerModel:renamer:
@@ -273,7 +273,7 @@ thunar_renamer_model_class_init (ThunarRenamerModelClass *klass)
"renamer",
"renamer",
THUNARX_TYPE_RENAMER,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-renamer-progress.c b/thunar/thunar-renamer-progress.c
index e1812ffbc36b3351d7e301702211c7b757b51b55..1c4da319d68d8ebdd3d1dd86c41c29f343acac90 100644
--- a/thunar/thunar-renamer-progress.c
+++ b/thunar/thunar-renamer-progress.c
@@ -25,6 +25,8 @@
#include "thunar/thunar-renamer-progress.h"
#include "thunar/thunar-util.h"
+#include <libxfce4util/libxfce4util.h>
+
/* Signal identifiers */
diff --git a/thunar/thunar-sendto-model.c b/thunar/thunar-sendto-model.c
index 5b61ecc1f8a22ac2827803dd18159d9a192e7dd4..5e17530b5a33dabe13d8d335c93653197e77ea08 100644
--- a/thunar/thunar-sendto-model.c
+++ b/thunar/thunar-sendto-model.c
@@ -36,6 +36,8 @@
#include "thunar/thunar-private.h"
#include "thunar/thunar-sendto-model.h"
+#include <libxfce4util/libxfce4util.h>
+
static void
diff --git a/thunar/thunar-shortcuts-icon-renderer.c b/thunar/thunar-shortcuts-icon-renderer.c
index ac32a25cec81ad8fee66b35848aa35060cae9266..02b737eb6afb49e76ce2b65d0ac8bdaf57895e9f 100644
--- a/thunar/thunar-shortcuts-icon-renderer.c
+++ b/thunar/thunar-shortcuts-icon-renderer.c
@@ -30,6 +30,7 @@
#include "thunar/thunar-shortcuts-icon-renderer.h"
#include <gio/gio.h>
+#include <libxfce4ui/libxfce4ui.h>
@@ -108,7 +109,7 @@ thunar_shortcuts_icon_renderer_class_init (ThunarShortcutsIconRendererClass *kla
PROP_DEVICE,
g_param_spec_object ("device", "device", "device",
THUNAR_TYPE_DEVICE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarIconRenderer:gicon:
@@ -120,7 +121,7 @@ thunar_shortcuts_icon_renderer_class_init (ThunarShortcutsIconRendererClass *kla
PROP_GICON,
g_param_spec_object ("gicon", "gicon", "gicon",
G_TYPE_ICON,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
@@ -283,7 +284,7 @@ thunar_shortcuts_icon_renderer_render (GtkCellRenderer *renderer,
if (G_UNLIKELY (icon_area.width > cell_area->width || icon_area.height > cell_area->height))
{
/* scale down to fit */
- temp = exo_gdk_pixbuf_scale_down (icon, TRUE, MAX (1, cell_area->width * scale_factor), MAX (1, cell_area->height * scale_factor));
+ temp = xfce_gdk_pixbuf_scale_down (icon, TRUE, MAX (1, cell_area->width * scale_factor), MAX (1, cell_area->height * scale_factor));
g_object_unref (G_OBJECT (icon));
icon = temp;
diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c
index 336ca21ff2bfd718a93594e8da72add99592a7b9..c6befa8a271099b4b9efad8b54dc7deb443cd4e8 100644
--- a/thunar/thunar-shortcuts-model.c
+++ b/thunar/thunar-shortcuts-model.c
@@ -45,6 +45,7 @@
#include <glib.h>
#include <glib/gstdio.h>
+#include <libxfce4util/libxfce4util.h>
#define SPINNER_CYCLE_DURATION 1000
#define SPINNER_NUM_STEPS 12
@@ -262,7 +263,7 @@ thunar_shortcuts_model_class_init (ThunarShortcutsModelClass *klass)
NULL,
NULL,
G_TYPE_STRV,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarPropertiesDialog:file_size_binary:
@@ -275,7 +276,7 @@ thunar_shortcuts_model_class_init (ThunarShortcutsModelClass *klass)
"FileSizeBinary",
NULL,
TRUE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-side-pane.c b/thunar/thunar-side-pane.c
index d36cf17e63d157e796905a91511f9b39dead6098..45b87825e3aa193f3049a551cc8d3b2080c08048 100644
--- a/thunar/thunar-side-pane.c
+++ b/thunar/thunar-side-pane.c
@@ -74,7 +74,7 @@ thunar_side_pane_class_init (gpointer klass)
"show-hidden",
"show-hidden",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-simple-job.c b/thunar/thunar-simple-job.c
index a5ee70cb193adc3bbfbb4dc8105aadbfa2ff326f..03d7b20c61c15261e73d6eba595b7d4b21b215da 100644
--- a/thunar/thunar-simple-job.c
+++ b/thunar/thunar-simple-job.c
@@ -72,13 +72,13 @@ static void
thunar_simple_job_class_init (ThunarSimpleJobClass *klass)
{
GObjectClass *gobject_class;
- ThunarJobClass *exojob_class;
+ ThunarJobClass *xfcejob_class;
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = thunar_simple_job_finalize;
- exojob_class = THUNAR_JOB_CLASS (klass);
- exojob_class->execute = thunar_simple_job_execute;
+ xfcejob_class = THUNAR_JOB_CLASS (klass);
+ xfcejob_class->execute = thunar_simple_job_execute;
}
diff --git a/thunar/thunar-size-label.c b/thunar/thunar-size-label.c
index 69ef436d08928b09588c8bdcb53129c2d3805e01..5019aca636c047c8e91a2bee74d6c39671f9e4ac 100644
--- a/thunar/thunar-size-label.c
+++ b/thunar/thunar-size-label.c
@@ -36,6 +36,8 @@
#include "thunar/thunar-private.h"
#include "thunar/thunar-size-label.h"
+#include <libxfce4util/libxfce4util.h>
+
/* Property identifiers */
@@ -152,7 +154,7 @@ thunar_size_label_class_init (ThunarSizeLabelClass *klass)
PROP_FILES,
g_param_spec_boxed ("files", "files", "files",
THUNARX_TYPE_FILE_INFO_LIST,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarPropertiesDialog:file_size_binary:
@@ -165,7 +167,7 @@ thunar_size_label_class_init (ThunarSizeLabelClass *klass)
"FileSizeBinary",
NULL,
TRUE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-standard-view-model.c b/thunar/thunar-standard-view-model.c
index ce3d3ef9ad975589bcc4bea6f58e3198f6817473..f08d971945447366ec1b620b2fa1fa338aa39e23 100644
--- a/thunar/thunar-standard-view-model.c
+++ b/thunar/thunar-standard-view-model.c
@@ -27,6 +27,8 @@
#include "thunar/thunar-standard-view-model.h"
#include "thunar/thunar-util.h"
+#include <libxfce4util/libxfce4util.h>
+
static void
thunar_standard_view_model_class_init (gpointer klass);
@@ -83,7 +85,7 @@ thunar_standard_view_model_class_init (gpointer klass)
"case-sensitive",
"case-sensitive",
TRUE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarStandardViewModel:date-style:
@@ -96,7 +98,7 @@ thunar_standard_view_model_class_init (gpointer klass)
"date-style",
THUNAR_TYPE_DATE_STYLE,
THUNAR_DATE_STYLE_SIMPLE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarStandardViewModel:date-custom-style:
@@ -108,7 +110,7 @@ thunar_standard_view_model_class_init (gpointer klass)
"DateCustomStyle",
NULL,
"%Y-%m-%d %H:%M:%S",
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarStandardViewModel:folder:
@@ -120,7 +122,7 @@ thunar_standard_view_model_class_init (gpointer klass)
"folder",
"folder",
THUNAR_TYPE_FOLDER,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarStandardViewModel::folders-first:
@@ -132,7 +134,7 @@ thunar_standard_view_model_class_init (gpointer klass)
"folders-first",
"folders-first",
TRUE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarStandardViewModel::hidden-last:
*
@@ -143,7 +145,7 @@ thunar_standard_view_model_class_init (gpointer klass)
"hidden-last",
"hidden-last",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarStandardViewModel::num-files:
@@ -155,7 +157,7 @@ thunar_standard_view_model_class_init (gpointer klass)
"num-files",
"num-files",
0, G_MAXUINT, 0,
- EXO_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* ThunarStandardViewModel::show-hidden:
@@ -167,7 +169,7 @@ thunar_standard_view_model_class_init (gpointer klass)
"show-hidden",
"show-hidden",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarStandardViewModel::misc-file-size-binary:
@@ -179,7 +181,7 @@ thunar_standard_view_model_class_init (gpointer klass)
"file-size-binary",
"file-size-binary",
TRUE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarStandardViewModel:folder-item-count:
@@ -192,7 +194,7 @@ thunar_standard_view_model_class_init (gpointer klass)
"folder-item-count",
THUNAR_TYPE_FOLDER_ITEM_COUNT,
TRUE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarStandardViewModel:loading:
@@ -204,7 +206,7 @@ thunar_standard_view_model_class_init (gpointer klass)
"loading",
"loading",
FALSE,
- EXO_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* ThunarStandardViewModel::error:
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index d2059fe3544f737794340207c480611e0a75e214..ce4d04630f0a42b8b587a06bb131749d6049110a 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -672,7 +672,7 @@ thunar_standard_view_class_init (ThunarStandardViewClass *klass)
"loading",
"loading",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarStandardView:searching:
@@ -686,7 +686,7 @@ thunar_standard_view_class_init (ThunarStandardViewClass *klass)
"searching",
"searching",
FALSE,
- EXO_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* ThunarStandardView:search-mode-active:
@@ -699,7 +699,7 @@ thunar_standard_view_class_init (ThunarStandardViewClass *klass)
"search-mode-active",
"search-mode-active",
FALSE,
- EXO_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* ThunarStandardView:display-name:
@@ -711,7 +711,7 @@ thunar_standard_view_class_init (ThunarStandardViewClass *klass)
"display-name",
"display-name",
NULL,
- EXO_PARAM_READABLE);
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
/**
* ThunarStandardView:full-parsed-path
@@ -723,7 +723,7 @@ thunar_standard_view_class_init (ThunarStandardViewClass *klass)
"full-parsed-path",
"full-parsed-path",
NULL,
- EXO_PARAM_READABLE);
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
/**
* ThunarStandardView:directory-specific-settings:
@@ -735,7 +735,7 @@ thunar_standard_view_class_init (ThunarStandardViewClass *klass)
"directory-specific-settings",
"directory-specific-settings",
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarStandardView:thumbnail-draw-frames:
@@ -749,7 +749,7 @@ thunar_standard_view_class_init (ThunarStandardViewClass *klass)
"thumbnail-draw-frames",
"thumbnail-draw-frames",
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarStandardView:sort-column:
@@ -762,7 +762,7 @@ thunar_standard_view_class_init (ThunarStandardViewClass *klass)
NULL,
THUNAR_TYPE_COLUMN,
THUNAR_COLUMN_NAME,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarStandardView:sort-column-default:
@@ -776,7 +776,7 @@ thunar_standard_view_class_init (ThunarStandardViewClass *klass)
NULL,
THUNAR_TYPE_COLUMN,
THUNAR_COLUMN_NAME,
- EXO_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
+ G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
/**
* ThunarStandardView:sort-order:
@@ -789,7 +789,7 @@ thunar_standard_view_class_init (ThunarStandardViewClass *klass)
NULL,
GTK_TYPE_SORT_TYPE,
GTK_SORT_ASCENDING,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* ThunarStandardView:sort-order-default:
@@ -803,7 +803,7 @@ thunar_standard_view_class_init (ThunarStandardViewClass *klass)
NULL,
GTK_TYPE_SORT_TYPE,
GTK_SORT_ASCENDING,
- EXO_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
+ G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
/**
* ThunarStandardView:model-type:
@@ -816,7 +816,7 @@ thunar_standard_view_class_init (ThunarStandardViewClass *klass)
"ModelType",
NULL,
G_TYPE_NONE,
- EXO_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
/* override ThunarComponent's properties */
g_iface = g_type_default_interface_peek (THUNAR_TYPE_COMPONENT);
@@ -858,7 +858,7 @@ thunar_standard_view_class_init (ThunarStandardViewClass *klass)
"statusbar-text",
"statusbar-text",
NULL,
- EXO_PARAM_READABLE);
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
/* install all properties */
@@ -3318,7 +3318,7 @@ thunar_standard_view_receive_netscape_url (GtkWidget *view,
if (G_LIKELY (working_directory != NULL))
{
/* prepare the basic part of the command */
- argv[n++] = "exo-desktop-item-edit";
+ argv[n++] = "xfce-desktop-item-edit";
argv[n++] = "--type=Link";
argv[n++] = "--url";
argv[n++] = bits[0];
@@ -3350,7 +3350,7 @@ thunar_standard_view_receive_netscape_url (GtkWidget *view,
if (screen != NULL)
display = g_strdup (gdk_display_get_name (gdk_screen_get_display (screen)));
- /* try to run exo-desktop-item-edit */
+ /* try to run xfce-desktop-item-edit */
succeed = g_spawn_async (working_directory, argv, NULL,
G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH,
thunar_setup_display_cb, display, &pid, &error);
@@ -3770,7 +3770,7 @@ thunar_standard_view_drag_data_delete (GtkWidget *view,
GdkDragContext *context,
ThunarStandardView *standard_view)
{
- /* make sure the default handler of ExoIconView/GtkTreeView is never run */
+ /* make sure the default handler of XfceIconView/GtkTreeView is never run */
g_signal_stop_emission_by_name (G_OBJECT (view), "drag-data-delete");
}
diff --git a/thunar/thunar-statusbar.c b/thunar/thunar-statusbar.c
index d7c2dafd91b5412a0dd37c2ab662500e60d664fb..eeb20f7daabb1a2f55e148a8d8672842b636ca76 100644
--- a/thunar/thunar-statusbar.c
+++ b/thunar/thunar-statusbar.c
@@ -31,7 +31,6 @@
#include "thunar/thunar-statusbar.h"
#include "thunar/thunar-window.h"
-#include <exo/exo.h>
#include <libxfce4ui/libxfce4ui.h>
@@ -131,7 +130,7 @@ thunar_statusbar_class_init (ThunarStatusbarClass *klass)
"text",
"text",
NULL,
- EXO_PARAM_WRITABLE));
+ G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
if (!style_initialized)
{
diff --git a/thunar/thunar-text-renderer.c b/thunar/thunar-text-renderer.c
index 3a9d43b3efe7b265cbb285a408cbe56a0212ea50..a6aea54dd14eebee5674bb4c0d97c12f572f9781 100644
--- a/thunar/thunar-text-renderer.c
+++ b/thunar/thunar-text-renderer.c
@@ -108,7 +108,7 @@ thunar_text_renderer_class_init (ThunarTextRendererClass *klass)
PROP_HIGHLIGHT_COLOR,
g_param_spec_string ("highlight-color", "highlight-color", "highlight-color",
NULL,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
@@ -122,7 +122,7 @@ thunar_text_renderer_class_init (ThunarTextRendererClass *klass)
PROP_ROUNDED_CORNERS,
g_param_spec_boolean ("rounded-corners", "rounded-corners", "rounded-corners",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
@@ -135,7 +135,7 @@ thunar_text_renderer_class_init (ThunarTextRendererClass *klass)
PROP_HIGHLIGHTING_ENABLED,
g_param_spec_boolean ("highlighting-enabled", "highlighting-enabled", "highlighting-enabled",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-text-renderer.h b/thunar/thunar-text-renderer.h
index 1d4b75a7289156e697a5d6b5dcf52681cfdd54ef..e5de0f93210676109bcaaa17f2b8ae8b5576d129 100644
--- a/thunar/thunar-text-renderer.h
+++ b/thunar/thunar-text-renderer.h
@@ -22,6 +22,8 @@
#include "thunar/thunar-enum-types.h"
+#include <gtk/gtk.h>
+
G_BEGIN_DECLS;
typedef struct _ThunarTextRendererClass ThunarTextRendererClass;
diff --git a/thunar/thunar-thumbnailer.c b/thunar/thunar-thumbnailer.c
index 1e43285174e40b9a5b7537d4ff2ba1fbd120164e..3e77aedca8d39695b014fe7637aedcbeaeab07dc 100644
--- a/thunar/thunar-thumbnailer.c
+++ b/thunar/thunar-thumbnailer.c
@@ -268,7 +268,7 @@ thunar_thumbnailer_class_init (ThunarThumbnailerClass *klass)
"thumbnail-size",
THUNAR_TYPE_THUMBNAIL_SIZE,
THUNAR_THUMBNAIL_SIZE_NORMAL,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarThumbnailer:thumbnail-max-file-size:
@@ -281,7 +281,7 @@ thunar_thumbnailer_class_init (ThunarThumbnailerClass *klass)
"thumbnail-max-file-size",
"thumbnail-max-file-size",
0, G_MAXUINT64, 0,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-toolbar-editor.c b/thunar/thunar-toolbar-editor.c
index da79f363b40bd20d6dcee8c54fdf7daf122d5922..c163ff94adba75973225f5e183334b0f36de9d32 100644
--- a/thunar/thunar-toolbar-editor.c
+++ b/thunar/thunar-toolbar-editor.c
@@ -30,7 +30,6 @@
#include "thunar/thunar-private.h"
#include "thunar/thunar-toolbar-editor.h"
-#include <exo/exo.h>
#include <libxfce4ui/libxfce4ui.h>
@@ -154,8 +153,8 @@ thunar_toolbar_editor_init (ThunarToolbarEditor *toolbar_editor)
/* add the "Help" button */
button = gtk_button_new_with_mnemonic (_("_Help"));
g_signal_connect_swapped (G_OBJECT (button), "clicked", G_CALLBACK (thunar_toolbar_editor_help_clicked), toolbar_editor);
- gtk_box_pack_start (GTK_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (toolbar_editor))), button, FALSE, FALSE, 0);
- gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (exo_gtk_dialog_get_action_area (GTK_DIALOG (toolbar_editor))), button, TRUE);
+ gtk_box_pack_start (GTK_BOX (xfce_gtk_dialog_get_action_area (GTK_DIALOG (toolbar_editor))), button, FALSE, FALSE, 0);
+ gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (xfce_gtk_dialog_get_action_area (GTK_DIALOG (toolbar_editor))), button, TRUE);
gtk_widget_show (button);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
diff --git a/thunar/thunar-transfer-job.c b/thunar/thunar-transfer-job.c
index 6737be90ecd20d25bfc47b699db23987dd29c1dc..7b0f49db1143dd34a671c8a607cdf34cf87e0f8f 100644
--- a/thunar/thunar-transfer-job.c
+++ b/thunar/thunar-transfer-job.c
@@ -133,15 +133,15 @@ static void
thunar_transfer_job_class_init (ThunarTransferJobClass *klass)
{
GObjectClass *gobject_class;
- ThunarJobClass *exojob_class;
+ ThunarJobClass *xfcejob_class;
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = thunar_transfer_job_finalize;
gobject_class->get_property = thunar_transfer_job_get_property;
gobject_class->set_property = thunar_transfer_job_set_property;
- exojob_class = THUNAR_JOB_CLASS (klass);
- exojob_class->execute = thunar_transfer_job_execute;
+ xfcejob_class = THUNAR_JOB_CLASS (klass);
+ xfcejob_class->execute = thunar_transfer_job_execute;
/**
* ThunarPropertiesDialog:file_size_binary:
@@ -154,7 +154,7 @@ thunar_transfer_job_class_init (ThunarTransferJobClass *klass)
"FileSizeBinary",
NULL,
TRUE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarPropertiesDialog:parallel_copy_mode:
@@ -169,7 +169,7 @@ thunar_transfer_job_class_init (ThunarTransferJobClass *klass)
NULL,
THUNAR_TYPE_PARALLEL_COPY_MODE,
THUNAR_PARALLEL_COPY_MODE_ONLY_LOCAL,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarPropertiesdialog:transfer_use_partial:
@@ -183,7 +183,7 @@ thunar_transfer_job_class_init (ThunarTransferJobClass *klass)
NULL,
THUNAR_TYPE_USE_PARTIAL_MODE,
THUNAR_USE_PARTIAL_MODE_DISABLED,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarPropertiesdialog:transfer_verify_file:
@@ -197,7 +197,7 @@ thunar_transfer_job_class_init (ThunarTransferJobClass *klass)
NULL,
THUNAR_TYPE_VERIFY_FILE_MODE,
THUNAR_VERIFY_FILE_MODE_DISABLED,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-tree-model.c b/thunar/thunar-tree-model.c
index e859b54eeaffeaa4f3f6eac8509fc1ecb5476ae3..4d0fc3ca6f8b9db642a045926b06a2e07b584a13 100644
--- a/thunar/thunar-tree-model.c
+++ b/thunar/thunar-tree-model.c
@@ -38,6 +38,8 @@
#include "thunar/thunar-tree-model.h"
#include "thunar/thunar-util.h"
+#include <libxfce4util/libxfce4util.h>
+
/* convenience macros */
@@ -300,7 +302,7 @@ thunar_tree_model_class_init (ThunarTreeModelClass *klass)
"case-sensitive",
"case-sensitive",
TRUE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-tree-view.c b/thunar/thunar-tree-view.c
index a12512d4d3aa74ac1f883fa9cde78e7a0cc9df4d..4c1f297df796a24b20fbcb700b7f1f877662c6c4 100644
--- a/thunar/thunar-tree-view.c
+++ b/thunar/thunar-tree-view.c
@@ -337,7 +337,7 @@ thunar_tree_view_class_init (ThunarTreeViewClass *klass)
"show-hidden",
"show-hidden",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarTreeView::delete-selected-files:
diff --git a/thunar/thunar-user.c b/thunar/thunar-user.c
index 2a2e8ed3348aa8bae1f5d4c3e8122f46462ed6b2..bb123a422d2ca60298bf5ef15dc5157fd4355afd 100644
--- a/thunar/thunar-user.c
+++ b/thunar/thunar-user.c
@@ -49,7 +49,6 @@
#include "thunar/thunar-user.h"
#include "thunar/thunar-util.h"
-#include <exo/exo.h>
#include <glib-object.h>
#include <libxfce4util/libxfce4util.h>
diff --git a/thunar/thunar-util.c b/thunar/thunar-util.c
index 365b7ba8bacc7e9d395fb2503e4f95035fcb83eb..49b990c226cb274bfbd5933033710909308d2b30 100644
--- a/thunar/thunar-util.c
+++ b/thunar/thunar-util.c
@@ -913,9 +913,9 @@ thunar_util_determine_corner_properties (GtkWidget *widget,
GtkTextDirection text_direction;
/* only have rounded corners for icon view. */
- if (G_LIKELY (EXO_IS_ICON_VIEW (widget)))
+ if (G_LIKELY (XFCE_IS_ICON_VIEW (widget)))
{
- if (exo_icon_view_get_orientation (EXO_ICON_VIEW (widget)) == GTK_ORIENTATION_HORIZONTAL)
+ if (xfce_icon_view_get_orientation (XFCE_ICON_VIEW (widget)) == GTK_ORIENTATION_HORIZONTAL)
{
/* Compact View */
/* determine the radius proportional to either height or width (depens on the view) */
diff --git a/thunar/thunar-view.c b/thunar/thunar-view.c
index e41179cb50de1360eec4f66aca4f833c14a88ce2..7af2789966c65f9a65a34e5fcdde9085e49d7d3d 100644
--- a/thunar/thunar-view.c
+++ b/thunar/thunar-view.c
@@ -80,7 +80,7 @@ thunar_view_class_init (gpointer klass)
"loading",
"loading",
FALSE,
- EXO_PARAM_READABLE));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
@@ -94,7 +94,7 @@ thunar_view_class_init (gpointer klass)
"show-hidden",
"show-hidden",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarView:zoom-level:
@@ -108,7 +108,7 @@ thunar_view_class_init (gpointer klass)
"zoom-level",
THUNAR_TYPE_ZOOM_LEVEL,
THUNAR_ZOOM_LEVEL_100_PERCENT,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 69fa79161b1fa34fad1856342b3d78980bbcd41a..d73f371e437dec23945a5e7b140b498d90693035 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -780,7 +780,7 @@ thunar_window_class_init (ThunarWindowClass *klass)
"current-directory",
"current-directory",
THUNAR_TYPE_FILE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarWindow:zoom-level:
@@ -795,7 +795,7 @@ thunar_window_class_init (ThunarWindowClass *klass)
"zoom-level",
THUNAR_TYPE_ZOOM_LEVEL,
THUNAR_ZOOM_LEVEL_100_PERCENT,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarWindow:directory-specific-settings:
@@ -808,7 +808,7 @@ thunar_window_class_init (ThunarWindowClass *klass)
"directory-specific-settings",
"directory-specific-settings",
FALSE,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* ThunarWindow::reload:
@@ -3546,7 +3546,7 @@ thunar_window_start_open_location (ThunarWindow *window,
window->is_searching = TRUE;
- /* workaround the slowness of ExoIconView */
+ /* workaround the slowness of XfceIconView */
view_type = window->view_type;
thunar_window_action_detailed_view (window);
thunar_standard_view_save_view_type (THUNAR_STANDARD_VIEW (window->view), view_type); /* save it in the new view */
@@ -4185,7 +4185,7 @@ image_preview_update (GtkWidget *parent,
}
scale_factor = gtk_widget_get_scale_factor (parent);
- scaled_preview = exo_gdk_pixbuf_scale_ratio (window->preview_image_pixbuf, new_size * scale_factor);
+ scaled_preview = xfce_gdk_pixbuf_scale_ratio (window->preview_image_pixbuf, new_size * scale_factor);
surface = gdk_cairo_surface_create_from_pixbuf (scaled_preview, scale_factor, gtk_widget_get_window (parent));
gtk_image_set_from_surface (GTK_IMAGE (image), surface);
@@ -4898,7 +4898,7 @@ thunar_window_propagate_key_event (GtkWindow *window,
/* Turn the accelerator priority around globally,
* so that the focused widget always gets the accels first.
* Implementing this cleanly while maintaining some wanted accels
- * (like Ctrl+N and exo accels) is a lot of work. So we resort to
+ * (like Ctrl+N and xfce accels) is a lot of work. So we resort to
* only priorize GtkEditable, because that is the easiest way to
* fix the right-ahead problem. */
if (focused_widget != NULL && GTK_IS_EDITABLE (focused_widget))