diff options
Diffstat (limited to 'mate-disk-image-mounter')
-rw-r--r-- | mate-disk-image-mounter/data/Makefile.am | 7 | ||||
-rw-r--r-- | mate-disk-image-mounter/src/main.c | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/mate-disk-image-mounter/data/Makefile.am b/mate-disk-image-mounter/data/Makefile.am index f0db6f94..9daf5ec4 100644 --- a/mate-disk-image-mounter/data/Makefile.am +++ b/mate-disk-image-mounter/data/Makefile.am @@ -18,8 +18,13 @@ 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/main.c b/mate-disk-image-mounter/src/main.c index 65c283ea..49855bbb 100644 --- a/mate-disk-image-mounter/src/main.c +++ b/mate-disk-image-mounter/src/main.c @@ -1,5 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ /* Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2012-2021 MATE Developers * * This file is part of MATE Utils. * @@ -78,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 } }; /* ---------------------------------------------------------------------------------------------------- */ @@ -158,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); @@ -188,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) { |