Use .ini.desktop.in again

m4/moo-i18n.m4

@@ -11,6 +11,6 @@ AC_DEFUN([MOO_AC_I18N],[
     ALL_LINGUAS="$1"
     AM_GLIB_GNU_GETTEXT
 
-    MOO_INTLTOOL_INI_RULE='%.ini: %.ini.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; cp $< [$]@.desktop.in && LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po [$]@.desktop.in [$]@ && rm [$]@.desktop.in'
+    MOO_INTLTOOL_INI_RULE='%.ini: %.ini.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
     AC_SUBST(MOO_INTLTOOL_INI_RULE)
 ])

moo/moopython/plugins/Makefile.am

@@ -3,9 +3,9 @@ SUBDIRS = pyproject
 moopython_pluginsdir = $(MOO_LIB_DIR)/plugins
 moopython_plugins_libdir = $(MOO_LIB_DIR)/plugins/lib
 
-ini_in_files = console.ini.in python.ini.in
+ini_in_files = console.ini.desktop.in python.ini.desktop.in
 @MOO_INTLTOOL_INI_RULE@
-ini_files = $(ini_in_files:.ini.in=.ini)
+ini_files = $(ini_in_files:.ini.desktop.in=.ini)
 CLEANFILES = $(ini_files)
 
 plugins =			\

moo/moopython/plugins/pyproject/Makefile.am

@@ -1,6 +1,6 @@
-ini_in_files = project-plugin.ini.in
+ini_in_files = project-plugin.ini.desktop.in
 @MOO_INTLTOOL_INI_RULE@
-ini_files = $(ini_in_files:.ini.in=.ini)
+ini_files = $(ini_in_files:.ini.desktop.in=.ini)
 CLEANFILES = $(ini_files)
 
 inidir = $(MOO_LIB_DIR)/plugins

po/POTFILES.in

@@ -29,6 +29,6 @@ moo/mooutils/moostock.c
 moo/mooapp/mooappabout.c
 moo/mooapp/mooapp.c
 tests/medit-ui.xml
-[type: desktop]
 moo/moopython/plugins/console.ini.desktop.in
 moo/moopython/plugins/python.ini.desktop.in
+moo/moopython/plugins/pyproject/project-plugin.ini.desktop.in

po/POTFILES.skip

@@ -1,4 +1,3 @@
 moo/mooutils/newgtk/gmappedfile.c
 moo/mooutils/newgtk/gtkcolorbutton.c
 moo/mooutils/newgtk/gtkfontbutton.c
-moo/moopython/plugins/pyproject/project-plugin.ini.desktop.in