From 7d7be8321613acf4a613894163b8468f107415de Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Sun, 24 Dec 2017 12:09:36 -0500 Subject: [PATCH] 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 --- ...io.github.Hexchat.ThemeManager.desktop.in} | 0 ...xml => io.github.Hexchat.ThemeManager.xml} | 0 ...ml.in => io.github.Hexchat.appdata.xml.in} | 6 ++++- ....in.in => io.github.Hexchat.desktop.in.in} | 0 data/misc/meson.build | 22 +++++++++---------- po/POTFILES | 6 ++--- po/POTFILES.skip | 2 +- .../notifications/notification-libnotify.c | 4 ++-- 8 files changed, 22 insertions(+), 18 deletions(-) rename data/misc/{htm.desktop.in => io.github.Hexchat.ThemeManager.desktop.in} (100%) rename data/misc/{htm-mime.xml => io.github.Hexchat.ThemeManager.xml} (100%) rename data/misc/{hexchat.appdata.xml.in => io.github.Hexchat.appdata.xml.in} (94%) rename data/misc/{hexchat.desktop.in.in => io.github.Hexchat.desktop.in.in} (100%) diff --git a/data/misc/htm.desktop.in b/data/misc/io.github.Hexchat.ThemeManager.desktop.in similarity index 100% rename from data/misc/htm.desktop.in rename to data/misc/io.github.Hexchat.ThemeManager.desktop.in diff --git a/data/misc/htm-mime.xml b/data/misc/io.github.Hexchat.ThemeManager.xml similarity index 100% rename from data/misc/htm-mime.xml rename to 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 similarity index 94% rename from data/misc/hexchat.appdata.xml.in rename to 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 @@ - hexchat.desktop + io.github.Hexchat.desktop HexChat HexChat CC0-1.0 @@ -22,6 +22,10 @@ Main Chat Window + + + hexchat.desktop + diff --git a/data/misc/hexchat.desktop.in.in b/data/misc/io.github.Hexchat.desktop.in.in similarity index 100% rename from data/misc/hexchat.desktop.in.in rename to 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);