The SHP Thumbnailer is not Gnome dependent, rename it exult_shp_thumbnailer

Dragon-Baroque · Dragon-Baroque · commit a79603040a93 · 2025-02-17T15:04:26.000+01:00
Commit 1 of 1:
    mapedit/studio.h + u7-shp(old).cc
      Remove the reference to Gnome
    tools/gnome_shp_thumbnailer.cc + gnome_u7shapes.thumbnailer.in,
      Rename to exult_
    tools/exult_u7shapes.thumbnailer.in, .gitignore
      Change content gnome_ to exult_
    Makefile.common
      Rename GTHUMB to EXULT_THUMB
    configure.ac, tools/Makefile.am
      Rename GTHUMP to EXULT_THUMB
      Replace --enable-gnome-shp-thumbnailer by --enable-shp-thumbnailer
    .github/workflows/ci-{ freebsd + linux + macos + omnios }.yml,
                      codeql.yml, coverity-scan.yml
      Replace --enable-gnome-shp-thumbnailer by --enable-shp-thumbnailer
diff --git a/.github/workflows/ci-freebsd.yml b/.github/workflows/ci-freebsd.yml
@@ -131,7 +131,7 @@ jobs:
         run: |
           autoreconf -v -i
           ./configure --with-debug=extreme --enable-exult-studio --enable-exult-studio-support --enable-compiler --enable-gimp-plugin \
-            --enable-zip-support --enable-shared --enable-midi-sfx --enable-gnome-shp-thumbnailer --enable-data --enable-mods \
+            --enable-zip-support --enable-shared --enable-midi-sfx --enable-shp-thumbnailer --enable-data --enable-mods \
             --with-usecode-debugger=yes --enable-usecode-container --enable-nonreadied-objects \
             CXX=clang++ CC=clang
           make -j 2
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -144,7 +144,7 @@ jobs:
           OVERRIDE_CXX: ${{ matrix.cxx }}
         run: |
           ./configure --with-debug=extreme --enable-exult-studio --enable-exult-studio-support --enable-compiler --enable-gimp-plugin \
-            --enable-zip-support --enable-shared --enable-midi-sfx --enable-gnome-shp-thumbnailer --enable-data --enable-mods \
+            --enable-zip-support --enable-shared --enable-midi-sfx --enable-shp-thumbnailer --enable-data --enable-mods \
             --with-usecode-debugger=yes --enable-usecode-container --enable-nonreadied-objects --disable-oggtest --disable-vorbistest \
             CXX=${OVERRIDE_CXX} CC=${OVERRIDE_CC}
       - name: Build
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
@@ -124,7 +124,7 @@ jobs:
           export PATH="$(brew --prefix bison)/bin:$(brew --prefix flex)/bin:$(brew --prefix libxml2)/bin:$PATH"
           export PKG_CONFIG_PATH="$(brew --prefix zlib)/lib/pkgconfig:$(brew --prefix libxml2)/lib/pkgconfig:$(brew --prefix icu4c)/lib/pkgconfig"
           ./configure --with-debug=extreme --enable-exult-studio --enable-exult-studio-support --enable-compiler \
-            --enable-zip-support --enable-shared --enable-gnome-shp-thumbnailer --enable-data --enable-mods \
+            --enable-zip-support --enable-shared --enable-shp-thumbnailer --enable-data --enable-mods \
             --disable-alsa --disable-timidity-midi --disable-oggtest --disable-vorbistest
       - name: Build
         run: |
diff --git a/.github/workflows/ci-omnios.yml b/.github/workflows/ci-omnios.yml
@@ -142,7 +142,7 @@ jobs:
           export PKG_CONFIG_PATH=/opt/local/share/pkgconfig:/opt/local/lib/pkgconfig:/opt/ooce/lib/amd64/pkgconfig:$PKG_CONFIG_PATH
           autoreconf -v -i
           ./configure --with-debug=extreme --enable-exult-studio --enable-exult-studio-support --enable-compiler --enable-gimp-plugin \
-            --enable-zip-support --enable-shared --enable-midi-sfx --enable-gnome-shp-thumbnailer --enable-data --enable-mods \
+            --enable-zip-support --enable-shared --enable-midi-sfx --enable-shp-thumbnailer --enable-data --enable-mods \
             --with-usecode-debugger=yes --enable-usecode-container --enable-nonreadied-objects \
             CXX=clang++ CC=clang
           make -j 2
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -115,7 +115,7 @@ jobs:
       - name: Configure
         run: |
           ./configure --with-debug=extreme --enable-exult-studio --enable-exult-studio-support --enable-compiler --enable-gimp-plugin \
-            --enable-zip-support --enable-shared --enable-midi-sfx --enable-gnome-shp-thumbnailer --enable-data --enable-mods \
+            --enable-zip-support --enable-shared --enable-midi-sfx --enable-shp-thumbnailer --enable-data --enable-mods \
             --with-usecode-debugger=yes --enable-usecode-container --enable-nonreadied-objects --disable-oggtest --disable-vorbistest
       - name: Build
         run: make -j 2
diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml
@@ -66,7 +66,7 @@ jobs:
         if: ${{ env.EXULT_REPO_ALIVE == 'true' }}
         run: |
           ./configure --with-debug=extreme --enable-exult-studio --enable-exult-studio-support --enable-compiler --enable-gimp-plugin \
-            --enable-zip-support --enable-shared --enable-midi-sfx --enable-gnome-shp-thumbnailer --enable-data --enable-mods \
+            --enable-zip-support --enable-shared --enable-midi-sfx --enable-shp-thumbnailer --enable-data --enable-mods \
             --with-usecode-debugger=yes --enable-usecode-container --enable-nonreadied-objects --disable-oggtest --disable-vorbistest
       - name: Build with cov-build
         if: ${{ env.EXULT_REPO_ALIVE == 'true' }}
diff --git a/.gitignore b/.gitignore
@@ -75,8 +75,8 @@ mapedit/exult_studio
 mapedit/u7shp
 tools/cmanip
 tools/expack
-tools/gnome_shp_thumbnailer
-tools/gnome_u7shapes.thumbnailer
+tools/exult_shp_thumbnailer
+tools/exult_u7shapes.thumbnailer
 tools/ipack
 tools/mklink
 tools/rip
diff --git a/.travis.yml b/.travis.yml
@@ -57,7 +57,7 @@ jobs:
             name: "exult/exult"
             description: "Exult is an open source engine for Ultima VII and Serpent Isle."
           notification_email: marzojr@gmail.com
-          build_command_prepend: "autoreconf -v -i && ./configure --with-debug=messages --disable-oggtest --disable-vorbistest --enable-exult-studio --enable-exult-studio-support --enable-mt32emu --enable-zip-support --enable-shared --enable-midi-sfx --enable-gimp-plugin --enable-gnome-shp-thumbnailer --enable-compiler --enable-mods --with-usecode-debugger=yes"
+          build_command_prepend: "autoreconf -v -i && ./configure --with-debug=messages --disable-oggtest --disable-vorbistest --enable-exult-studio --enable-exult-studio-support --enable-mt32emu --enable-zip-support --enable-shared --enable-midi-sfx --enable-gimp-plugin --enable-shp-thumbnailer --enable-compiler --enable-mods --with-usecode-debugger=yes"
           build_command:   "make"
           branch_pattern: coverity_scan
       before_script:
diff --git a/.travis/script.sh b/.travis/script.sh
@@ -2,7 +2,7 @@
 
 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
 	export LIBOPTS=""
-	export EXTRA_TOOLS="--enable-gimp-plugin --enable-gnome-shp-thumbnailer --enable-compiler --enable-mods --with-usecode-debugger=yes"
+	export EXTRA_TOOLS="--enable-gimp-plugin --enable-shp-thumbnailer --enable-compiler --enable-mods --with-usecode-debugger=yes"
 	export NPROC=$(nproc)
 else
 	export LIBOPTS="--enable-static-libraries --disable-alsa --disable-fluidsynth --disable-timidity-midi"
diff --git a/Makefile.common b/Makefile.common
@@ -629,7 +629,7 @@ u7voice2syx$(EXEEXT) : tools/u7voice2syx.o $(FILE_OBJS)
 wuc$(EXEEXT) : tools/wuc.o tools/uctools.h usecode/bgintrinsics.h usecode/siintrinsics.h usecode/sibetaintrinsics.h
 	$(CXX) $(LDFLAGS) -o $(@) tools/wuc.o
 
-GTHUMB_OBJS:=\
+EXULT_THUMB_OBJS:=\
 	files/Flat.o \
 	files/Flex.o \
 	files/IFF.o \
@@ -642,10 +642,10 @@ GTHUMB_OBJS:=\
 	imagewin/imagebuf.o \
 	shapes/pngio.o \
 	shapes/vgafile.o \
-	tools/gnome_shp_thumbnailer.o
+	tools/exult_shp_thumbnailer.o
 
-gnome_shp_thumbnailer$(EXEEXT) : $(GTHUMB_OBJS)
-	$(CXX) $(LDFLAGS) -o $(@) $(GTHUMB_OBJS) $(GTK_LIBS) -lpng -lz
+exult_shp_thumbnailer$(EXEEXT) : $(EXULT_THUMB_OBJS)
+	$(CXX) $(LDFLAGS) -o $(@) $(EXULT_THUMB_OBJS) $(GTK_LIBS) -lpng -lz
 
 UCC_OBJS:=\
 	ucparse.o \
@@ -692,7 +692,7 @@ TOOL_OBJS:=tools/expack.o $(FILE_OBJS) tools/cmanip.o tools/ipack.o $(IPACK_OBJS
 	tools/splitshp.o $(SMOOTH_OBJS) mapedit/tools/smooth/plugins/plugin_smooth.o \
 	mapedit/tools/smooth/plugins/plugin_randomize.o mapedit/tools/smooth/plugins/plugin_stream.o \
 	tools/textpack.o tools/u7voice2syx.o tools/wuc.o $(UCXT_OBJS) $(UCC_OBJS) \
-	$(CONFREGRESS_OBJS) usecode/ucxt/head2data.o tools/gnome_shp_thumbnailer.o
+	$(CONFREGRESS_OBJS) usecode/ucxt/head2data.o tools/exult_shp_thumbnailer.o
 
 head2data.o : usecode/ucxt/head2data.cc usecode/bgintrinsics.h usecode/siintrinsics.h usecode/sibetaintrinsics.h
 
@@ -733,7 +733,7 @@ clean:
 	rm -f $(OBJS) $(OBJS:%.o=%.d) tools/expack.o $(EXEC) expack$(EXEEXT) tools/ipack.o ipack$(EXEEXT) data/exult.flx data/exult_flx.h data/exult_bg.flx data/exult_bg_flx.h data/exult_si.flx data/exult_si_flx.h data/bg/bg_paperdol.vga data/bg/bg_mr_faces.vga data/bg/bg_paperdol_vga.h data/bg/bg_mr_faces_vga.h gitinfo.h
 
 tools:  expack$(EXEEXT) cmanip$(EXEEXT) ipack$(EXEEXT) mklink$(EXEEXT) mockup$(EXEEXT) rip$(EXEEXT) shp2pcx$(EXEEXT) smooth$(EXEEXT) splitshp$(EXEEXT) textpack$(EXEEXT) wuc$(EXEEXT) u7voice2syx$(EXEEXT) ucc$(EXEEXT) ucxt$(EXEEXT)  \
-	$(SRC)/head2data$(EXEEXT) head2data.test libsmooth_randomize$(LIBEXT) libsmooth_smooth$(LIBEXT) libsmooth_stream$(LIBEXT) gnome_shp_thumbnailer$(EXEEXT)
+	$(SRC)/head2data$(EXEEXT) head2data.test libsmooth_randomize$(LIBEXT) libsmooth_smooth$(LIBEXT) libsmooth_stream$(LIBEXT) exult_shp_thumbnailer$(EXEEXT)
 
 toolsclean:
 	rm -f $(TOOL_OBJS:%.o=%.d)
@@ -752,7 +752,7 @@ toolsclean:
 	rm -f tools/textpack.o textpack$(EXEEXT)
 	rm -f tools/u7voice2syx.o u7voice2syx$(EXEEXT)
 	rm -f tools/wuc.o wuc$(EXEEXT)
-	rm -f tools/gnome_shp_thumbnailer.o gnome_shp_thumbnailer$(EXEEXT)
+	rm -f tools/exult_shp_thumbnailer.o exult_shp_thumbnailer$(EXEEXT)
 	rm -f $(UCXT_OBJS) ucxt$(EXEEXT)
 	rm -f $(UCC_OBJS) ucc$(EXEEXT) ucparse.cc ucparse.h uclex.cc
 	rm -f $(CONFREGRESS_OBJS) confregress$(EXEEXT)
diff --git a/configure.ac b/configure.ac
@@ -882,37 +882,37 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-# gnome-shp-thumbnailer
-AC_ARG_ENABLE(gnome-shp-thumbnailer, AS_HELP_STRING([--enable-gnome-shp-thumbnailer@<:@=yes|system|local|user|ingame|no@:>@],
-		[Build Gnome SHP Thumbnailer, yes or system and local for system (local) install (requires root), user for user install, ingame for Exult ingame install (requires XDG_DATA_DIRS) @<:@default no@:>@]),,enable_gnome_shp_thumbnailer=no)
-AC_MSG_CHECKING([whether to build the Gnome SHP Thumbnailer])
-if test x$enable_gnome_shp_thumbnailer != xno; then
+# shp-thumbnailer
+AC_ARG_ENABLE(shp-thumbnailer, AS_HELP_STRING([--enable-shp-thumbnailer@<:@=yes|system|local|user|ingame|no@:>@],
+		[Build Exult SHP Thumbnailer, yes or system and local for system (local) install (requires root), user for user install, ingame for Exult ingame install (requires XDG_DATA_DIRS) @<:@default no@:>@]),,enable_shp_thumbnailer=no)
+AC_MSG_CHECKING([whether to build the Exult SHP Thumbnailer])
+if test x$enable_shp_thumbnailer != xno; then
 	AC_MSG_RESULT(yes)
 	# needs Gdk-Pixbuf
 	PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0, have_gdk_pixbuf=yes, have_gdk_pixbuf=no)
 	if test x$have_gdk_pixbuf = xno; then
-		echo "The Gnome shp thumbnailer requires Gdk-Pixbuf."
-		echo "Please try again, either with Gdk-Pixbuf-2.0, or with '--disable-gnome-shp-thumbnailer'."
+		echo "The Exult shp thumbnailer requires Gdk-Pixbuf."
+		echo "Please try again, either with Gdk-Pixbuf-2.0, or with '--disable-shp-thumbnailer'."
 		exit 1
 	fi
 	if test x$have_png = xno; then
-		echo "The Gnome shp thumbnailer requires the PNG (aka the Portable Network Graphics)."
-		echo "Please try again, either with the PNG installed, or with '--disable-gnome-shp-thumbnailer'."
+		echo "The Exult shp thumbnailer requires the PNG (aka the Portable Network Graphics)."
+		echo "Please try again, either with the PNG installed, or with '--disable-shp-thumbnailer'."
 		exit 1
 	fi
-	AM_CONDITIONAL(BUILD_GTHUMB, true)
-	if   test x$enable_gnome_shp_thumbnailer == xlocal; then
-		GTHUMB_PREFIX="/usr/local/share"
-	elif test x$enable_gnome_shp_thumbnailer == xuser; then
-		GTHUMB_PREFIX="${HOME_SHRDIR}"
-	elif test x$enable_gnome_shp_thumbnailer == xingame; then
-		GTHUMB_PREFIX="${datadir}"
+	AM_CONDITIONAL(BUILD_EXULT_THUMB, true)
+	if   test x$enable_shp_thumbnailer == xlocal; then
+		EXULT_THUMB_PREFIX="/usr/local/share"
+	elif test x$enable_shp_thumbnailer == xuser; then
+		EXULT_THUMB_PREFIX="${HOME_SHRDIR}"
+	elif test x$enable_shp_thumbnailer == xingame; then
+		EXULT_THUMB_PREFIX="${datadir}"
 	else
-		GTHUMB_PREFIX="/usr/share"
+		EXULT_THUMB_PREFIX="/usr/share"
 	fi
-	AC_SUBST(GTHUMB_PREFIX)
+	AC_SUBST(EXULT_THUMB_PREFIX)
 else
-	AM_CONDITIONAL(BUILD_GTHUMB, false)
+	AM_CONDITIONAL(BUILD_EXULT_THUMB, false)
 	AC_MSG_RESULT(no)
 fi
 
@@ -1440,7 +1440,7 @@ else
 		echo GLIB....................... : `$PKG_CONFIG --modversion glib-2.0`
 		echo GTK+....................... : `$PKG_CONFIG --modversion gtk+-3.0`
 	fi
-	if test x$enable_gnome_shp_thumbnailer = xyes; then
+	if test x$enable_shp_thumbnailer = xyes; then
 		echo GDK-Pixbuf................. : `$PKG_CONFIG --modversion gdk-pixbuf-2.0`
 	fi
 	if test -n "$GIMPTOOL"; then
@@ -1473,8 +1473,8 @@ echo Build tools................ : $enable_tools
 echo Build usecode compiler..... : $enable_compiler
 echo Build Exult mods........... : $enable_mods
 echo Create zipped Savegames.... : $enable_zip_support
-echo Build GIMP plugin.......... : $enable_gimp_plugin
-echo Build Gnome SHP Thumbnailer : $enable_gnome_shp_thumbnailer
+echo Build GIMP SHP plugin...... : $enable_gimp_plugin
+echo Build Exult SHP Thumbnailer : $enable_shp_thumbnailer
 echo
 echo Debug :
 echo Build Usecode debugger..... : $enable_usecode_debugger
diff --git a/mapedit/studio.h b/mapedit/studio.h
@@ -36,7 +36,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifdef USE_STRICT_GTK
 #	define GTK_DISABLE_SINGLE_INCLUDES
 #	define GSEAL_ENABLE
-#	define GNOME_DISABLE_DEPRECATED
 #	define GTK_DISABLE_DEPRECATED
 #	define GDK_DISABLE_DEPRECATED
 #else
diff --git a/mapedit/u7shp-old.cc b/mapedit/u7shp-old.cc
@@ -31,7 +31,6 @@
 #ifdef USE_STRICT_GTK
 #	define GTK_DISABLE_SINGLE_INCLUDES
 #	define GSEAL_ENABLE
-#	define GNOME_DISABLE_DEPRECATED
 #	define GTK_DISABLE_DEPRECATED
 #	define GDK_DISABLE_DEPRECATED
 #else
diff --git a/mapedit/u7shp.cc b/mapedit/u7shp.cc
@@ -37,7 +37,6 @@
 #ifdef USE_STRICT_GTK
 #	define GTK_DISABLE_SINGLE_INCLUDES
 #	define GSEAL_ENABLE
-#	define GNOME_DISABLE_DEPRECATED
 #	define GTK_DISABLE_DEPRECATED
 #	define GDK_DISABLE_DEPRECATED
 #else
diff --git a/tools/Makefile.am b/tools/Makefile.am
@@ -19,13 +19,13 @@ IPACK = ipack
 else
 IPACK =
 endif
-GTHUMB=
+EXULT_THUMB=
 endif
 
-if BUILD_GTHUMB
-GTHUMB=gnome_shp_thumbnailer
+if BUILD_EXULT_THUMB
+EXULT_THUMB=exult_shp_thumbnailer
 else
-GTHUMB=
+EXULT_THUMB=
 endif
 
 if BUILD_TOOLS
@@ -36,7 +36,7 @@ EXTRATOOLS =
 NOINSTTOOLS =
 endif
 
-bin_PROGRAMS = $(EXPACK_BIN) $(EXTRATOOLS) $(IPACK) $(GTHUMB)
+bin_PROGRAMS = $(EXPACK_BIN) $(EXTRATOOLS) $(IPACK) $(EXULT_THUMB)
 noinst_PROGRAMS = $(NOINSTTOOLS)
 
 expack_SOURCES = \
@@ -55,34 +55,34 @@ ipack_LDADD = \
 	$(top_builddir)/imagewin/libimagewin.la \
 	$(PNG_LIBS) $(ZLIB_LIBS) $(SYSLIBS)
 
-gnome_shp_thumbnailer_SOURCES = \
-	gnome_shp_thumbnailer.cc
+exult_shp_thumbnailer_SOURCES = \
+	exult_shp_thumbnailer.cc
 
-gnome_shp_thumbnailer_LDADD = \
+exult_shp_thumbnailer_LDADD = \
 	$(top_builddir)/shapes/libshapes.la \
 	$(top_builddir)/imagewin/libimagewin.la \
 	$(top_builddir)/files/libu7file.la \
 	$(PNG_LIBS) $(ZLIB_LIBS) $(SYSLIBS) $(GDK_PIXBUF_LIBS)
 
-if BUILD_GTHUMB
-# The actual executable "gnome_shp_thumbnailer" is in <Exult>/bin
+if BUILD_EXULT_THUMB
+# The actual executable "exult_shp_thumbnailer" is in <Exult>/bin
 #  It needs two files visible from XDG_DATA_HOME or one of XDG_DATA_DIRS :
 #   <XDG_DATA_HOME or one of XDG_DATA_DIRS>/mime/packages/x-shapefile.xml
 #     Defines the MIME type "image/x-shapefile"
-#   <XDG_DATA_HOME or one of XDG_DATA_DIRS>/thumbnailers/gnome_u7shapes.thumbnailer
-#     Thumbnails the U7 Shapes with "gnome_shp_thumbnailers"
+#   <XDG_DATA_HOME or one of XDG_DATA_DIRS>/thumbnailers/exult_u7shapes.thumbnailer
+#     Thumbnails the U7 Shapes with "exult_shp_thumbnailer"
 # The installation XDG_DATA_HOME or XDG_DATA_DIRS are chosen using
-#  --enable-gnome-shp-thumbnailer=Target
+#  --enable-shp-thumbnailer=Target
 #   with Target "yes" or "system" ( default ) => /usr/share ( requires root )
 #   with Target "local"                       => /usr/local/share ( requires root )
 #   with Target "user"                        => ~/.local/share
 #   with Target "ingame"                      => <Exult>/share ( requires setting this folder in XDG_DATA_DIRS )
 #
-thumbnailerdir=$(DESTDIR)$(GTHUMB_PREFIX)/thumbnailers
-thumbnailer_in_files=$(top_srcdir)/tools/gnome_u7shapes.thumbnailer.in
+thumbnailerdir=$(DESTDIR)$(EXULT_THUMB_PREFIX)/thumbnailers
+thumbnailer_in_files=$(top_srcdir)/tools/exult_u7shapes.thumbnailer.in
 thumbnailer_DATA=$(thumbnailer_in_files:.thumbnailer.in=.thumbnailer)
-gnome_shp_thumbnailer_DATA=x-shapefile.xml
-gnome_shp_thumbnailerdir=$(DESTDIR)$(GTHUMB_PREFIX)/mime/packages
+exult_shp_thumbnailer_DATA=x-shapefile.xml
+exult_shp_thumbnailerdir=$(DESTDIR)$(EXULT_THUMB_PREFIX)/mime/packages
 
 # Rule to make the service file with bindir expanded
 $(thumbnailer_DATA): $(thumbnailer_in_files)
@@ -125,12 +125,12 @@ cmanip_LDADD = \
 	$(top_builddir)/files/libu7file.la \
 	$(SYSLIBS)
 
-if BUILD_GTHUMB
+if BUILD_EXULT_THUMB
 install-data-hook:
-	update-mime-database $(DESTDIR)$(GTHUMB_PREFIX)/mime || :
+	update-mime-database $(DESTDIR)$(EXULT_THUMB_PREFIX)/mime || :
 
 uninstall-hook:
-	update-mime-database $(DESTDIR)$(GTHUMP_PREFIX)/mime || :
+	update-mime-database $(DESTDIR)$(EXULT_THUMB_PREFIX)/mime || :
 else
 install-data-hook:
 uninstall-hook:
@@ -144,7 +144,7 @@ EXTRA_DIST = \
 	u7siflag.txt \
 	ucformat.txt \
 	expack.1 \
-	gnome_u7shapes.thumbnailer.in \
+	exult_u7shapes.thumbnailer.in \
 	ipack.1 \
 	ipack.txt \
 	shp2pcx.1 \
@@ -156,4 +156,4 @@ EXTRA_DIST = \
 	x-shapefile.xml \
 	expack.txt
 
-CLEANFILES = *~ gnome_u7shapes.thumbnailer
+CLEANFILES = *~ exult_u7shapes.thumbnailer
diff --git a/tools/exult_shp_thumbnailer.cc b/tools/exult_shp_thumbnailer.cc
@@ -1,5 +1,6 @@
 /**
- ** gnome_shp_thumbnailer.cc - Create thumbnails for shp files in Nautilus.
+ ** exult_shp_thumbnailer.cc :
+ ** Create thumbnails for shp files in Gnome Nautilus or KDE Dolphin.
  **
  ** Written: 2/14/2010 - Marzo, with lots of code borrowed from ipack and from
  ** the Gimp plugin.
@@ -265,7 +266,7 @@ namespace {
 
 int main(int argc, char* argv[]) {
 	if (argc < 5) {
-		cerr << "Usage: gnome-shp-thumbnailer -s size inputfile outputfile"
+		cerr << "Usage: exult-shp-thumbnailer -s size inputfile outputfile"
 			 << endl;
 		return 1;
 	}
diff --git a/tools/exult_u7shapes.thumbnailer.in b/tools/exult_u7shapes.thumbnailer.in
@@ -0,0 +1,4 @@
+[Thumbnailer Entry]
+TryExec=@bindir@/exult_shp_thumbnailer
+Exec=@bindir@/exult_shp_thumbnailer -s %s %i %o
+MimeType=image/x-shapefile
diff --git a/tools/gnome_u7shapes.thumbnailer.in b/tools/gnome_u7shapes.thumbnailer.in
