[ghex: 1/2] make the app-id consistent

[Kalev Lember <klember src gnome org>]

commit c0e4668f1e2e4de584d0a7f17d92852103c10eff
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Mon Dec 10 22:38:42 2018 +0100

    make the app-id consistent
    
    rename desktop, appdata, icons to org.gnome.GHex
    add missing tags to the appdata

 data/meson.build                                            |   8 ++++----
 data/{ghex.appdata.xml.in => org.gnome.GHex.appdata.xml.in} |  11 ++++++++++-
 data/{ghex.desktop.in => org.gnome.GHex.desktop.in}         |   2 +-
 icons/hicolor/16x16/apps/{ghex.png => org.gnome.GHex.png}   | Bin
 icons/hicolor/22x22/apps/{ghex.png => org.gnome.GHex.png}   | Bin
 icons/hicolor/24x24/apps/{ghex.png => org.gnome.GHex.png}   | Bin
 icons/hicolor/256x256/apps/{ghex.png => org.gnome.GHex.png} | Bin
 icons/hicolor/32x32/apps/{ghex.png => org.gnome.GHex.png}   | Bin
 icons/hicolor/48x48/apps/{ghex.png => org.gnome.GHex.png}   | Bin
 icons/hicolor/512x512/apps/{ghex.png => org.gnome.GHex.png} | Bin
 .../apps/{ghex-symbolic.svg => org.gnome.GHex-symbolic.svg} |   0
 po/POTFILES.in                                              |   4 ++--
 src/ghex.gresource.xml                                      |   4 ++--
 src/main.c                                                  |   4 ++--
 src/ui.c                                                    |   2 +-
 15 files changed, 22 insertions(+), 13 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 796d78c..2263771 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -4,8 +4,8 @@ install_data(
 )
 
 ghex_desktop = i18n.merge_file(
-  input: 'ghex.desktop.in',
-  output: 'ghex.desktop',
+  input: 'org.gnome.GHex.desktop.in',
+  output: 'org.gnome.GHex.desktop',
   po_dir: ghex_po_dir,
   type: 'desktop',
   install_dir: ghex_applicationsdir,
@@ -42,8 +42,8 @@ configure_file(
 )
 
 ghex_appdata = i18n.merge_file(
-  input: 'ghex.appdata.xml.in',
-  output: 'ghex.appdata.xml',
+  input: 'org.gnome.GHex.appdata.xml.in',
+  output: 'org.gnome.GHex.appdata.xml',
   po_dir: ghex_po_dir,
   install_dir: ghex_appdatadir,
   install: true,
diff --git a/data/ghex.appdata.xml.in b/data/org.gnome.GHex.appdata.xml.in
similarity index 90%
rename from data/ghex.appdata.xml.in
rename to data/org.gnome.GHex.appdata.xml.in
index 60bdb52..d61a786 100644
--- a/data/ghex.appdata.xml.in
+++ b/data/org.gnome.GHex.appdata.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>ghex.desktop</id>
+  <id>org.gnome.GHex</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
   <name>GNOME Hex Editor</name>
@@ -26,10 +26,19 @@
     <kudo>ModernToolkit</kudo>
     <kudo>UserDocs</kudo>
   </kudos>
+  <provides>
+    <binary>ghex</binary>
+  </provides>
+  <releases>
+    <release version="3.18.3" date="2016-10-12"/>
+    <release version="3.18.2" date="2016-06-13"/>
+  </releases>
   <url type="homepage">https://wiki.gnome.org/Apps/Ghex</url>
   <url type="bugtracker">https://gitlab.gnome.org/GNOME/ghex/issues</url>
   <url type="donation">http://www.gnome.org/friends/</url>
   <url type="help">https://help.gnome.org/users/ghex/stable/</url>
+  <launchable type="desktop-id">org.gnome.GHex.desktop</launchable>
+  <developer_name>The GNOME Project</developer_name>
   <update_contact>kalevlember_at_gmail.com</update_contact>
   <project_group>GNOME</project_group>
   <translation type="gettext">ghex-3.0</translation>
diff --git a/data/ghex.desktop.in b/data/org.gnome.GHex.desktop.in
similarity index 96%
rename from data/ghex.desktop.in
rename to data/org.gnome.GHex.desktop.in
index a1c4d25..0c9c404 100644
--- a/data/ghex.desktop.in
+++ b/data/org.gnome.GHex.desktop.in
@@ -8,6 +8,6 @@ Exec=ghex %F
 Terminal=false
 Type=Application
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=ghex
+Icon=org.gnome.GHex
 Categories=GNOME;GTK;Development;
 StartupNotify=true
diff --git a/icons/hicolor/16x16/apps/ghex.png b/icons/hicolor/16x16/apps/org.gnome.GHex.png
similarity index 100%
rename from icons/hicolor/16x16/apps/ghex.png
rename to icons/hicolor/16x16/apps/org.gnome.GHex.png
diff --git a/icons/hicolor/22x22/apps/ghex.png b/icons/hicolor/22x22/apps/org.gnome.GHex.png
similarity index 100%
rename from icons/hicolor/22x22/apps/ghex.png
rename to icons/hicolor/22x22/apps/org.gnome.GHex.png
diff --git a/icons/hicolor/24x24/apps/ghex.png b/icons/hicolor/24x24/apps/org.gnome.GHex.png
similarity index 100%
rename from icons/hicolor/24x24/apps/ghex.png
rename to icons/hicolor/24x24/apps/org.gnome.GHex.png
diff --git a/icons/hicolor/256x256/apps/ghex.png b/icons/hicolor/256x256/apps/org.gnome.GHex.png
similarity index 100%
rename from icons/hicolor/256x256/apps/ghex.png
rename to icons/hicolor/256x256/apps/org.gnome.GHex.png
diff --git a/icons/hicolor/32x32/apps/ghex.png b/icons/hicolor/32x32/apps/org.gnome.GHex.png
similarity index 100%
rename from icons/hicolor/32x32/apps/ghex.png
rename to icons/hicolor/32x32/apps/org.gnome.GHex.png
diff --git a/icons/hicolor/48x48/apps/ghex.png b/icons/hicolor/48x48/apps/org.gnome.GHex.png
similarity index 100%
rename from icons/hicolor/48x48/apps/ghex.png
rename to icons/hicolor/48x48/apps/org.gnome.GHex.png
diff --git a/icons/hicolor/512x512/apps/ghex.png b/icons/hicolor/512x512/apps/org.gnome.GHex.png
similarity index 100%
rename from icons/hicolor/512x512/apps/ghex.png
rename to icons/hicolor/512x512/apps/org.gnome.GHex.png
diff --git a/icons/hicolor/scalable/apps/ghex-symbolic.svg 
b/icons/hicolor/scalable/apps/org.gnome.GHex-symbolic.svg
similarity index 100%
rename from icons/hicolor/scalable/apps/ghex-symbolic.svg
rename to icons/hicolor/scalable/apps/org.gnome.GHex-symbolic.svg
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 74d350a..fb78d31 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-data/ghex.appdata.xml.in
-data/ghex.desktop.in
+data/org.gnome.GHex.appdata.xml.in
+data/org.gnome.GHex.desktop.in
 src/chartable.c
 src/config.c
 src/converter.c
diff --git a/src/ghex.gresource.xml b/src/ghex.gresource.xml
index 4cccbc5..7c647e3 100644
--- a/src/ghex.gresource.xml
+++ b/src/ghex.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/ghex">
-    <file preprocess="xml-stripblanks">ghex-ui.xml</file>
+  <gresource prefix="/org/gnome/GHex">
+    <file preprocess="xml-stripblanks" compressed="true">ghex-ui.xml</file>
   </gresource>
 </gresources>
diff --git a/src/main.c b/src/main.c
index d999571..1cf121d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -107,7 +107,7 @@ main(int argc, char **argv)
        }
 
        /* Set default window icon */
-       gtk_window_set_default_icon_name ("ghex");
+       gtk_window_set_default_icon_name ("org.gnome.GHex");
 
        /* load preferences */
        ghex_init_configuration();
@@ -115,7 +115,7 @@ main(int argc, char **argv)
        /* accessibility setup */
        setup_factory();
 
-       application = gtk_application_new ("org.gnome.GHexApplication",
+       application = gtk_application_new ("org.gnome.GHex",
                                           G_APPLICATION_NON_UNIQUE);
        g_signal_connect (application, "activate",
                          G_CALLBACK (ghex_activate), NULL);
diff --git a/src/ui.c b/src/ui.c
index db4b68a..42d8eb7 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -185,7 +185,7 @@ about_cb (GtkAction  *action,
                               "copyright", copyright,
                               "documenters", documentation_credits,
                               "license", license_translated,
-                              "logo-icon-name", PACKAGE_NAME,
+                              "logo-icon-name", "org.gnome.GHex",
                               "program-name", "GHex",
                               "title", _("About GHex"),
                               "translator-credits", _("translator-credits"),