Revert "Rename initial desktop file to match final name, clean up some"

This reverts commit ae1a575.

Author: clefebvre

data/meson.build

@@ -17,7 +17,7 @@ desktopFiles = [
   ),
 
   configure_file(
-    input : 'org.Nemo.desktop.in',
+    input : 'nemo.desktop.in',
     output: 'org.Nemo.desktop',
     configuration: dataConf,
   )

data/org.Nemo.desktop.in data/nemo.desktop.in

@@ -30,26 +30,26 @@ MimeType=inode/directory;application/x-gnome-saved-search;
 Actions=open-home;open-computer;open-trash;
 """
 
-additionalfiles.generate(DOMAIN, PATH, "data/org.Nemo.desktop.in", prefix, _("Files"), _("Access and organize files"), suffix)
+additionalfiles.generate(DOMAIN, PATH, "data/nemo.desktop.in", prefix, _("Files"), _("Access and organize files"), suffix)
 
 
 prefix = """
 [Desktop Action open-home]
 """
 suffix = """Exec=nemo %U
 """
-additionalfiles.generate(DOMAIN, PATH, "data/org.Nemo.desktop.in", prefix, _("Home"), None, suffix, append=True)
+additionalfiles.generate(DOMAIN, PATH, "data/nemo.desktop.in", prefix, _("Home"), None, suffix, append=True)
 
 prefix = """
 [Desktop Action open-computer]
 """
 suffix = """Exec=nemo computer:///
 """
-additionalfiles.generate(DOMAIN, PATH, "data/org.Nemo.desktop.in", prefix, _("Computer"), None, suffix, append=True)
+additionalfiles.generate(DOMAIN, PATH, "data/nemo.desktop.in", prefix, _("Computer"), None, suffix, append=True)
 
 prefix = """
 [Desktop Action open-trash]
 """
 suffix = """Exec=nemo trash:///
 """
-additionalfiles.generate(DOMAIN, PATH, "data/org.Nemo.desktop.in", prefix, _("Trash"), None, suffix, append=True)
+additionalfiles.generate(DOMAIN, PATH, "data/nemo.desktop.in", prefix, _("Trash"), None, suffix, append=True)

generate_additional_file

@@ -3,6 +3,8 @@
 [encoding: UTF-8]
 data/action_i18n_strings.py
 data/nemo.xml.in
+data/nemo-autorun-software.desktop.in.in
+data/nemo.desktop.in.in
 eel/eel-canvas.c
 eel/eel-editable-label.c
 eel/eel-glib-extensions.c

po/POTFILES.in

@@ -2,5 +2,10 @@
 # Please keep this file sorted alphabetically.
 libbackground/applier.c
 data/nemo-autorun-software.desktop.in
-data/org.Nemo.desktop.in
+data/nemo-computer.desktop.in
+data/nemo-file-management-properties.desktop.in
+data/nemo-folder-handler.desktop.in
+data/nemo-home.desktop.in
+data/nemo.desktop.in
+data/nemo-browser.desktop.in
 debian

po/POTFILES.skip

@@ -258,7 +258,7 @@ filter_nemo_handler (GList *apps)
 		id = g_app_info_get_id (application);
 		if (id != NULL &&
 		    strcmp (id,
-			    "org.Nemo.desktop") == 0) {
+			    "nemo.desktop") == 0) {
 			g_object_unref (application);
 			apps = g_list_delete_link (apps, l);
 		}