deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-06-09 00:10:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename app IDs to org.zoitechat.ZoiteChat

Browse Source
This commit is contained in:
deepend-tildeclub
2026-05-22 00:08:54 -06:00
parent 479f1649ef
commit 6535810ca3
11 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/appimage-build.yml vendored
View File

@@ -261,8 +261,8 @@ jobs:
./linuxdeploy-x86_64.AppImage \ ./linuxdeploy-x86_64.AppImage \
--appdir AppDir \ --appdir AppDir \
--desktop-file AppDir/usr/share/applications/net.zoite.Zoitechat.desktop \ --desktop-file AppDir/usr/share/applications/org.zoitechat.ZoiteChat.desktop \
--icon-file AppDir/usr/share/icons/hicolor/48x48/apps/net.zoite.Zoitechat.png \ --icon-file AppDir/usr/share/icons/hicolor/48x48/apps/org.zoitechat.ZoiteChat.png \
--custom-apprun ./AppRun \ --custom-apprun ./AppRun \
--plugin gtk \ --plugin gtk \
--output appimage --output appimage

2
.github/workflows/flatpak-build.yml vendored
View File

@@ -33,7 +33,7 @@ jobs:
uses: flatpak/flatpak-github-actions/flatpak-builder@v6 uses: flatpak/flatpak-github-actions/flatpak-builder@v6
with: with:
bundle: zoitechat.flatpak bundle: zoitechat.flatpak
manifest-path: flatpak/net.zoite.Zoitechat.json manifest-path: flatpak/org.zoitechat.ZoiteChat.json
cache: false cache: false
restore-cache: false restore-cache: false

4
data/icons/meson.build
View File

@@ -1,11 +1,11 @@
icondir = join_paths(get_option('datadir'), 'icons/hicolor') icondir = join_paths(get_option('datadir'), 'icons/hicolor')
install_data( install_data(
'zoitechat.png', 'zoitechat.png',
rename: 'net.zoite.Zoitechat.png', rename: 'org.zoitechat.ZoiteChat.png',
install_dir: join_paths(icondir, '48x48/apps') install_dir: join_paths(icondir, '48x48/apps')
) )
install_data( install_data(
'zoitechat.svg', 'zoitechat.svg',
rename: 'net.zoite.Zoitechat.svg', rename: 'org.zoitechat.ZoiteChat.svg',
install_dir: join_paths(icondir, 'scalable/apps') install_dir: join_paths(icondir, 'scalable/apps')
) )

20
data/misc/meson.build
View File

@@ -6,8 +6,8 @@ desktop_utils = find_program('desktop-file-validate', required: false)
if get_option('gtk-frontend') if get_option('gtk-frontend')
if get_option('install-appdata') if get_option('install-appdata')
zoitechat_appdata = i18n.merge_file( zoitechat_appdata = i18n.merge_file(
input: 'net.zoite.Zoitechat.appdata.xml.in', input: 'org.zoitechat.ZoiteChat.metainfo.xml.in',
output: 'net.zoite.Zoitechat.appdata.xml', output: 'org.zoitechat.ZoiteChat.metainfo.xml',
po_dir: '../../po', po_dir: '../../po',
install: true, install: true,
install_dir: metainfodir install_dir: metainfodir
@@ -15,7 +15,7 @@ if get_option('gtk-frontend')
appstreamcli = find_program('appstreamcli', required: false) appstreamcli = find_program('appstreamcli', required: false)
if appstreamcli.found() if appstreamcli.found()
test('Validate net.zoite.Zoitechat.appdata.xml', appstreamcli, test('Validate org.zoitechat.ZoiteChat.metainfo.xml', appstreamcli,
args: ['validate', zoitechat_appdata] args: ['validate', zoitechat_appdata]
) )
endif endif
@@ -29,14 +29,14 @@ if get_option('gtk-frontend')
endif endif
desktop_file = configure_file( desktop_file = configure_file(
input: 'net.zoite.Zoitechat.desktop.in.in', input: 'org.zoitechat.ZoiteChat.desktop.in.in',
output: 'net.zoite.Zoitechat.desktop.in', output: 'org.zoitechat.ZoiteChat.desktop.in',
configuration: desktop_conf configuration: desktop_conf
) )
zoitechat_desktop = i18n.merge_file( zoitechat_desktop = i18n.merge_file(
input: desktop_file, input: desktop_file,
output: 'net.zoite.Zoitechat.desktop', output: 'org.zoitechat.ZoiteChat.desktop',
po_dir: '../../po', po_dir: '../../po',
type: 'desktop', type: 'desktop',
install: true, install: true,
@@ -44,7 +44,7 @@ if get_option('gtk-frontend')
) )
if desktop_utils.found() if desktop_utils.found()
test('Validate net.zoite.Zoitechat.desktop', desktop_utils, test('Validate org.zoitechat.ZoiteChat.desktop', desktop_utils,
args: [zoitechat_desktop] args: [zoitechat_desktop]
) )
endif endif
@@ -98,14 +98,14 @@ if get_option('plugin')
conf.set('LICENSE', metainfo[2]) conf.set('LICENSE', metainfo[2])
plugin_appdata = configure_file( plugin_appdata = configure_file(
input: 'net.zoite.Zoitechat.Plugin.metainfo.xml.in', input: 'org.zoitechat.ZoiteChat.Plugin.metainfo.xml.in',
output: 'net.zoite.Zoitechat.Plugin.@0@.metainfo.xml'.format(name), output: 'org.zoitechat.ZoiteChat.Plugin.@0@.metainfo.xml'.format(name),
configuration: conf, configuration: conf,
install_dir: get_option('install-plugin-metainfo') ? metainfodir : '', install_dir: get_option('install-plugin-metainfo') ? metainfodir : '',
) )
if appstreamcli.found() 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] args: ['validate', plugin_appdata]
) )
endif endif

4
data/misc/net.zoite.Zoitechat.Plugin.metainfo.xml.in → data/misc/org.zoitechat.ZoiteChat.Plugin.metainfo.xml.in
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<component type="addon"> <component type="addon">
<id>net.zoite.Zoitechat.Plugin.@NAME@</id> <id>org.zoitechat.ZoiteChat.Plugin.@NAME@</id>
<extends>net.zoite.Zoitechat</extends> <extends>org.zoitechat.ZoiteChat</extends>
<name>@NAME@ Plugin</name> <name>@NAME@ Plugin</name>
<summary>@SUMMARY@</summary> <summary>@SUMMARY@</summary>
<url type="homepage">https://zoitechat.org/</url> <url type="homepage">https://zoitechat.org/</url>

4
data/misc/net.zoite.Zoitechat.desktop.in.in → data/misc/org.zoitechat.ZoiteChat.desktop.in.in
View File

@@ -4,12 +4,12 @@ GenericName=IRC Client
Comment=Chat with other people online Comment=Chat with other people online
Keywords=IM;Chat; Keywords=IM;Chat;
Exec=@exec_command@ Exec=@exec_command@
Icon=net.zoite.Zoitechat Icon=org.zoitechat.ZoiteChat
Terminal=false Terminal=false
Type=Application Type=Application
Categories=GTK;Network;IRCClient; Categories=GTK;Network;IRCClient;
StartupNotify=true StartupNotify=true
StartupWMClass=net.zoite.Zoitechat StartupWMClass=org.zoitechat.ZoiteChat
X-GNOME-UsesNotifications=true X-GNOME-UsesNotifications=true
MimeType=x-scheme-handler/irc;x-scheme-handler/ircs; MimeType=x-scheme-handler/irc;x-scheme-handler/ircs;
Actions=SafeMode; Actions=SafeMode;

8
data/misc/net.zoite.Zoitechat.appdata.xml.in → data/misc/org.zoitechat.ZoiteChat.metainfo.xml.in
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application"> <component type="desktop-application">
<id>net.zoite.Zoitechat</id> <id>org.zoitechat.ZoiteChat</id>
<name>ZoiteChat</name> <name>ZoiteChat</name>
<launchable type="desktop-id">net.zoite.Zoitechat.desktop</launchable> <launchable type="desktop-id">org.zoitechat.ZoiteChat.desktop</launchable>
<developer id="net.zoite"> <developer id="net.zoite">
<name translate="no">ZoiteChat</name> <name translate="no">ZoiteChat</name>
@@ -26,7 +26,7 @@
</screenshot> </screenshot>
</screenshots> </screenshots>
<provides> <provides>
<id>zoitechat.desktop</id> <id>org.zoitechat.ZoiteChat.desktop</id>
</provides> </provides>
<releases> <releases>
<release date="2026-05-21" version="2.18.1"> <release date="2026-05-21" version="2.18.1">
@@ -339,7 +339,7 @@
<description> <description>
<p>This is largely a bug fix release though it has some large behind the scenes changes:</p> <p>This is largely a bug fix release though it has some large behind the scenes changes:</p>
<ul> <ul>
<li>Rename data files to use *net.zoite.Zoitechat* name</li> <li>Rename data files to use *org.zoitechat.ZoiteChat* name</li>
<li>Add option (irc_reconnect_rejoin) to disable auto-rejoin on reconnect</li> <li>Add option (irc_reconnect_rejoin) to disable auto-rejoin on reconnect</li>
<li>Add ability to set custom tray icon separate of app icon</li> <li>Add ability to set custom tray icon separate of app icon</li>
<li>Fix Enchant 2.0+ support</li> <li>Fix Enchant 2.0+ support</li>

4
flatpak/net.zoite.Zoitechat.json → flatpak/org.zoitechat.ZoiteChat.json
View File

@@ -1,5 +1,5 @@
{ {
"app-id": "net.zoite.Zoitechat", "app-id": "org.zoitechat.ZoiteChat",
"branch": "master", "branch": "master",
"runtime": "org.gnome.Platform", "runtime": "org.gnome.Platform",
"runtime-version": "49", "runtime-version": "49",
@@ -22,7 +22,7 @@
"--talk-name=org.mpris.MediaPlayer2.*" "--talk-name=org.mpris.MediaPlayer2.*"
], ],
"add-extensions": { "add-extensions": {
"net.zoite.Zoitechat.Plugin": { "org.zoitechat.ZoiteChat.Plugin": {
"version": "49", "version": "49",
"directory": "extensions", "directory": "extensions",
"add-ld-path": "lib", "add-ld-path": "lib",

2
src/fe-gtk/fe-gtk.c
View File

@@ -320,7 +320,7 @@ fe_args (int argc, char *argv[])
GError *error = NULL; GError *error = NULL;
GOptionContext *context; GOptionContext *context;
char *buffer; char *buffer;
const char *desktop_id = "net.zoite.Zoitechat"; const char *desktop_id = "org.zoitechat.ZoiteChat";
#ifdef WIN32 #ifdef WIN32
char *base_path = NULL; char *base_path = NULL;
char *locale_path = NULL; char *locale_path = NULL;

4
src/fe-gtk/notifications/notification-freedesktop.c
View File

@@ -56,7 +56,7 @@ notification_backend_show (const char *title, const char *text)
g_variant_builder_init (&params, G_VARIANT_TYPE ("(susssasa{sv}i)")); g_variant_builder_init (&params, G_VARIANT_TYPE ("(susssasa{sv}i)"));
g_variant_builder_add (&params, "s", "zoitechat"); /* App name */ g_variant_builder_add (&params, "s", "zoitechat"); /* App name */
g_variant_builder_add (&params, "u", 0); /* ID, 0 means don't replace */ g_variant_builder_add (&params, "u", 0); /* ID, 0 means don't replace */
g_variant_builder_add (&params, "s", "net.zoite.Zoitechat"); /* App icon */ g_variant_builder_add (&params, "s", "org.zoitechat.ZoiteChat"); /* App icon */
g_variant_builder_add (&params, "s", title); g_variant_builder_add (&params, "s", title);
g_variant_builder_add (&params, "s", text); g_variant_builder_add (&params, "s", text);
g_variant_builder_add (&params, "as", NULL); /* Actions */ g_variant_builder_add (&params, "as", NULL); /* Actions */
@@ -65,7 +65,7 @@ notification_backend_show (const char *title, const char *text)
g_variant_builder_open (&params, G_VARIANT_TYPE ("a{sv}")); g_variant_builder_open (&params, G_VARIANT_TYPE ("a{sv}"));
g_variant_builder_open (&params, G_VARIANT_TYPE ("{sv}")); g_variant_builder_open (&params, G_VARIANT_TYPE ("{sv}"));
g_variant_builder_add (&params, "s", "desktop-entry"); g_variant_builder_add (&params, "s", "desktop-entry");
g_variant_builder_add (&params, "v", g_variant_new_string ("net.zoite.Zoitechat")); g_variant_builder_add (&params, "v", g_variant_new_string ("org.zoitechat.ZoiteChat"));
g_variant_builder_close (&params); g_variant_builder_close (&params);
g_variant_builder_close (&params); g_variant_builder_close (&params);

2
src/fe-gtk/plugin-tray.c
View File

@@ -80,7 +80,7 @@ typedef GIcon *TrayIcon;
typedef GIcon *TrayCustomIcon; typedef GIcon *TrayCustomIcon;
#define tray_icon_free(i) g_object_unref(i) #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_MSG_NAME "mail-unread"
#define ICON_HILIGHT_NAME "dialog-warning" #define ICON_HILIGHT_NAME "dialog-warning"
#define ICON_FILE_NAME "folder-download" #define ICON_FILE_NAME "folder-download"