From 6535810ca356bf9c4d15fca34df4fb883e2a61a5 Mon Sep 17 00:00:00 2001 From: deepend-tildeclub Date: Fri, 22 May 2026 00:08:54 -0600 Subject: [PATCH] Rename app IDs to org.zoitechat.ZoiteChat --- .github/workflows/appimage-build.yml | 4 ++-- .github/workflows/flatpak-build.yml | 2 +- data/icons/meson.build | 4 ++-- data/misc/meson.build | 20 +++++++++---------- ...oitechat.ZoiteChat.Plugin.metainfo.xml.in} | 4 ++-- ... => org.zoitechat.ZoiteChat.desktop.in.in} | 4 ++-- ...> org.zoitechat.ZoiteChat.metainfo.xml.in} | 8 ++++---- ...chat.json => org.zoitechat.ZoiteChat.json} | 4 ++-- src/fe-gtk/fe-gtk.c | 2 +- .../notifications/notification-freedesktop.c | 4 ++-- src/fe-gtk/plugin-tray.c | 2 +- 11 files changed, 29 insertions(+), 29 deletions(-) rename data/misc/{net.zoite.Zoitechat.Plugin.metainfo.xml.in => org.zoitechat.ZoiteChat.Plugin.metainfo.xml.in} (78%) rename data/misc/{net.zoite.Zoitechat.desktop.in.in => org.zoitechat.ZoiteChat.desktop.in.in} (85%) rename data/misc/{net.zoite.Zoitechat.appdata.xml.in => org.zoitechat.ZoiteChat.metainfo.xml.in} (98%) rename flatpak/{net.zoite.Zoitechat.json => org.zoitechat.ZoiteChat.json} (96%) diff --git a/.github/workflows/appimage-build.yml b/.github/workflows/appimage-build.yml index e300a878..6e1a0d0e 100644 --- a/.github/workflows/appimage-build.yml +++ b/.github/workflows/appimage-build.yml @@ -261,8 +261,8 @@ jobs: ./linuxdeploy-x86_64.AppImage \ --appdir AppDir \ - --desktop-file AppDir/usr/share/applications/net.zoite.Zoitechat.desktop \ - --icon-file AppDir/usr/share/icons/hicolor/48x48/apps/net.zoite.Zoitechat.png \ + --desktop-file AppDir/usr/share/applications/org.zoitechat.ZoiteChat.desktop \ + --icon-file AppDir/usr/share/icons/hicolor/48x48/apps/org.zoitechat.ZoiteChat.png \ --custom-apprun ./AppRun \ --plugin gtk \ --output appimage diff --git a/.github/workflows/flatpak-build.yml b/.github/workflows/flatpak-build.yml index 2dd4d2c9..7d540366 100644 --- a/.github/workflows/flatpak-build.yml +++ b/.github/workflows/flatpak-build.yml @@ -33,7 +33,7 @@ jobs: uses: flatpak/flatpak-github-actions/flatpak-builder@v6 with: bundle: zoitechat.flatpak - manifest-path: flatpak/net.zoite.Zoitechat.json + manifest-path: flatpak/org.zoitechat.ZoiteChat.json cache: false restore-cache: false diff --git a/data/icons/meson.build b/data/icons/meson.build index 7d4c69c2..1b797c20 100644 --- a/data/icons/meson.build +++ b/data/icons/meson.build @@ -1,11 +1,11 @@ icondir = join_paths(get_option('datadir'), 'icons/hicolor') install_data( 'zoitechat.png', - rename: 'net.zoite.Zoitechat.png', + rename: 'org.zoitechat.ZoiteChat.png', install_dir: join_paths(icondir, '48x48/apps') ) install_data( 'zoitechat.svg', - rename: 'net.zoite.Zoitechat.svg', + rename: 'org.zoitechat.ZoiteChat.svg', install_dir: join_paths(icondir, 'scalable/apps') ) diff --git a/data/misc/meson.build b/data/misc/meson.build index 0c88f51b..b506a2f5 100644 --- a/data/misc/meson.build +++ b/data/misc/meson.build @@ -6,8 +6,8 @@ desktop_utils = find_program('desktop-file-validate', required: false) if get_option('gtk-frontend') if get_option('install-appdata') zoitechat_appdata = i18n.merge_file( - input: 'net.zoite.Zoitechat.appdata.xml.in', - output: 'net.zoite.Zoitechat.appdata.xml', + input: 'org.zoitechat.ZoiteChat.metainfo.xml.in', + output: 'org.zoitechat.ZoiteChat.metainfo.xml', po_dir: '../../po', install: true, install_dir: metainfodir @@ -15,7 +15,7 @@ if get_option('gtk-frontend') appstreamcli = find_program('appstreamcli', required: false) if appstreamcli.found() - test('Validate net.zoite.Zoitechat.appdata.xml', appstreamcli, + test('Validate org.zoitechat.ZoiteChat.metainfo.xml', appstreamcli, args: ['validate', zoitechat_appdata] ) endif @@ -29,14 +29,14 @@ if get_option('gtk-frontend') endif desktop_file = configure_file( - input: 'net.zoite.Zoitechat.desktop.in.in', - output: 'net.zoite.Zoitechat.desktop.in', + input: 'org.zoitechat.ZoiteChat.desktop.in.in', + output: 'org.zoitechat.ZoiteChat.desktop.in', configuration: desktop_conf ) zoitechat_desktop = i18n.merge_file( input: desktop_file, - output: 'net.zoite.Zoitechat.desktop', + output: 'org.zoitechat.ZoiteChat.desktop', po_dir: '../../po', type: 'desktop', install: true, @@ -44,7 +44,7 @@ if get_option('gtk-frontend') ) if desktop_utils.found() - test('Validate net.zoite.Zoitechat.desktop', desktop_utils, + test('Validate org.zoitechat.ZoiteChat.desktop', desktop_utils, args: [zoitechat_desktop] ) endif @@ -98,14 +98,14 @@ if get_option('plugin') conf.set('LICENSE', metainfo[2]) plugin_appdata = configure_file( - input: 'net.zoite.Zoitechat.Plugin.metainfo.xml.in', - output: 'net.zoite.Zoitechat.Plugin.@0@.metainfo.xml'.format(name), + input: 'org.zoitechat.ZoiteChat.Plugin.metainfo.xml.in', + output: 'org.zoitechat.ZoiteChat.Plugin.@0@.metainfo.xml'.format(name), configuration: conf, install_dir: get_option('install-plugin-metainfo') ? metainfodir : '', ) if appstreamcli.found() - test('Validate net.zoite.Zoitechat.Plugin.@0@.metainfo.xml'.format(name), appstreamcli, + test('Validate org.zoitechat.ZoiteChat.Plugin.@0@.metainfo.xml'.format(name), appstreamcli, args: ['validate', plugin_appdata] ) endif diff --git a/data/misc/net.zoite.Zoitechat.Plugin.metainfo.xml.in b/data/misc/org.zoitechat.ZoiteChat.Plugin.metainfo.xml.in similarity index 78% rename from data/misc/net.zoite.Zoitechat.Plugin.metainfo.xml.in rename to data/misc/org.zoitechat.ZoiteChat.Plugin.metainfo.xml.in index 4dde77a9..2cf8a4c8 100644 --- a/data/misc/net.zoite.Zoitechat.Plugin.metainfo.xml.in +++ b/data/misc/org.zoitechat.ZoiteChat.Plugin.metainfo.xml.in @@ -1,7 +1,7 @@ - net.zoite.Zoitechat.Plugin.@NAME@ - net.zoite.Zoitechat + org.zoitechat.ZoiteChat.Plugin.@NAME@ + org.zoitechat.ZoiteChat @NAME@ Plugin @SUMMARY@ https://zoitechat.org/ diff --git a/data/misc/net.zoite.Zoitechat.desktop.in.in b/data/misc/org.zoitechat.ZoiteChat.desktop.in.in similarity index 85% rename from data/misc/net.zoite.Zoitechat.desktop.in.in rename to data/misc/org.zoitechat.ZoiteChat.desktop.in.in index fd2522c4..06d336bb 100644 --- a/data/misc/net.zoite.Zoitechat.desktop.in.in +++ b/data/misc/org.zoitechat.ZoiteChat.desktop.in.in @@ -4,12 +4,12 @@ GenericName=IRC Client Comment=Chat with other people online Keywords=IM;Chat; Exec=@exec_command@ -Icon=net.zoite.Zoitechat +Icon=org.zoitechat.ZoiteChat Terminal=false Type=Application Categories=GTK;Network;IRCClient; StartupNotify=true -StartupWMClass=net.zoite.Zoitechat +StartupWMClass=org.zoitechat.ZoiteChat X-GNOME-UsesNotifications=true MimeType=x-scheme-handler/irc;x-scheme-handler/ircs; Actions=SafeMode; diff --git a/data/misc/net.zoite.Zoitechat.appdata.xml.in b/data/misc/org.zoitechat.ZoiteChat.metainfo.xml.in similarity index 98% rename from data/misc/net.zoite.Zoitechat.appdata.xml.in rename to data/misc/org.zoitechat.ZoiteChat.metainfo.xml.in index ae3321ab..211e2f06 100644 --- a/data/misc/net.zoite.Zoitechat.appdata.xml.in +++ b/data/misc/org.zoitechat.ZoiteChat.metainfo.xml.in @@ -1,8 +1,8 @@ - net.zoite.Zoitechat + org.zoitechat.ZoiteChat ZoiteChat - net.zoite.Zoitechat.desktop + org.zoitechat.ZoiteChat.desktop ZoiteChat @@ -26,7 +26,7 @@ - zoitechat.desktop + org.zoitechat.ZoiteChat.desktop @@ -339,7 +339,7 @@

This is largely a bug fix release though it has some large behind the scenes changes:

    -
  • Rename data files to use *net.zoite.Zoitechat* name
    • +
  • Rename data files to use *org.zoitechat.ZoiteChat* name
  • Add option (irc_reconnect_rejoin) to disable auto-rejoin on reconnect
  • Add ability to set custom tray icon separate of app icon
  • Fix Enchant 2.0+ support
    • diff --git a/flatpak/net.zoite.Zoitechat.json b/flatpak/org.zoitechat.ZoiteChat.json similarity index 96% rename from flatpak/net.zoite.Zoitechat.json rename to flatpak/org.zoitechat.ZoiteChat.json index 8adb58e7..1c4e563b 100644 --- a/flatpak/net.zoite.Zoitechat.json +++ b/flatpak/org.zoitechat.ZoiteChat.json @@ -1,5 +1,5 @@ { - "app-id": "net.zoite.Zoitechat", + "app-id": "org.zoitechat.ZoiteChat", "branch": "master", "runtime": "org.gnome.Platform", "runtime-version": "49", @@ -22,7 +22,7 @@ "--talk-name=org.mpris.MediaPlayer2.*" ], "add-extensions": { - "net.zoite.Zoitechat.Plugin": { + "org.zoitechat.ZoiteChat.Plugin": { "version": "49", "directory": "extensions", "add-ld-path": "lib", diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index 4e2b01c3..e10c7b2f 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -320,7 +320,7 @@ fe_args (int argc, char *argv[]) GError *error = NULL; GOptionContext *context; char *buffer; - const char *desktop_id = "net.zoite.Zoitechat"; + const char *desktop_id = "org.zoitechat.ZoiteChat"; #ifdef WIN32 char *base_path = NULL; char *locale_path = NULL; diff --git a/src/fe-gtk/notifications/notification-freedesktop.c b/src/fe-gtk/notifications/notification-freedesktop.c index 030309a4..03690c79 100644 --- a/src/fe-gtk/notifications/notification-freedesktop.c +++ b/src/fe-gtk/notifications/notification-freedesktop.c @@ -56,7 +56,7 @@ notification_backend_show (const char *title, const char *text) g_variant_builder_init (¶ms, G_VARIANT_TYPE ("(susssasa{sv}i)")); g_variant_builder_add (¶ms, "s", "zoitechat"); /* App name */ g_variant_builder_add (¶ms, "u", 0); /* ID, 0 means don't replace */ - g_variant_builder_add (¶ms, "s", "net.zoite.Zoitechat"); /* App icon */ + g_variant_builder_add (¶ms, "s", "org.zoitechat.ZoiteChat"); /* App icon */ g_variant_builder_add (¶ms, "s", title); g_variant_builder_add (¶ms, "s", text); g_variant_builder_add (¶ms, "as", NULL); /* Actions */ @@ -65,7 +65,7 @@ notification_backend_show (const char *title, const char *text) g_variant_builder_open (¶ms, G_VARIANT_TYPE ("a{sv}")); g_variant_builder_open (¶ms, G_VARIANT_TYPE ("{sv}")); g_variant_builder_add (¶ms, "s", "desktop-entry"); - g_variant_builder_add (¶ms, "v", g_variant_new_string ("net.zoite.Zoitechat")); + g_variant_builder_add (¶ms, "v", g_variant_new_string ("org.zoitechat.ZoiteChat")); g_variant_builder_close (¶ms); g_variant_builder_close (¶ms); diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index 337f8f31..98457b18 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -80,7 +80,7 @@ typedef GIcon *TrayIcon; typedef GIcon *TrayCustomIcon; #define tray_icon_free(i) g_object_unref(i) -#define ICON_NORMAL_NAME "net.zoite.Zoitechat" +#define ICON_NORMAL_NAME "org.zoitechat.ZoiteChat" #define ICON_MSG_NAME "mail-unread" #define ICON_HILIGHT_NAME "dialog-warning" #define ICON_FILE_NAME "folder-download"