summaryrefslogtreecommitdiff
path: root/legacy/edbus/src/lib/edbus_signal_handler.c
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2012-12-14 16:28:55 +0000
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2012-12-14 16:28:55 +0000
commitaa31434d1f5d8e52aeb81cae3d3462961ed0a789 (patch)
treefc6e33be38bff96da818c5a9a671d5129d37e018 /legacy/edbus/src/lib/edbus_signal_handler.c
parenteb967fa9d83bdef5aab724cb0714f3d082d262c7 (diff)
edbus: Remove useless defines
These values are used only using they directly are more meaninful than those defines. SVN revision: 80966
Diffstat (limited to '')
-rw-r--r--legacy/edbus/src/lib/edbus_signal_handler.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/legacy/edbus/src/lib/edbus_signal_handler.c b/legacy/edbus/src/lib/edbus_signal_handler.c
index 7c2b081f1b..05140c41c3 100644
--- a/legacy/edbus/src/lib/edbus_signal_handler.c
+++ b/legacy/edbus/src/lib/edbus_signal_handler.c
@@ -4,12 +4,6 @@
4 4
5/* TODO: mempool of EDBus_Signal_Handler */ 5/* TODO: mempool of EDBus_Signal_Handler */
6 6
7#define SENDER_KEY "sender"
8#define PATH_KEY "path"
9#define INTERFACE_KEY "interface"
10#define MEMBER_KEY "member"
11#define ARG_X_KEY "arg%u"
12
13#define EDBUS_SIGNAL_HANDLER_CHECK(handler) \ 7#define EDBUS_SIGNAL_HANDLER_CHECK(handler) \
14 do \ 8 do \
15 { \ 9 { \
@@ -64,8 +58,6 @@ _match_append(Eina_Strbuf *match, const char *key, const char *value)
64 eina_strbuf_append_printf(match, ",%s='%s'", key, value); 58 eina_strbuf_append_printf(match, ",%s='%s'", key, value);
65} 59}
66 60
67#define ARGX "arg"
68
69static int 61static int
70_sort_arg(const void *d1, const void *d2) 62_sort_arg(const void *d1, const void *d2)
71{ 63{
@@ -75,6 +67,7 @@ _sort_arg(const void *d1, const void *d2)
75 return arg1->index - arg2->index; 67 return arg1->index - arg2->index;
76} 68}
77 69
70#define ARGX "arg"
78EAPI Eina_Bool 71EAPI Eina_Bool
79edbus_signal_handler_match_extra_vset(EDBus_Signal_Handler *sh, va_list ap) 72edbus_signal_handler_match_extra_vset(EDBus_Signal_Handler *sh, va_list ap)
80{ 73{
@@ -194,10 +187,10 @@ _edbus_signal_handler_add(EDBus_Connection *conn, const char *sender, const char
194 match = eina_strbuf_new(); 187 match = eina_strbuf_new();
195 EINA_SAFETY_ON_NULL_GOTO(match, cleanup_create_strbuf); 188 EINA_SAFETY_ON_NULL_GOTO(match, cleanup_create_strbuf);
196 eina_strbuf_append(match, "type='signal'"); 189 eina_strbuf_append(match, "type='signal'");
197 _match_append(match, SENDER_KEY, sender); 190 _match_append(match, "sender", sender);
198 _match_append(match, PATH_KEY, path); 191 _match_append(match, "path", path);
199 _match_append(match, INTERFACE_KEY, interface); 192 _match_append(match, "interface", interface);
200 _match_append(match, MEMBER_KEY, member); 193 _match_append(match, "member", member);
201 194
202 dbus_error_init(&err); 195 dbus_error_init(&err);
203 dbus_bus_add_match(conn->dbus_conn, eina_strbuf_string_get(match), &err); 196 dbus_bus_add_match(conn->dbus_conn, eina_strbuf_string_get(match), &err);