GNOME.org
 

[iagno] Use org.gnome.Reversi app-id.

commit 75a985b21ca83800bdf7293d93b2165e72060485
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Mon Feb 4 16:35:09 2019 +0100

    Use org.gnome.Reversi app-id.
    
    Adaptation of the Bilal Elmoussaoui
    patch for changing app-id in MR !4.

 data/iagno.gresource.xml                                    |   2 +-
 .../16x16/{org.gnome.iagno.png => org.gnome.Reversi.png}    | Bin
 .../22x22/{org.gnome.iagno.png => org.gnome.Reversi.png}    | Bin
 .../24x24/{org.gnome.iagno.png => org.gnome.Reversi.png}    | Bin
 .../256x256/{org.gnome.iagno.png => org.gnome.Reversi.png}  | Bin
 .../32x32/{org.gnome.iagno.png => org.gnome.Reversi.png}    | Bin
 .../48x48/{org.gnome.iagno.png => org.gnome.Reversi.png}    | Bin
 ...me.iagno-symbolic.svg => org.gnome.Reversi-symbolic.svg} |   2 +-
 ...agno.appdata.xml.in => org.gnome.Reversi.appdata.xml.in} |   6 +++---
 ....gnome.iagno.desktop.in => org.gnome.Reversi.desktop.in} |   2 +-
 ...nome.iagno.gschema.xml => org.gnome.Reversi.gschema.xml} |   6 +++---
 meson.build                                                 |   2 +-
 org.gnome.iagno.json => org.gnome.Reversi.json              |  12 +-----------
 po/POTFILES.in                                              |   6 +++---
 src/game-window.vala                                        |   2 +-
 src/iagno.vala                                              |  12 ++++++------
 src/themes-dialog.vala                                      |   2 +-
 17 files changed, 22 insertions(+), 32 deletions(-)
---
diff --git a/data/iagno.gresource.xml b/data/iagno.gresource.xml
index c708194..3ac073e 100644
--- a/data/iagno.gresource.xml
+++ b/data/iagno.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/iagno/ui">
+  <gresource prefix="/org/gnome/Reversi/ui">
     <file preprocess="xml-stripblanks" compressed="true" alias="game-window.ui">ui/iagno.ui</file>
     <file preprocess="xml-stripblanks" compressed="true" alias="themes.ui">ui/iagno-themes.ui</file>
     <file preprocess="xml-stripblanks" compressed="true" alias="iagno-screens.ui">ui/iagno-screens.ui</file>
diff --git a/data/icons/hicolor/16x16/org.gnome.iagno.png b/data/icons/hicolor/16x16/org.gnome.Reversi.png
similarity index 100%
rename from data/icons/hicolor/16x16/org.gnome.iagno.png
rename to data/icons/hicolor/16x16/org.gnome.Reversi.png
diff --git a/data/icons/hicolor/22x22/org.gnome.iagno.png b/data/icons/hicolor/22x22/org.gnome.Reversi.png
similarity index 100%
rename from data/icons/hicolor/22x22/org.gnome.iagno.png
rename to data/icons/hicolor/22x22/org.gnome.Reversi.png
diff --git a/data/icons/hicolor/24x24/org.gnome.iagno.png b/data/icons/hicolor/24x24/org.gnome.Reversi.png
similarity index 100%
rename from data/icons/hicolor/24x24/org.gnome.iagno.png
rename to data/icons/hicolor/24x24/org.gnome.Reversi.png
diff --git a/data/icons/hicolor/256x256/org.gnome.iagno.png b/data/icons/hicolor/256x256/org.gnome.Reversi.png
similarity index 100%
rename from data/icons/hicolor/256x256/org.gnome.iagno.png
rename to data/icons/hicolor/256x256/org.gnome.Reversi.png
diff --git a/data/icons/hicolor/32x32/org.gnome.iagno.png b/data/icons/hicolor/32x32/org.gnome.Reversi.png
similarity index 100%
rename from data/icons/hicolor/32x32/org.gnome.iagno.png
rename to data/icons/hicolor/32x32/org.gnome.Reversi.png
diff --git a/data/icons/hicolor/48x48/org.gnome.iagno.png b/data/icons/hicolor/48x48/org.gnome.Reversi.png
similarity index 100%
rename from data/icons/hicolor/48x48/org.gnome.iagno.png
rename to data/icons/hicolor/48x48/org.gnome.Reversi.png
diff --git a/data/icons/hicolor/symbolic/org.gnome.iagno-symbolic.svg 
b/data/icons/hicolor/symbolic/org.gnome.Reversi-symbolic.svg
similarity index 99%
rename from data/icons/hicolor/symbolic/org.gnome.iagno-symbolic.svg
rename to data/icons/hicolor/symbolic/org.gnome.Reversi-symbolic.svg
index 43ed5d2..8e27fca 100644
--- a/data/icons/hicolor/symbolic/org.gnome.iagno-symbolic.svg
+++ b/data/icons/hicolor/symbolic/org.gnome.Reversi-symbolic.svg
@@ -15,7 +15,7 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="iagno-symbolic.svg">
+   sodipodi:docname="org.gnome.Reversi-symbolic.svg">
   <defs
      id="defs4" />
   <sodipodi:namedview
diff --git a/data/org.gnome.iagno.appdata.xml.in b/data/org.gnome.Reversi.appdata.xml.in
similarity index 96%
rename from data/org.gnome.iagno.appdata.xml.in
rename to data/org.gnome.Reversi.appdata.xml.in
index 8d409e2..a2f7fbc 100644
--- a/data/org.gnome.iagno.appdata.xml.in
+++ b/data/org.gnome.Reversi.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2013 Michael Catanzaro and contributors -->
-<component type="desktop">
-  <id>org.gnome.iagno</id>
+<component type="desktop-application">
+  <id>org.gnome.Reversi</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <name>Iagno</name>
@@ -31,8 +31,8 @@
   <url type="translate">https://wiki.gnome.org/TranslationProject</url>
   <update_contact>arnaud.bonatti_at_gmail.com</update_contact>
   <project_group>GNOME</project_group>
+  <launchable type="desktop-id">org.gnome.Reversi.desktop</launchable>
   <kudos>
-    <kudo>AppMenu</kudo>
     <kudo>HiDpiIcon</kudo>
     <kudo>ModernToolkit</kudo>
     <kudo>UserDocs</kudo>
diff --git a/data/org.gnome.iagno.desktop.in b/data/org.gnome.Reversi.desktop.in
similarity index 96%
rename from data/org.gnome.iagno.desktop.in
rename to data/org.gnome.Reversi.desktop.in
index ba2f327..ea0c230 100644
--- a/data/org.gnome.iagno.desktop.in
+++ b/data/org.gnome.Reversi.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=org.gnome.iagno
+Icon=org.gnome.Reversi
 Name=Iagno
 GenericName=Reversi
 Comment=Dominate the board in a classic version of Reversi
diff --git a/data/org.gnome.iagno.gschema.xml b/data/org.gnome.Reversi.gschema.xml
similarity index 90%
rename from data/org.gnome.iagno.gschema.xml
rename to data/org.gnome.Reversi.gschema.xml
index d1d6bd3..36c5f01 100644
--- a/data/org.gnome.iagno.gschema.xml
+++ b/data/org.gnome.Reversi.gschema.xml
@@ -1,10 +1,10 @@
 <schemalist>
-  <enum id="org.gnome.iagno.Color">
+  <enum id="org.gnome.Reversi.Color">
     <value value="0" nick="dark"/>
     <value value="1" nick="light"/>
   </enum>
 
-  <schema id="org.gnome.iagno" path="/org/gnome/iagno/" gettext-domain="iagno">
+  <schema id="org.gnome.Reversi" path="/org/gnome/iagno/" gettext-domain="iagno">
     <key name="computer-level" type="i">
       <default>1</default>
       <range min="1" max="3" />
@@ -16,7 +16,7 @@
       <range min="1" max="2" />
       <summary>Whether to play against the computer or another human.</summary>
     </key>
-    <key name="color" enum="org.gnome.iagno.Color">
+    <key name="color" enum="org.gnome.Reversi.Color">
       <default>'dark'</default>
       <summary>Color to play as</summary>
       <description>Whether to play as Dark or Light. Ignored for two-player games.</description>
diff --git a/meson.build b/meson.build
index 113a64f..a560e8a 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project('iagno', ['vala', 'c'],
     version: '3.30.0')
 
 
-project_id = 'org.gnome.iagno'
+project_id = 'org.gnome.Reversi'
 i18n = import('i18n')
 # used to install help
 gnome = import('gnome')
diff --git a/org.gnome.iagno.json b/org.gnome.Reversi.json
similarity index 78%
rename from org.gnome.iagno.json
rename to org.gnome.Reversi.json
index d892bbb..5a500af 100644
--- a/org.gnome.iagno.json
+++ b/org.gnome.Reversi.json
@@ -1,12 +1,9 @@
 {
-    "app-id" : "org.gnome.iagno",
+    "app-id" : "org.gnome.Reversi",
     "runtime" : "org.gnome.Platform",
     "runtime-version" : "master",
     "sdk" : "org.gnome.Sdk",
     "command" : "iagno",
-    "rename-desktop-file" : "iagno.desktop",
-    "rename-icon" : "iagno",
-    "rename-appdata-file" : "iagno.appdata.xml",
     "tags" : [
         "nightly"
     ],
@@ -21,13 +18,6 @@
         "--talk-name=ca.desrt.dconf",
         "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
     ],
-    "build-options" : {
-        "cflags" : "-O2 -g",
-        "cxxflags" : "-O2 -g",
-        "env" : {
-            "V" : "1"
-        }
-    },
     "cleanup" : [
         "/include",
         "/lib/pkgconfig",
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 22334c0..86f5dbe 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
 # List of source files containing translatable strings.
 # Please keep this file in alphabetical order.
-data/org.gnome.iagno.appdata.xml.in
-data/org.gnome.iagno.desktop.in
+data/org.gnome.Reversi.appdata.xml.in
+data/org.gnome.Reversi.desktop.in
 data/ui/iagno-screens.ui
 data/ui/iagno-themes.ui
 data/ui/iagno.ui
@@ -9,7 +9,7 @@ data/themes/adwaita.theme.desktop.in
 data/themes/classic.theme.desktop.in
 data/themes/high_contrast.theme.desktop.in
 data/themes/sun_and_star.theme.desktop.in
-data/org.gnome.iagno.gschema.xml
+data/org.gnome.Reversi.gschema.xml
 src/computer-player.vala
 src/game.vala
 src/game-view.vala
diff --git a/src/game-window.vala b/src/game-window.vala
index 146a75c..e7d087b 100644
--- a/src/game-window.vala
+++ b/src/game-window.vala
@@ -28,7 +28,7 @@ public enum GameWindowFlags {
     SHOW_START_BUTTON;
 }
 
-[GtkTemplate (ui = "/org/gnome/iagno/ui/game-window.ui")]
+[GtkTemplate (ui = "/org/gnome/Reversi/ui/game-window.ui")]
 public class GameWindow : ApplicationWindow
 {
     /* settings */
diff --git a/src/iagno.vala b/src/iagno.vala
index 77884b8..8933c3a 100644
--- a/src/iagno.vala
+++ b/src/iagno.vala
@@ -84,14 +84,14 @@ public class Iagno : Gtk.Application
         Intl.textdomain (GETTEXT_PACKAGE);
 
         Environment.set_application_name (_("Iagno"));
-        Window.set_default_icon_name ("org.gnome.iagno");
+        Window.set_default_icon_name ("org.gnome.Reversi");
 
         return new Iagno ().run (args);
     }
 
     private Iagno ()
     {
-        Object (application_id: "org.gnome.iagno", flags: ApplicationFlags.FLAGS_NONE);
+        Object (application_id: "org.gnome.Reversi", flags: ApplicationFlags.FLAGS_NONE);
 
         add_main_option_entries (option_entries);
     }
@@ -133,7 +133,7 @@ public class Iagno : Gtk.Application
         base.startup ();
 
         /* Settings */
-        settings = new GLib.Settings ("org.gnome.iagno");
+        settings = new GLib.Settings ("org.gnome.Reversi");
 
         if (sound != null)
             settings.set_boolean ("sound", sound);
@@ -159,7 +159,7 @@ public class Iagno : Gtk.Application
         //  stderr.printf ("%s\n", _("Level should be 1 (easy), 2 (medium) or 3 (hard). Settings 
unchanged."));     // TODO better?
 
         /* UI parts */
-        Builder builder = new Builder.from_resource ("/org/gnome/iagno/ui/iagno-screens.ui");
+        Builder builder = new Builder.from_resource ("/org/gnome/Reversi/ui/iagno-screens.ui");
 
         view = new GameView ();
         view.move.connect (player_move_cb);
@@ -169,7 +169,7 @@ public class Iagno : Gtk.Application
         view.theme = settings.get_string ("theme");
 
         /* Window */
-        window = new GameWindow ("/org/gnome/iagno/ui/iagno.css",
+        window = new GameWindow ("/org/gnome/Reversi/ui/iagno.css",
                                  _("Iagno"),
                                  settings.get_int ("window-width"),
                                  settings.get_int ("window-height"),
@@ -280,7 +280,7 @@ public class Iagno : Gtk.Application
                            "authors", authors,
                            "documenters", documenters,
                            "translator-credits", _("translator-credits"),
-                           "logo-icon-name", "org.gnome.iagno",
+                           "logo-icon-name", "org.gnome.Reversi",
                            "website", "https://wiki.gnome.org/Apps/Iagno";,
                            null);
     }
diff --git a/src/themes-dialog.vala b/src/themes-dialog.vala
index 93f02d6..4e318c0 100644
--- a/src/themes-dialog.vala
+++ b/src/themes-dialog.vala
@@ -20,7 +20,7 @@
 
 using Gtk;
 
-[GtkTemplate (ui = "/org/gnome/iagno/ui/themes.ui")]
+[GtkTemplate (ui = "/org/gnome/Reversi/ui/themes.ui")]
 public class ThemesDialog : Dialog
 {
     private const string PREFIX = "theme-";
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]