Rename app-id to io.github.Hexchat

RDNS syntax is recommended for applications and this matches the
existing flatpak. Note that the dbus service and icons still need
renaming though the former is an API breakage.

Closes #2104
Closes #2103

8 files changed, 22 insertions, 18 deletions

diff --git a/data/misc/htm.desktop.in b/data/misc/io.github.Hexchat.ThemeManager.desktop.in
index 53cac289..53cac289 100644
--- a/data/misc/htm.desktop.in
+++ b/data/misc/io.github.Hexchat.ThemeManager.desktop.in
diff --git a/data/misc/htm-mime.xml b/data/misc/io.github.Hexchat.ThemeManager.xml
index f76b689b..f76b689b 100644
--- a/data/misc/htm-mime.xml
+++ b/data/misc/io.github.Hexchat.ThemeManager.xml
diff --git a/data/misc/hexchat.appdata.xml.in b/data/misc/io.github.Hexchat.appdata.xml.in
index 7ffaf3dc..97949597 100644
--- a/data/misc/hexchat.appdata.xml.in
+++ b/data/misc/io.github.Hexchat.appdata.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>hexchat.desktop</id>
+  <id>io.github.Hexchat.desktop</id>
   <name>HexChat</name>
   <developer_name>HexChat</developer_name>
   <metadata_license>CC0-1.0</metadata_license>
@@ -22,6 +22,10 @@
       <caption>Main Chat Window</caption>
     </screenshot>
   </screenshots>
+  <provides>
+    <!-- Renamed from this -->
+    <id>hexchat.desktop</id>
+  </provides>
   <releases>
     <release date="2016-12-10" version="2.12.4">
       <description>
diff --git a/data/misc/hexchat.desktop.in.in b/data/misc/io.github.Hexchat.desktop.in.in
index a5ff40d8..a5ff40d8 100644
--- a/data/misc/hexchat.desktop.in.in
+++ b/data/misc/io.github.Hexchat.desktop.in.in
diff --git a/data/misc/meson.build b/data/misc/meson.build
index b5532d63..9ece6192 100644
--- a/data/misc/meson.build
+++ b/data/misc/meson.build
@@ -3,8 +3,8 @@ desktop_utils = find_program('desktop-file-validate', required: false)
 
 if get_option('with-gtk')
   hexchat_appdata = i18n.merge_file(
-    input: 'hexchat.appdata.xml.in',
-    output: 'hexchat.appdata.xml',
+    input: 'io.github.Hexchat.appdata.xml.in',
+    output: 'io.github.Hexchat.appdata.xml',
     po_dir: '../../po',
     install: true,
     install_dir: join_paths(get_option('datadir'), 'appdata')
@@ -12,7 +12,7 @@ if get_option('with-gtk')
 
   appstream_util = find_program('appstream-util', required: false)
   if appstream_util.found()
-    test('Validate hexchat.appdata.xml', appstream_util,
+    test('Validate io.github.Hexchat.appdata.xml', appstream_util,
       args: ['validate', hexchat_appdata]
     )
   endif
@@ -25,14 +25,14 @@ if get_option('with-gtk')
   endif
 
   desktop_file = configure_file(
-    input: 'hexchat.desktop.in.in',
-    output: 'hexchat.desktop.in',
+    input: 'io.github.Hexchat.desktop.in.in',
+    output: 'io.github.Hexchat.desktop.in',
     configuration: desktop_conf
   )
 
   hexchat_desktop = i18n.merge_file(
     input: desktop_file,
-    output: 'hexchat.desktop',
+    output: 'io.github.Hexchat.desktop',
     po_dir: '../../po',
     type: 'desktop',
     install: true,
@@ -40,7 +40,7 @@ if get_option('with-gtk')
   )
 
   if desktop_utils.found()
-    test('Validate hexchat.desktop', desktop_utils,
+    test('Validate io.github.Hexchat.desktop', desktop_utils,
       args: [hexchat_desktop]
     )
   endif
@@ -48,8 +48,8 @@ endif
 
 if get_option('with-theme-manager')
   htm_desktop = i18n.merge_file(
-    input: 'htm.desktop.in',
-    output: 'htm.desktop',
+    input: 'io.github.Hexchat.ThemeManager.desktop.in',
+    output: 'io.github.Hexchat.ThemeManager.desktop',
     po_dir: '../../po',
     type: 'desktop',
     install: true,
@@ -57,12 +57,12 @@ if get_option('with-theme-manager')
   )
 
   if desktop_utils.found()
-    test('Validate htm.desktop', desktop_utils,
+    test('Validate io.github.Hexchat.ThemeManager.desktop', desktop_utils,
       args: [htm_desktop]
     )
   endif
 
-  install_data('htm-mime.xml',
+  install_data('io.github.Hexchat.ThemeManager.xml',
     install_dir: join_paths(get_option('datadir'), 'mime/packages')
   )
 endif
diff --git a/po/POTFILES b/po/POTFILES
index 057c9d72..0d1795d1 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1,6 +1,6 @@
-data/misc/hexchat.appdata.xml.in
-data/misc/hexchat.desktop.in.in
-data/misc/htm.desktop.in
+data/misc/io.github.Hexchat.appdata.xml.in
+data/misc/io.github.Hexchat.desktop.in.in
+data/misc/io.github.Hexchat.ThemeManager.desktop.in
 src/common/cfgfiles.c
 src/common/chanopt.c
 src/common/dcc.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 915e82d8..d3018f49 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +1 @@
-data/misc/hexchat.desktop.in.in
+data/misc/io.github.Hexchat.desktop.in.in
diff --git a/src/fe-gtk/notifications/notification-libnotify.c b/src/fe-gtk/notifications/notification-libnotify.c
index aa2d087a..ee417396 100644
--- a/src/fe-gtk/notifications/notification-libnotify.c
+++ b/src/fe-gtk/notifications/notification-libnotify.c
@@ -40,9 +40,9 @@ notification_backend_show (const char *title, const char *text)
 	notification = notify_notification_new (title, text, "hexchat", NULL);
 #endif
 #if NOTIFY_CHECK_VERSION(0,6,0)
-	notify_notification_set_hint (notification, "desktop-entry", g_variant_new_string ("hexchat"));
+	notify_notification_set_hint (notification, "desktop-entry", g_variant_new_string ("io.github.Hexchat"));
 #else
-	notify_notification_set_hint_string (notification, "desktop-entry", "hexchat");
+	notify_notification_set_hint_string (notification, "desktop-entry", "io.github.Hexchat");
 #endif
 
 	notify_notification_show (notification, NULL);