diff options
| author | Huang Peng <shawn.p.huang@gmail.com> | 2009-03-20 14:07:30 +0800 |
|---|---|---|
| committer | Huang Peng <shawn.p.huang@gmail.com> | 2009-03-20 14:07:30 +0800 |
| commit | 0aa48a09c1ccca63e6909204e1ec673dff2341c2 (patch) | |
| tree | f4e85128f8178761e28ce65f655e9ab477c153ac /bus | |
| parent | 1a76fee5d5c7926e0d4f54a5dbd34bff8007d062 (diff) | |
| parent | ab417dd043ee6ba338518758c1c833f6ccbb7bdf (diff) | |
| download | ibus-definite.tar.gz ibus-definite.tar.xz ibus-definite.zip | |
Merge commit 'origin/master' into definitedefinite
Conflicts:
po/fr.po
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/dbusimpl.c | 17 | ||||
| -rw-r--r-- | bus/matchrule.c | 1 |
2 files changed, 14 insertions, 4 deletions
diff --git a/bus/dbusimpl.c b/bus/dbusimpl.c index 3cc51dc..f51ab96 100644 --- a/bus/dbusimpl.c +++ b/bus/dbusimpl.c @@ -829,6 +829,16 @@ _connection_ibus_message_cb (BusConnection *connection, break; #endif #if 0 + case DBUS_MESSAGE_TYPE_SIGNAL: + g_debug ("From :%s to %s, Signal: %s @ %s", + ibus_message_get_sender (message), + ibus_message_get_destination (message), + ibus_message_get_member (message), + ibus_message_get_path (message) + ); + break; +#endif +#if 0 case DBUS_MESSAGE_TYPE_METHOD_CALL: g_debug("From %s to %s, Method %s on %s", ibus_message_get_sender (message), @@ -1068,10 +1078,9 @@ bus_dbus_impl_dispatch_message_by_rule (BusDBusImpl *dbus, #endif for (link = dbus->rules; link != NULL; link = link->next) { - recipients = bus_match_rule_get_recipients (BUS_MATCH_RULE (link->data), - message); - if (recipients != NULL) - break; + GList *list = bus_match_rule_get_recipients (BUS_MATCH_RULE (link->data), + message); + recipients = g_list_concat (recipients, list); } for (link = recipients; link != NULL; link = link->next) { diff --git a/bus/matchrule.c b/bus/matchrule.c index f40147a..932d256 100644 --- a/bus/matchrule.c +++ b/bus/matchrule.c @@ -499,6 +499,7 @@ bus_match_rule_match (BusMatchRule *rule, ibus_message_iter_next (&iter); } } + return TRUE; } |