iiiypuk
/
hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove libnotify dependency 

Instead just talk directly to the service. This fixes *sending*
a notification being blocking IO.
This commit is contained in:
Patrick Griffis 2021-07-13 12:24:19 -05:00
parent 482efae89a
commit c144d0468b
6 changed files with 150 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ jobs:
- name: Install Dependencies
run: |
sudo apt-get update
sudo apt-get install -y meson libcanberra-dev libdbus-glib-1-dev libglib2.0-dev libgtk2.0-dev libluajit-5.1-dev libnotify-dev libpci-dev libperl-dev libproxy-dev libssl-dev python3-dev python3-cffi mono-devel desktop-file-utils
sudo apt-get install -y meson libcanberra-dev libdbus-glib-1-dev libglib2.0-dev libgtk2.0-dev libluajit-5.1-dev libpci-dev libperl-dev libproxy-dev libssl-dev python3-dev python3-cffi mono-devel desktop-file-utils
- name: Configure
run: meson build -Dtext=true -Dtheme-manager=true -Dauto_features=enabled

2
meson.build
View File

@ -19,7 +19,6 @@ libgmodule_dep = dependency('gmodule-2.0')
libcanberra_dep = dependency('libcanberra', version: '>= 0.22',
required: get_option('libcanberra'))
dbus_glib_dep = dependency('dbus-glib-1', required: get_option('dbus'))
libnotify_dep = dependency('libnotify', required: get_option('libnotify'))
global_deps = []
if cc.get_id() == 'msvc'
@ -182,7 +181,6 @@ if meson.version().version_compare('>= 0.53.0')
'TLS (openssl)': libssl_dep.found(),
'Plugin Support': get_option('plugin'),
'DBus Support': dbus_glib_dep.found(),
'libnotify': libnotify_dep.found(),
'libcanberra': libcanberra_dep.found(),
}, section: 'Features')

3
meson_options.txt
View File

@ -19,9 +19,6 @@ option('plugin', type: 'boolean',
option('dbus', type: 'feature', value: 'auto',
description: 'Support used for single-instance and scripting interface, Unix only'
)
option('libnotify', type: 'feature', value: 'auto',
description: 'Support for freedesktop notifications, Unix only'
)
option('libcanberra', type: 'feature', value: 'auto',
description: 'Support for sound alerts, Unix only'
)

8
src/fe-gtk/meson.build
View File

@ -43,11 +43,7 @@ hexchat_gtk_cflags = []
hexchat_gtk_ldflags = []
if libnotify_dep.found()
hexchat_gtk_sources += 'notifications/notification-libnotify.c'
hexchat_gtk_deps += libnotify_dep
elif false # TODO HAVE_GTK_MAC
elif host_machine.system() == 'windows'
if host_machine.system() == 'windows'
hexchat_gtk_sources += 'notifications/notification-windows.c'
# TODO: mingw doesn't have these headers or libs
@ -57,7 +53,7 @@ elif host_machine.system() == 'windows'
#)
else
hexchat_gtk_sources += 'notifications/notification-dummy.c'
hexchat_gtk_sources += 'notifications/notification-freedesktop.c'
endif
iso_codes = dependency('iso-codes', required: false)

147
src/fe-gtk/notifications/notification-freedesktop.c Normal file
View File

@ -0,0 +1,147 @@
/* HexChat
* Copyright (C) 2021 Patrick Griffis.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include <gio/gio.h>
static GDBusProxy *fdo_notifications;
static gboolean strip_markup;
static void
on_notify_ready (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
{
GError *error = NULL;
guint32 notification_id;
GVariant *response = g_dbus_proxy_call_finish (proxy, res, &error);
if (error)
{
g_info ("Failed to send notification: %s", error->message);
g_error_free (error);
return;
}
g_variant_get (response, "(u)", &notification_id);
g_info ("Notification sent. ID=%u", notification_id);
g_variant_unref (response);
}
void
notification_backend_show (const char *title, const char *text)
{
GVariantBuilder params;
g_assert (fdo_notifications);
if (strip_markup)
text = g_markup_escape_text (text, -1);
g_variant_builder_init (&params, G_VARIANT_TYPE ("(susssasa{sv}i)"));
g_variant_builder_add (&params, "s", "hexchat"); /* App name */
g_variant_builder_add (&params, "u", 0); /* ID, 0 means don't replace */
g_variant_builder_add (&params, "s", ""); /* App icon (set from hints instead) */
g_variant_builder_add (&params, "s", title);
g_variant_builder_add (&params, "s", text);
g_variant_builder_add (&params, "as", NULL); /* Actions */
/* Hints */
g_variant_builder_open (&params, G_VARIANT_TYPE ("a{sv}"));
g_variant_builder_open (&params, G_VARIANT_TYPE ("{sv}"));
g_variant_builder_add (&params, "s", "desktop-entry");
g_variant_builder_add (&params, "v", g_variant_new_string ("io.github.Hexchat"));
g_variant_builder_close (&params);
g_variant_builder_close (&params);
g_variant_builder_add (&params, "i", -1); /* Expiration */
g_dbus_proxy_call (fdo_notifications,
"Notify",
g_variant_builder_end (&params),
G_DBUS_CALL_FLAGS_NONE,
1000,
NULL,
(GAsyncReadyCallback)on_notify_ready,
NULL);
if (strip_markup)
g_free ((char*)text);
}
int
notification_backend_init (const char **error)
{
GError *err = NULL;
GVariant *response;
char **capabilities;
guint i;
fdo_notifications = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_NONE,
NULL,
"org.freedesktop.Notifications",
"/org/freedesktop/Notifications",
"org.freedesktop.Notifications",
NULL,
&err);
if (err)
goto return_error;
response = g_dbus_proxy_call_sync (fdo_notifications,
"GetCapabilities",
NULL,
G_DBUS_CALL_FLAGS_NONE,
30,
NULL,
&err);
if (err)
{
g_clear_object (&fdo_notifications);
goto return_error;
}
g_variant_get (response, "(^a&s)", &capabilities);
for (i = 0; capabilities[i]; i++)
{
if (strcmp (capabilities[i], "body-markup") == 0)
strip_markup = TRUE;
}
g_free (capabilities);
g_variant_unref (response);
return 1;
return_error:
*error = g_strdup (err->message);
g_error_free (err);
return 0;
}
void
notification_backend_deinit (void)
{
g_clear_object (&fdo_notifications);
}
int
notification_backend_supported (void)
{
return fdo_notifications != NULL;
}

81
src/fe-gtk/notifications/notification-libnotify.c
View File

@ -1,81 +0,0 @@
/* HexChat
* Copyright (C) 2015 Patrick Griffis.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include <glib.h>
#include <libnotify/notify.h>
#ifndef NOTIFY_CHECK_VERSION
#define NOTIFY_CHECK_VERSION(x,y,z) 0
#endif
static gboolean strip_markup = FALSE;
void
notification_backend_show (const char *title, const char *text)
{
NotifyNotification *notification;
if (strip_markup)
text = g_markup_escape_text (text, -1);
#if NOTIFY_CHECK_VERSION(0,7,0)
notification = notify_notification_new (title, text, "hexchat");
#else
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 ("io.github.Hexchat"));
#else
notify_notification_set_hint_string (notification, "desktop-entry", "io.github.Hexchat");
#endif
notify_notification_show (notification, NULL);
g_object_unref (notification);
if (strip_markup)
g_free ((char*)text);
}
int
notification_backend_init (const char **error)
{
GList* server_caps;
if (!notify_init (PACKAGE_NAME))
return 0;
server_caps = notify_get_server_caps ();
if (g_list_find_custom (server_caps, "body-markup", (GCompareFunc)g_strcmp0))
strip_markup = TRUE;
g_list_free_full (server_caps, g_free);
return 1;
}
void
notification_backend_deinit (void)
{
notify_uninit ();
}
int
notification_backend_supported (void)
{
return notify_is_initted ();
}