GNOME.org
 

[gnome-robots: 3/4] unify app-id by using org.gnome.Robots

commit 114470909533cbdcda7ecc68085a4993c8f4fe19
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Sun Jan 13 12:50:36 2019 +0100

    unify app-id by using org.gnome.Robots

 data/meson.build                     | 11 +++++----
 data/org.gnome.Robots.appdata.xml.in | 10 +++++---
 data/org.gnome.Robots.desktop.in     |  2 +-
 help/meson.build                     | 48 ++++++++++++++++++------------------
 meson.build                          | 12 +++------
 po/POTFILES.in                       |  6 ++---
 src/gnome-robots.c                   |  8 +++---
 src/gnome-robots.gresource.xml       |  2 +-
 src/meson.build                      |  3 ++-
 9 files changed, 52 insertions(+), 50 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 62550f3..b6a0830 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -57,7 +57,7 @@ install_data(
         'games/robots2_easy.cfg',
         'games/robots_with_safe_teleport.cfg'
     ],
-    install_dir: join_paths(datadir, 'games') 
+    install_dir: join_paths(pkgdatadir, 'games') 
 )
 
 install_data(
@@ -66,7 +66,7 @@ install_data(
         'pixmaps/splat.png',
         'pixmaps/yahoo.png'
     ],
-    install_dir: join_paths(datadir, 'pixmaps')
+    install_dir: join_paths(pkgdatadir, 'pixmaps')
 )
 
 install_data(
@@ -77,7 +77,7 @@ install_data(
         'sounds/victory.ogg',
         'sounds/yahoo.ogg'
     ],
-    install_dir: join_paths(datadir, 'sounds')
+    install_dir: join_paths(pkgdatadir, 'sounds')
 )
 
 install_data(
@@ -94,5 +94,6 @@ install_data(
         'themes/toasters.png',
         'themes/ufo.svg'
     ],
-    install_dir: join_paths(datadir, 'themes')
-)
\ No newline at end of file
+    install_dir: join_paths(pkgdatadir, 'themes')
+)
+subdir('icons')
\ No newline at end of file
diff --git a/data/org.gnome.Robots.appdata.xml.in b/data/org.gnome.Robots.appdata.xml.in
index 19e4c29..6c385b4 100644
--- a/data/org.gnome.Robots.appdata.xml.in
+++ b/data/org.gnome.Robots.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2013 Michael Catanzaro -->
-<component type="desktop">
-  <id>gnome-robots.desktop</id>
+<component type="desktop-application">
+  <id>org.gnome.Robots</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <name>GNOME Robots</name>
@@ -29,8 +29,12 @@
       <image>https://people.gnome.org/~mcatanzaro/gnome-robots.png</image>
     </screenshot>
   </screenshots>
+  <provides>
+    <id>gnome-robots.desktop</id>
+  </provides>
+  <launchable type="desktop-id">org.gnome.Robots.desktop</launchable>
   <url type="homepage">https://wiki.gnome.org/Apps/Robots</url>
-  <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-robots</url>
+  <url type="bugtracker">https://gitlab.gnome.org/GNOME/gnome-robots/issues</url>
   <url type="donation">http://www.gnome.org/friends/</url>
   <url type="help">https://help.gnome.org/users/gnome-robots/stable/</url>
   <url type="translate">https://wiki.gnome.org/TranslationProject</url>
diff --git a/data/org.gnome.Robots.desktop.in b/data/org.gnome.Robots.desktop.in
index 7692ae9..b518cdc 100644
--- a/data/org.gnome.Robots.desktop.in
+++ b/data/org.gnome.Robots.desktop.in
@@ -5,7 +5,7 @@ Comment=Avoid the robots and make them crash into each other
 Keywords=game;arcade;teleport;
 Exec=gnome-robots
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=gnome-robots
+Icon=org.gnome.Robots
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Game;ArcadeGame;
diff --git a/help/meson.build b/help/meson.build
index 5eb9579..07788be 100644
--- a/help/meson.build
+++ b/help/meson.build
@@ -1,27 +1,27 @@
 help_media = [
-    'anthills-high-risk.png',
-    'anthills-low-risk.png',
-    'boo-high-risk.png',
-    'boo-low-risk.png',
-    'cows-high-risk.png',
-    'cows-low-risk.png',
-    'eggs-high-risk.png',
-    'eggs-low-risk.png',
-    'gnome-robots.png',
-    'gnomes-high-risk.png',
-    'gnomes-low-risk.png',
-    'mice-high-risk.png',
-    'mice-low-risk.png',
-    'robots-high-risk.png',
-    'robots-low-risk.png',
-    'spills-high-risk.png',
-    'spills-low-risk.png',
-    'stormclouds-high-risk.png',
-    'stormclouds-low-risk.png',
-    'toasters-high-risk.png',
-    'toasters-low-risk.png',
-    'ufo-high-risk.png',
-    'ufo-low-risk.png'
+    'figures/anthills-high-risk.png',
+    'figures/anthills-low-risk.png',
+    'figures/boo-high-risk.png',
+    'figures/boo-low-risk.png',
+    'figures/cows-high-risk.png',
+    'figures/cows-low-risk.png',
+    'figures/eggs-high-risk.png',
+    'figures/eggs-low-risk.png',
+    'figures/gnome-robots.png',
+    'figures/gnomes-high-risk.png',
+    'figures/gnomes-low-risk.png',
+    'figures/mice-high-risk.png',
+    'figures/mice-low-risk.png',
+    'figures/robots-high-risk.png',
+    'figures/robots-low-risk.png',
+    'figures/spills-high-risk.png',
+    'figures/spills-low-risk.png',
+    'figures/stormclouds-high-risk.png',
+    'figures/stormclouds-low-risk.png',
+    'figures/toasters-high-risk.png',
+    'figures/toasters-low-risk.png',
+    'figures/ufo-high-risk.png',
+    'figures/ufo-low-risk.png'
 ]
 
 help_pages = [
@@ -32,7 +32,7 @@ help_pages = [
     'game-types.page',
     'index.page',
     'legal.xml',
-    'moves.pages',
+    'moves.page',
     'scores.page'
 ]
 
diff --git a/meson.build b/meson.build
index b3d8252..fde4119 100644
--- a/meson.build
+++ b/meson.build
@@ -14,20 +14,16 @@ rsvg_dependency = dependency('librsvg-2.0', version: '>= 2.36.2')
 gnome_games_dependency = dependency('libgnome-games-support-1')
 canberra_gtk3_dependency = dependency('libcanberra-gtk3', version: '>= 0.26')
 
-datadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
+pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
+
 
 config_h = configuration_data()
 config_h.set_quoted('PACKAGE', meson.project_name())
-config_h.set_quoted('PACKAGE_NAME', 'Robots')
-config_h.set_quoted('PACKAGE_TARNAME', meson.project_name())
-config_h.set_quoted('PACKAGE_STRING', 'Robots @0@'.format(meson.project_version()))
-config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
-config_h.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/gnome-robots/issues')
-config_h.set_quoted('PACKAGE_URL', 'https://wiki.gnome.org/Apps/Robots')
 config_h.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 config_h.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
 config_h.set_quoted('VERSION', meson.project_version())
-config_h.set_quoted('DATA_DIRECTORY', datadir)
+config_h.set_quoted('DATA_DIRECTORY', pkgdatadir)
+config_h.set_quoted('SOUND_DIRECTORY', join_paths(pkgdatadir, 'sounds'))
 
 
 subdir('data')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3d7a8f7..930522b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,9 +1,9 @@
 # List of source files containing translatable strings.
 # Please keep this file in alphabetical order.
 data/app-menu.ui
-data/gnome-robots.appdata.xml.in
-data/gnome-robots.desktop.in
-data/org.gnome.robots.gschema.xml
+data/org.gnome.Robots.appdata.xml.in
+data/org.gnome.Robots.desktop.in
+data/org.gnome.Robots.gschema.xml
 src/game.c
 src/games-controls.c
 src/gnome-robots.c
diff --git a/src/gnome-robots.c b/src/gnome-robots.c
index fabdec1..2958de2 100644
--- a/src/gnome-robots.c
+++ b/src/gnome-robots.c
@@ -229,7 +229,7 @@ about_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data)
                         "artists", artists,
                         "documenters", documenters,
                         "translator-credits", _("translator-credits"),
-                        "logo-icon-name", "gnome-robots",
+                        "logo-icon-name", "org.gnome.Robots",
                         "website",
                         "https://wiki.gnome.org/Apps/Robots";,
                         NULL);
@@ -314,9 +314,9 @@ startup (GtkApplication *app, gpointer user_data)
 
   g_set_application_name (_("Robots"));
 
-  settings = g_settings_new ("org.gnome.robots");
+  settings = g_settings_new ("org.gnome.Robots");
 
-  gtk_window_set_default_icon_name ("gnome-robots");
+  gtk_window_set_default_icon_name ("org.gnome.Robots");
 }
 
 static void
@@ -505,7 +505,7 @@ main (int argc, char *argv[])
 
   GtkApplication *app;
 
-  app = gtk_application_new ("org.gnome.robots", G_APPLICATION_FLAGS_NONE);
+  app = gtk_application_new ("org.gnome.Robots", G_APPLICATION_FLAGS_NONE);
 
   g_signal_connect (app, "startup", G_CALLBACK (startup), NULL);
   g_signal_connect (app, "shutdown", G_CALLBACK (shutdown), NULL);
diff --git a/src/gnome-robots.gresource.xml b/src/gnome-robots.gresource.xml
index 5bad0f5..32579e0 100644
--- a/src/gnome-robots.gresource.xml
+++ b/src/gnome-robots.gresource.xml
@@ -4,7 +4,7 @@
     <file preprocess="xml-stripblanks" alias="robots.ui">../data/robots.ui</file>
     <file alias="robots.css">../data/robots.css</file>
   </gresource> -->
-  <gresource prefix="/org/gnome/robots/gtk">
+  <gresource prefix="/org/gnome/Robots/gtk">
     <file preprocess="xml-stripblanks" alias="menus.ui">../data/app-menu.ui</file>
   </gresource>
 </gresources>
diff --git a/src/meson.build b/src/meson.build
index e8096e3..d2b1935 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -9,7 +9,8 @@ sources = files(
     'gnome-robots.c',
     'graphics.c',
     'keyboard.c',
-    'properties.c'
+    'properties.c',
+    'sound.c'
 )
 resources = gnome.compile_resources(
     'resources',
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]