4 files changed, 73 insertions, 16 deletions
diff --git a/mate-disk-image-mounter/Makefile.am b/mate-disk-image-mounter/Makefile.am
index 21cdfbe6..ce283b04 100644
--- a/mate-disk-image-mounter/Makefile.am
+++ b/mate-disk-image-mounter/Makefile.am
@@ -1,3 +1,18 @@
+# This file is part of MATE Utils.
+#
+# MATE Utils is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# MATE Utils is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with MATE Utils.  If not, see <https://www.gnu.org/licenses/>.
+
 SUBDIRS = src data
 
 -include $(top_srcdir)/git.mk
diff --git a/mate-disk-image-mounter/data/Makefile.am b/mate-disk-image-mounter/data/Makefile.am
index 8f00bb5d..9daf5ec4 100644
--- a/mate-disk-image-mounter/data/Makefile.am
+++ b/mate-disk-image-mounter/data/Makefile.am
@@ -1,10 +1,30 @@
+# This file is part of MATE Utils.
+#
+# MATE Utils is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# MATE Utils is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with MATE Utils.  If not, see <https://www.gnu.org/licenses/>.
+
 NULL =
 
 diskimagemounterdir = $(datadir)/applications
 diskimagemounter_in_files = mate-disk-image-mounter.desktop.in
 diskimagemounter_DATA = $(diskimagemounter_in_files:.desktop.in=.desktop)
+
 $(diskimagemounter_DATA): $(diskimagemounter_in_files)
-	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+if USE_NLS
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
+else
+	$(AM_V_GEN) cp $< $@
+endif
 
 EXTRA_DIST = 					\
 	$(diskimagemounter_in_files)		\
diff --git a/mate-disk-image-mounter/src/Makefile.am b/mate-disk-image-mounter/src/Makefile.am
index 7e65fbcf..22db7d5b 100644
--- a/mate-disk-image-mounter/src/Makefile.am
+++ b/mate-disk-image-mounter/src/Makefile.am
@@ -1,3 +1,18 @@
+# This file is part of MATE Utils.
+#
+# MATE Utils is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# MATE Utils is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with MATE Utils.  If not, see <https://www.gnu.org/licenses/>.
+
 NULL =
 
 bin_PROGRAMS = mate-disk-image-mounter
diff --git a/mate-disk-image-mounter/src/main.c b/mate-disk-image-mounter/src/main.c
index 5dea5a41..49855bbb 100644
--- a/mate-disk-image-mounter/src/main.c
+++ b/mate-disk-image-mounter/src/main.c
@@ -1,26 +1,29 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/* Copyright (C) 2012 Red Hat, Inc.
+ * Copyright (C) 2012-2021 MATE Developers
  *
- * Copyright (C) 2012 Red Hat, Inc.
+ * This file is part of MATE Utils.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * MATE Utils is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * MATE Utils is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with MATE Utils.  If not, see <https://www.gnu.org/licenses/>.
  *
  * Author: David Zeuthen <[email protected]>
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib/gi18n.h>
 
 #include <glib-unix.h>
@@ -76,7 +79,7 @@ static gboolean  opt_writable = FALSE;
 static const GOptionEntry opt_entries[] =
 {
   { "writable", 'w', 0, G_OPTION_ARG_NONE, &opt_writable, N_("Allow writing to the image"), NULL},
-  { NULL }
+  { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
 };
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -156,9 +159,11 @@ main (int argc, char *argv[])
   GSList *uris = NULL;
   GSList *l;
 
+#ifdef ENABLE_NLS
   bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
 
   have_gtk = gtk_init_check (&argc, &argv);
 
@@ -186,8 +191,10 @@ main (int argc, char *argv[])
       s = g_option_context_get_help (o, FALSE, NULL);
       g_printerr ("%s", s);
       g_free (s);
+      g_option_context_free (o);
       goto out;
     }
+  g_option_context_free (o);
 
   if (argc > 1)
     {