summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Roberto de Souza <zehortigoza@profusion.mobi>2013-01-14 22:34:51 +0000
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2013-01-14 22:34:51 +0000
commit283805237a9f5f194568667fc32586a3238cbde0 (patch)
treedbca977328e72699eb8ae019e7cc92b5396fc3ab
parent366a3dee3b3248220917da994f617e21be40d125 (diff)
edbus: Dont call dispatch_name_owner_change() if we get a error message
Patch by: José Roberto de Souza <zehortigoza@profusion.mobi> SVN revision: 82784
-rw-r--r--src/lib/edbus/edbus_core.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/edbus/edbus_core.c b/src/lib/edbus/edbus_core.c
index af3742c238..1767bd5441 100644
--- a/src/lib/edbus/edbus_core.c
+++ b/src/lib/edbus/edbus_core.c
@@ -188,6 +188,7 @@ print_live_connection(EDBus_Connection *conn)
188EAPI int 188EAPI int
189edbus_shutdown(void) 189edbus_shutdown(void)
190{ 190{
191fprintf(stderr, "SHUTDOWN");
191 if (_edbus_init_count <= 0) 192 if (_edbus_init_count <= 0)
192 { 193 {
193 ERR("Init count not greater than 0 in shutdown."); 194 ERR("Init count not greater than 0 in shutdown.");
@@ -436,9 +437,15 @@ on_get_name_owner(void *data, const EDBus_Message *msg, EDBus_Pending *pending E
436 EDBus_Connection_Name *cn = data; 437 EDBus_Connection_Name *cn = data;
437 438
438 if (edbus_message_error_get(msg, NULL, NULL)) 439 if (edbus_message_error_get(msg, NULL, NULL))
439 DBG("GetNameOwner returned an error"); 440 {
441 DBG("GetNameOwner returned an error");
442 return;
443 }
440 else if (!edbus_message_arguments_get(msg, "s", &unique_id)) 444 else if (!edbus_message_arguments_get(msg, "s", &unique_id))
441 ERR("Error getting arguments from GetNameOwner"); 445 {
446 ERR("Error getting arguments from GetNameOwner");
447 return;
448 }
442 449
443 cn->unique_id = eina_stringshare_add(unique_id); 450 cn->unique_id = eina_stringshare_add(unique_id);
444 edbus_dispatch_name_owner_change(cn, NULL); 451 edbus_dispatch_name_owner_change(cn, NULL);