From 7d7be8321613acf4a613894163b8468f107415de Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Sun, 24 Dec 2017 12:09:36 -0500 Subject: 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 --- data/misc/hexchat.appdata.xml.in | 56 -------------------- data/misc/hexchat.desktop.in.in | 18 ------- data/misc/htm-mime.xml | 8 --- data/misc/htm.desktop.in | 7 --- .../misc/io.github.Hexchat.ThemeManager.desktop.in | 7 +++ data/misc/io.github.Hexchat.ThemeManager.xml | 8 +++ data/misc/io.github.Hexchat.appdata.xml.in | 60 ++++++++++++++++++++++ data/misc/io.github.Hexchat.desktop.in.in | 18 +++++++ data/misc/meson.build | 22 ++++---- po/POTFILES | 6 +-- po/POTFILES.skip | 2 +- src/fe-gtk/notifications/notification-libnotify.c | 4 +- 12 files changed, 110 insertions(+), 106 deletions(-) delete mode 100644 data/misc/hexchat.appdata.xml.in delete mode 100644 data/misc/hexchat.desktop.in.in delete mode 100644 data/misc/htm-mime.xml delete mode 100644 data/misc/htm.desktop.in create mode 100644 data/misc/io.github.Hexchat.ThemeManager.desktop.in create mode 100644 data/misc/io.github.Hexchat.ThemeManager.xml create mode 100644 data/misc/io.github.Hexchat.appdata.xml.in create mode 100644 data/misc/io.github.Hexchat.desktop.in.in diff --git a/data/misc/hexchat.appdata.xml.in b/data/misc/hexchat.appdata.xml.in deleted file mode 100644 index 7ffaf3dc..00000000 --- a/data/misc/hexchat.appdata.xml.in +++ /dev/null @@ -1,56 +0,0 @@ - - - hexchat.desktop - HexChat - HexChat - CC0-1.0 - GPL-2.0+ - hexchat - IRC Client - -

HexChat is an easy to use yet extensible IRC Client. It allows you to securely join multiple networks and talk to users privately or in channels using a customizable interface. You can even transfer files.

-

HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, logging, custom themes, and Python/Perl scripts.

-
- http://hexchat.github.io - https://github.com/hexchat/hexchat - https://www.transifex.com/hexchat/hexchat - https://goo.gl/jESZvU - https://hexchat.readthedocs.io/en/latest/ - - - http://i.imgur.com/tLMguQz.png - Main Chat Window - - - - - -

This is another bug fix release:

-
    -
  • Fix issue with timers causing ping timeouts
  • -
  • Fix building against OpenSSL 1.1
  • -
  • Fix /exec output printing invalid utf8
  • -
  • Replace doat plugin with an internal command
  • -
  • Change how tab colors interact with plugins
  • -
  • Enable filtering the beep character by default
  • -
-
-
- - -

This is a minor bug fix release just cleaning up a few issues:

-
    -
  • Fix crash with bad translations
  • -
  • Add new mhop command
  • -
  • Change ping timeout to 60 by default
  • -
-
-
-
- - UserDocs - HiDpiIcon - Notifications - - tingping_at_fedoraproject.org -
diff --git a/data/misc/hexchat.desktop.in.in b/data/misc/hexchat.desktop.in.in deleted file mode 100644 index a5ff40d8..00000000 --- a/data/misc/hexchat.desktop.in.in +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Name=HexChat -GenericName=IRC Client -Comment=Chat with other people online -Keywords=IM;Chat; -Exec=@exec_command@ -Icon=hexchat -Terminal=false -Type=Application -Categories=GTK;Network;IRCClient; -StartupNotify=true -X-GNOME-UsesNotifications=true -MimeType=x-scheme-handler/irc;x-scheme-handler/ircs; -Actions=SafeMode; - -[Desktop Action SafeMode] -Name=Open Safe Mode -Exec=hexchat --no-auto --no-plugins diff --git a/data/misc/htm-mime.xml b/data/misc/htm-mime.xml deleted file mode 100644 index f76b689b..00000000 --- a/data/misc/htm-mime.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - HexChat theme archives - - - - diff --git a/data/misc/htm.desktop.in b/data/misc/htm.desktop.in deleted file mode 100644 index 53cac289..00000000 --- a/data/misc/htm.desktop.in +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=HexChat Theme Manager -Exec=thememan %f -Icon=hexchat -Terminal=false -Type=Application -MimeType=application/x-hct; diff --git a/data/misc/io.github.Hexchat.ThemeManager.desktop.in b/data/misc/io.github.Hexchat.ThemeManager.desktop.in new file mode 100644 index 00000000..53cac289 --- /dev/null +++ b/data/misc/io.github.Hexchat.ThemeManager.desktop.in @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=HexChat Theme Manager +Exec=thememan %f +Icon=hexchat +Terminal=false +Type=Application +MimeType=application/x-hct; diff --git a/data/misc/io.github.Hexchat.ThemeManager.xml b/data/misc/io.github.Hexchat.ThemeManager.xml new file mode 100644 index 00000000..f76b689b --- /dev/null +++ b/data/misc/io.github.Hexchat.ThemeManager.xml @@ -0,0 +1,8 @@ + + + + HexChat theme archives + + + + diff --git a/data/misc/io.github.Hexchat.appdata.xml.in b/data/misc/io.github.Hexchat.appdata.xml.in new file mode 100644 index 00000000..97949597 --- /dev/null +++ b/data/misc/io.github.Hexchat.appdata.xml.in @@ -0,0 +1,60 @@ + + + io.github.Hexchat.desktop + HexChat + HexChat + CC0-1.0 + GPL-2.0+ + hexchat + IRC Client + +

HexChat is an easy to use yet extensible IRC Client. It allows you to securely join multiple networks and talk to users privately or in channels using a customizable interface. You can even transfer files.

+

HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, logging, custom themes, and Python/Perl scripts.

+
+ http://hexchat.github.io + https://github.com/hexchat/hexchat + https://www.transifex.com/hexchat/hexchat + https://goo.gl/jESZvU + https://hexchat.readthedocs.io/en/latest/ + + + http://i.imgur.com/tLMguQz.png + Main Chat Window + + + + + hexchat.desktop + + + + +

This is another bug fix release:

+
    +
  • Fix issue with timers causing ping timeouts
  • +
  • Fix building against OpenSSL 1.1
  • +
  • Fix /exec output printing invalid utf8
  • +
  • Replace doat plugin with an internal command
  • +
  • Change how tab colors interact with plugins
  • +
  • Enable filtering the beep character by default
  • +
+
+
+ + +

This is a minor bug fix release just cleaning up a few issues:

+
    +
  • Fix crash with bad translations
  • +
  • Add new mhop command
  • +
  • Change ping timeout to 60 by default
  • +
+
+
+
+ + UserDocs + HiDpiIcon + Notifications + + tingping_at_fedoraproject.org +
diff --git a/data/misc/io.github.Hexchat.desktop.in.in b/data/misc/io.github.Hexchat.desktop.in.in new file mode 100644 index 00000000..a5ff40d8 --- /dev/null +++ b/data/misc/io.github.Hexchat.desktop.in.in @@ -0,0 +1,18 @@ +[Desktop Entry] +Name=HexChat +GenericName=IRC Client +Comment=Chat with other people online +Keywords=IM;Chat; +Exec=@exec_command@ +Icon=hexchat +Terminal=false +Type=Application +Categories=GTK;Network;IRCClient; +StartupNotify=true +X-GNOME-UsesNotifications=true +MimeType=x-scheme-handler/irc;x-scheme-handler/ircs; +Actions=SafeMode; + +[Desktop Action SafeMode] +Name=Open Safe Mode +Exec=hexchat --no-auto --no-plugins 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); -- cgit 1.4.1