[gnome-commander] Revert "Set XDG_DATA_DIRS and override png mimetype priority"

[Uwe Scholz <uwescholz src gnome org>]

commit 70dbd38253aa538b4a4d4f7c56774115306d0c20
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Fri Dec 25 16:38:26 2020 +0100

    Revert "Set XDG_DATA_DIRS and override png mimetype priority"
    
    This reverts commit 610eb4ff42a85b513585064bd2141a280873dcd5.
    
    This revert is done because we are now opening a file with its default
    application defined by gio and not by gnome-vfs anymore. Our own mime
    handling for png files should not be needed because of that.

 configure.ac                  |  6 ------
 data/Makefile.am              | 19 -------------------
 data/gnome-commander-mime.xml | 12 ------------
 src/Makefile.am               |  4 +---
 src/gnome-cmd-mime-config.cc  | 39 ---------------------------------------
 src/gnome-cmd-mime-config.h   | 21 ---------------------
 src/main.cc                   |  3 ---
 7 files changed, 1 insertion(+), 103 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 10a14043..2174704a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -231,12 +231,6 @@ AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${PREFIX}/share/pixmaps/${PACKAGE}", [pixmaps l
 PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
 AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
 
-dnl =====================
-dnl Check for binary
-dnl =====================
-AC_CHECK_PROG(HAVE_UPDATE_MIME_DATABASE, update-mime-database, "yes", "no")
-AC_SUBST(HAVE_UPDATE_MIME_DATABASE)
-
 
 dnl =====================
 dnl Write some output
diff --git a/data/Makefile.am b/data/Makefile.am
index ba0c6003..ce148f24 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -22,10 +22,6 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 $(appdata_DATA): $(appdata_in_files)
        $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
-mimetopdir = $(datadir)/@PACKAGE@/mime
-mimexmldir = $(mimetopdir)/packages
-mimexml_DATA = gnome-commander-mime.xml
-
 ebuild_files = @PACKAGE@.ebuild
 ebuild_DATA_NOINST = @PACKAGE@-@VERSION@.ebuild
 
@@ -38,25 +34,10 @@ EXTRA_DIST =              \
        @PACKAGE@.spec        \
        $(ebuild_files)       \
        $(ebuild_DATA_NOINST) \
-       $(mimexml_DATA)       \
        $(gsettings_SCHEMAS)
 
 CLEANFILES = org.gnome.@PACKAGE@.gschema.valid
 
 DISTCLEANFILES = $(appdata_DATA) $(desktop_DATA)
 
-HAVE_UPDATE_MIME_DATABASE = @HAVE_UPDATE_MIME_DATABASE@
-
-#
-# Keep in mind: Although $DESTDIR is often empty, it is needed
-# for 'make distcheck' so leave it here, please!
-#
-install-data-hook:
-       test "x$(HAVE_UPDATE_MIME_DATABASE)" == "xyes" && \
-               update-mime-database -V $(DESTDIR)/$(mimetopdir)
-
-uninstall-hook:
-       for target in $(DESTDIR)/$(mimetopdir)/* ; \
-               do test "x$${target}" != "x$(DESTDIR)/$(mimexmldir)" && rm -rf $${target} ; done
-
 -include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index d47c323a..f5b8f01d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,8 +16,7 @@ AM_CPPFLAGS = \
        -DGTK_DISABLE_SINGLE_INCLUDES \
        -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
        -DDATADIR=\""$(datadir)"\"\
-       -DPLUGIN_DIR=\""$(libdir)/$(PACKAGE)/plugins"\" \
-       -DMIMETOP_DIR=\""$(datadir)/@PACKAGE@/"\"
+       -DPLUGIN_DIR=\""$(libdir)/$(PACKAGE)/plugins"\"
 
 bin_PROGRAMS = gnome-commander gcmd-block
 
@@ -58,7 +57,6 @@ gnome_commander_SOURCES = \
        gnome-cmd-main-menu.h gnome-cmd-main-menu.cc \
        gnome-cmd-main-win.h gnome-cmd-main-win.cc \
        gnome-cmd-menu-button.h gnome-cmd-menu-button.cc \
-       gnome-cmd-mime-config.h gnome-cmd-mime-config.cc \
        gnome-cmd-notebook.h gnome-cmd-notebook.cc \
        gnome-cmd-owner.h gnome-cmd-owner.cc \
        gnome-cmd-path.h \
diff --git a/src/main.cc b/src/main.cc
index 0c8e409a..46908442 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -28,7 +28,6 @@
 
 #include "gnome-cmd-includes.h"
 #include "gnome-cmd-main-win.h"
-#include "gnome-cmd-mime-config.h"
 #include "gnome-cmd-data.h"
 #include "gnome-cmd-user-actions.h"
 #include "gnome-cmd-owner.h"
@@ -107,8 +106,6 @@ int main (int argc, char *argv[])
     bind_textdomain_codeset (PACKAGE, "UTF-8");
     textdomain (PACKAGE);
 
-    gnome_cmd_mime_config();
-
     if (!gtk_init_with_args (&argc, &argv,
                              _("File Manager"),
                              options,