nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefix signal functions with signal_

Browse Source 
Make dbus function that emit a signal easier to distinguish by prefixing
them with 'signal_'.
This commit is contained in:
Nikos Tsipinakis 2017-12-09 17:01:39 +02:00
parent 1c53ae7f9c
commit ff6f3e496c
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dbus.c
View File

@ -298,7 +298,7 @@ static void on_notify(GDBusConnection *connection,
// The message got discarded // The message got discarded
if (id == 0) { if (id == 0) {
notification_closed(n, 2); signal_notification_closed(n, 2);
notification_free(n); notification_free(n);
} }
@ -331,7 +331,7 @@ static void on_get_server_information(GDBusConnection *connection,
g_dbus_connection_flush(connection, NULL, NULL, NULL); g_dbus_connection_flush(connection, NULL, NULL, NULL);
} }
void notification_closed(notification *n, enum reason reason) void signal_notification_closed(notification *n, enum reason reason)
{ {
if (reason < REASON_MIN || REASON_MAX < reason) { if (reason < REASON_MIN || REASON_MAX < reason) {
fprintf(stderr, "ERROR: Closing notification with reason '%d' not supported. " fprintf(stderr, "ERROR: Closing notification with reason '%d' not supported. "
@ -362,7 +362,7 @@ void notification_closed(notification *n, enum reason reason)
} }
void action_invoked(notification *n, const char *identifier) void signal_action_invoked(notification *n, const char *identifier)
{ {
GVariant *body = g_variant_new("(us)", n->id, identifier); GVariant *body = g_variant_new("(us)", n->id, identifier);
GError *err = NULL; GError *err = NULL;

4
src/dbus.h
View File

@ -17,8 +17,8 @@ enum reason {
int initdbus(void); int initdbus(void);
void dbus_tear_down(int id); void dbus_tear_down(int id);
/* void dbus_poll(int timeout); */ /* void dbus_poll(int timeout); */
void notification_closed(notification *n, enum reason reason); void signal_notification_closed(notification *n, enum reason reason);
void action_invoked(notification *n, const char *identifier); void signal_action_invoked(notification *n, const char *identifier);
#endif #endif
/* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */ /* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */

2
src/menu.c
View File

@ -157,7 +157,7 @@ void invoke_action(const char *action)
} }
if (invoked && action_identifier) { if (invoked && action_identifier) {
action_invoked(invoked, action_identifier); signal_action_invoked(invoked, action_identifier);
} }
} }

4
src/notification.c
View File

@ -558,12 +558,12 @@ void notification_do_action(notification *n)
{ {
if (n->actions) { if (n->actions) {
if (n->actions->count == 2) { if (n->actions->count == 2) {
action_invoked(n, n->actions->actions[0]); signal_action_invoked(n, n->actions->actions[0]);
return; return;
} }
for (int i = 0; i < n->actions->count; i += 2) { for (int i = 0; i < n->actions->count; i += 2) {
if (strcmp(n->actions->actions[i], "default") == 0) { if (strcmp(n->actions->actions[i], "default") == 0) {
action_invoked(n, n->actions->actions[i]); signal_action_invoked(n, n->actions->actions[i]);
return; return;
} }
} }

6
src/queues.c
View File

@ -115,7 +115,7 @@ static bool queues_stack_duplicate(notification *n)
n->dup_count = orig->dup_count; n->dup_count = orig->dup_count;
notification_closed(orig, 1); signal_notification_closed(orig, 1);
notification_free(orig); notification_free(orig);
return true; return true;
@ -138,7 +138,7 @@ static bool queues_stack_duplicate(notification *n)
n->dup_count = orig->dup_count; n->dup_count = orig->dup_count;
notification_closed(orig, 1); signal_notification_closed(orig, 1);
notification_free(orig); notification_free(orig);
return true; return true;
@ -205,7 +205,7 @@ int queues_notification_close_id(int id, enum reason reason)
} }
if (target) { if (target) {
notification_closed(target, reason); signal_notification_closed(target, reason);
queues_history_push(target); queues_history_push(target);
} }