jcarr
/
libnotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

notify-send: Move server capabilities check to a separate function

This commit is contained in:
Marco Trevisan (Treviño) 2022-04-27 21:32:30 +02:00
parent 997115b459
commit c99aacdb91
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/notify-send.c
View File

@ -176,6 +176,22 @@ on_wait_timeout (gpointer data)
return FALSE; return FALSE;
} }
static gboolean
server_has_capability (const gchar *capability)
{
GList *server_caps = notify_get_server_caps ();
gboolean supported;
supported = !!g_list_find_custom (server_caps,
capability,
(GCompareFunc) g_ascii_strcasecmp);
g_list_foreach (server_caps, (GFunc) g_free, NULL);
g_list_free (server_caps);
return supported;
}
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
@ -350,19 +366,12 @@ main (int argc, char *argv[])
} }
if (actions != NULL) { if (actions != NULL) {
GList *server_caps = notify_get_server_caps ();
gint i = 0; gint i = 0;
char *action = NULL; char *action = NULL;
gchar **spl = NULL; gchar **spl = NULL;
gboolean have_actions; gboolean have_actions;
have_actions = have_actions = server_has_capability ("actions");
!!g_list_find_custom (server_caps,
"actions",
(GCompareFunc) g_ascii_strcasecmp);
g_list_foreach (server_caps, (GFunc) g_free, NULL);
g_list_free (server_caps);
if (!have_actions) { if (!have_actions) {
g_printerr (N_("Actions are not supported by this " g_printerr (N_("Actions are not supported by this "
"notifications server. " "notifications server. "