GNOME.org
 

[gnome-mines] FreeDesktop Standards: unify app-id

commit 649c6b3c50a7c2b05454061b47b48fa8ef2ba918
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Sat Jan 5 23:59:28 2019 +0100

    FreeDesktop Standards: unify app-id

 .../16x16/{gnome-mines.png => org.gnome.Mines.png}        | Bin
 .../22x22/{gnome-mines.png => org.gnome.Mines.png}        | Bin
 .../24x24/{gnome-mines.png => org.gnome.Mines.png}        | Bin
 .../256x256/{gnome-mines.png => org.gnome.Mines.png}      | Bin
 .../32x32/{gnome-mines.png => org.gnome.Mines.png}        | Bin
 .../48x48/{gnome-mines.png => org.gnome.Mines.png}        | Bin
 ...me-mines-symbolic.svg => org.gnome.Mines-symbolic.svg} |   0
 data/meson.build                                          |  14 +++++++-------
 ...ines.appdata.xml.in => org.gnome.Mines.appdata.xml.in} |   5 +++--
 ...{gnome-mines.desktop.in => org.gnome.Mines.desktop.in} |   2 +-
 ...nome.mines.gschema.xml => org.gnome.Mines.gschema.xml} |   2 +-
 meson.build                                               |   2 ++
 org.gnome.mines.json => org.gnome.Mines.json              |  11 ++---------
 po/POTFILES.in                                            |   6 +++---
 src/gnome-mines.gresource.xml                             |   2 +-
 src/gnome-mines.vala                                      |   6 +++---
 16 files changed, 23 insertions(+), 27 deletions(-)
---
diff --git a/data/icons/hicolor/16x16/gnome-mines.png b/data/icons/hicolor/16x16/org.gnome.Mines.png
similarity index 100%
rename from data/icons/hicolor/16x16/gnome-mines.png
rename to data/icons/hicolor/16x16/org.gnome.Mines.png
diff --git a/data/icons/hicolor/22x22/gnome-mines.png b/data/icons/hicolor/22x22/org.gnome.Mines.png
similarity index 100%
rename from data/icons/hicolor/22x22/gnome-mines.png
rename to data/icons/hicolor/22x22/org.gnome.Mines.png
diff --git a/data/icons/hicolor/24x24/gnome-mines.png b/data/icons/hicolor/24x24/org.gnome.Mines.png
similarity index 100%
rename from data/icons/hicolor/24x24/gnome-mines.png
rename to data/icons/hicolor/24x24/org.gnome.Mines.png
diff --git a/data/icons/hicolor/256x256/gnome-mines.png b/data/icons/hicolor/256x256/org.gnome.Mines.png
similarity index 100%
rename from data/icons/hicolor/256x256/gnome-mines.png
rename to data/icons/hicolor/256x256/org.gnome.Mines.png
diff --git a/data/icons/hicolor/32x32/gnome-mines.png b/data/icons/hicolor/32x32/org.gnome.Mines.png
similarity index 100%
rename from data/icons/hicolor/32x32/gnome-mines.png
rename to data/icons/hicolor/32x32/org.gnome.Mines.png
diff --git a/data/icons/hicolor/48x48/gnome-mines.png b/data/icons/hicolor/48x48/org.gnome.Mines.png
similarity index 100%
rename from data/icons/hicolor/48x48/gnome-mines.png
rename to data/icons/hicolor/48x48/org.gnome.Mines.png
diff --git a/data/icons/hicolor/scalable/gnome-mines-symbolic.svg 
b/data/icons/hicolor/scalable/org.gnome.Mines-symbolic.svg
similarity index 100%
rename from data/icons/hicolor/scalable/gnome-mines-symbolic.svg
rename to data/icons/hicolor/scalable/org.gnome.Mines-symbolic.svg
diff --git a/data/meson.build b/data/meson.build
index 1ef1656..84d23d3 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,11 +1,11 @@
 foreach size: [ '16x16', '22x22', '24x24', '32x32', '48x48', '256x256' ]
-    install_data (join_paths ('icons', 'hicolor', size, 'gnome-mines.png'),
+    install_data (join_paths ('icons', 'hicolor', size, '@0@.png'.format(app_id)),
                   install_dir: join_paths (datadir, 'icons', 'hicolor', size, 'apps'))
 endforeach
-install_data (join_paths ('icons', 'hicolor', 'scalable', 'gnome-mines-symbolic.svg'),
+install_data (join_paths ('icons', 'hicolor', 'scalable', '@0 -symbolic svg'.format(app_id)),
               install_dir: join_paths (datadir, 'icons', 'hicolor', 'scalable', 'apps'))
 
-install_data ('org.gnome.mines.gschema.xml',
+install_data ('@0  gschema xml'.format(app_id),
               install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
 meson.add_install_script ('meson_compile_gschema.py')
 
@@ -18,16 +18,16 @@ foreach theme: [ 'default', 'bgcolors', 'classic' ]
 endforeach
 
 i18n.merge_file ('desktop-file',
-                 input: 'gnome-mines.desktop.in',
-                 output: 'gnome-mines.desktop',
+                 input: '@0  desktop in'.format(app_id),
+                 output: '@0@.desktop'.format(app_id),
                  install: true,
                  install_dir: join_paths (datadir, 'applications'),
                  po_dir: '../po',
                  type: 'desktop')
 
 i18n.merge_file ('appdata-file',
-                 input: 'gnome-mines.appdata.xml.in',
-                 output: 'gnome-mines.appdata.xml',
+                 input: '@0  appdata xml in'.format(app_id),
+                 output: '@0  appdata xml'.format(app_id),
                  install: true,
                  install_dir: join_paths (datadir, 'metainfo'),
                  po_dir: '../po')
diff --git a/data/gnome-mines.appdata.xml.in b/data/org.gnome.Mines.appdata.xml.in
similarity index 95%
rename from data/gnome-mines.appdata.xml.in
rename to data/org.gnome.Mines.appdata.xml.in
index aef3011..c1adb09 100644
--- a/data/gnome-mines.appdata.xml.in
+++ b/data/org.gnome.Mines.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2013 Michael Catanzaro -->
-<component type="desktop">
-  <id>gnome-mines.desktop</id>
+<component type="desktop-application">
+  <id>org.gnome.Mines</id>
   <metadata_license>CC0-1.0</metadata_license>
 
   <project_license>GPL-3.0+ and CC-BY-SA-3.0</project_license>
@@ -31,6 +31,7 @@
   <url type="help">https://help.gnome.org/users/gnome-mines/stable/</url>
   <url type="translate">https://wiki.gnome.org/TranslationProject</url>
   <update_contact>robert.roth.off_at_gmail.com</update_contact>
+  <launchable type="desktop-id">org.gnome.Mines.desktop</launchable>
   <project_group>GNOME</project_group>
   <kudos>
     <kudo>AppMenu</kudo>
diff --git a/data/gnome-mines.desktop.in b/data/org.gnome.Mines.desktop.in
similarity index 96%
rename from data/gnome-mines.desktop.in
rename to data/org.gnome.Mines.desktop.in
index 32b0eab..dfe8b14 100644
--- a/data/gnome-mines.desktop.in
+++ b/data/org.gnome.Mines.desktop.in
@@ -3,7 +3,7 @@ Name=Mines
 Comment=Clear hidden mines from a minefield
 Exec=gnome-mines
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=gnome-mines
+Icon=org.gnome.Mines
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Game;LogicGame;
diff --git a/data/org.gnome.mines.gschema.xml b/data/org.gnome.Mines.gschema.xml
similarity index 97%
rename from data/org.gnome.mines.gschema.xml
rename to data/org.gnome.Mines.gschema.xml
index 5e1760c..a88dad9 100644
--- a/data/org.gnome.mines.gschema.xml
+++ b/data/org.gnome.Mines.gschema.xml
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema id="org.gnome.mines" path="/org/gnome/mines/" gettext-domain="gnome-mines">
+  <schema id="org.gnome.Mines" path="/org/gnome/Mines/" gettext-domain="gnome-mines">
     <key name="theme" type="s">
       <default>'bgcolors'</default>
       <summary>The theme to use</summary>
diff --git a/meson.build b/meson.build
index ab0e168..afa1b80 100644
--- a/meson.build
+++ b/meson.build
@@ -7,6 +7,8 @@ project ('gnome-mines', ['vala', 'c'],
          ],
          meson_version: '>= 0.37.1')
 
+app_id = 'org.gnome.Mines'
+
 gnome = import ('gnome')
 i18n = import ('i18n')
 
diff --git a/org.gnome.mines.json b/org.gnome.Mines.json
similarity index 80%
rename from org.gnome.mines.json
rename to org.gnome.Mines.json
index 706fed8..8360a28 100644
--- a/org.gnome.mines.json
+++ b/org.gnome.Mines.json
@@ -1,5 +1,5 @@
 {
-    "app-id" : "org.gnome.mines",
+    "app-id" : "org.gnome.Mines",
     "runtime" : "org.gnome.Platform",
     "runtime-version" : "master",
     "sdk" : "org.gnome.Sdk",
@@ -7,9 +7,6 @@
     "tags" : [
         "nightly"
     ],
-    "copy-icon" : true,
-    "rename-icon" : "gnome-mines",
-    "rename-desktop-file" : "gnome-mines.desktop",
     "desktop-file-name-prefix" : "(Nightly) ",
     "finish-args" : [
         "--share=ipc",
@@ -20,11 +17,6 @@
         "--talk-name=ca.desrt.dconf",
         "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
     ],
-    "build-options" : {
-        "cflags" : "-O2 -g",
-        "env" : {
-        }
-    },
     "cleanup" : [
         "/include",
         "/lib/*.la",
@@ -36,6 +28,7 @@
         "org.gnome.games-support.modules.json",
         {
             "name" : "gnome-mines",
+            "buildsystem": "meson",
             "sources" : [
                 {
                     "type" : "git",
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a9ac669..5a75b37 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,8 @@
 # List of source files containing translatable strings.
 # Please keep this file in alphabetical order.
-data/gnome-mines.appdata.xml.in
-data/gnome-mines.desktop.in
-data/org.gnome.mines.gschema.xml
+data/org.gnome.Mines.appdata.xml.in
+data/org.gnome.Mines.desktop.in
+data/org.gnome.Mines.gschema.xml
 src/help-overlay.ui
 src/interface.ui
 src/gnome-mines.vala
diff --git a/src/gnome-mines.gresource.xml b/src/gnome-mines.gresource.xml
index 5f11eb7..3f657c1 100644
--- a/src/gnome-mines.gresource.xml
+++ b/src/gnome-mines.gresource.xml
@@ -4,7 +4,7 @@
     <file preprocess="xml-stripblanks">interface.ui</file>
     <file>gnome-mines.css</file>
   </gresource>
-  <gresource prefix="/org/gnome/mines/gtk">
+  <gresource prefix="/org/gnome/Mines/gtk">
     <file preprocess="xml-stripblanks">help-overlay.ui</file>
   </gresource>
 </gresources>
diff --git a/src/gnome-mines.vala b/src/gnome-mines.vala
index 1e2deb6..1e33d6c 100644
--- a/src/gnome-mines.vala
+++ b/src/gnome-mines.vala
@@ -115,7 +115,7 @@ public class Mines : Gtk.Application
 
     public Mines ()
     {
-        Object (application_id: "org.gnome.mines", flags: ApplicationFlags.FLAGS_NONE);
+        Object (application_id: "org.gnome.Mines", flags: ApplicationFlags.FLAGS_NONE);
 
         add_main_option_entries (option_entries);
     }
@@ -165,7 +165,7 @@ public class Mines : Gtk.Application
 
         Environment.set_application_name (_("Mines"));
 
-        settings = new Settings ("org.gnome.mines");
+        settings = new Settings ("org.gnome.Mines");
         settings.delay ();
 
         if (game_mode != -1)
@@ -869,7 +869,7 @@ public class Mines : Gtk.Application
                                "artists", artists,
                                "documenters", documenters,
                                "translator-credits", _("translator-credits"),
-                               "logo-icon-name", "gnome-mines", "website",
+                               "logo-icon-name", "org.gnome.Mines", "website",
                                "https://wiki.gnome.org/Apps/Mines";,
                                null);
     }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]