From 2253d00f91fc3f10f012dc4ba38fc8522efe4bd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Tue, 22 Jan 2013 19:32:09 +0000 Subject: [PATCH] e/appmenu: Only register AppMenu.Registrar iface when we have a instance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by: José Roberto de Souza SVN revision: 83102 --- src/modules/appmenu/e_mod_main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/appmenu/e_mod_main.c b/src/modules/appmenu/e_mod_main.c index 8ad6a70db..07cf03113 100644 --- a/src/modules/appmenu/e_mod_main.c +++ b/src/modules/appmenu/e_mod_main.c @@ -64,6 +64,10 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style) } inst->gcc->data = inst; _gc_orient(inst->gcc, inst->gcc->gadcon->orient); + + if (!ctxt->iface) + appmenu_dbus_registrar_server_init(ctxt); + return inst->gcc; } @@ -73,6 +77,8 @@ _gc_shutdown(E_Gadcon_Client *gcc) E_AppMenu_Instance *inst = gcc->data; evas_object_del(inst->box); inst->ctx->instances = eina_list_remove(inst->ctx->instances, inst); + if (!inst->ctx->instances) + appmenu_dbus_registrar_server_shutdown(inst->ctx); free(inst); } @@ -161,7 +167,6 @@ e_modapi_init(E_Module *m) edbus_init(); ctxt->conn = edbus_connection_get(EDBUS_CONNECTION_TYPE_SESSION); - appmenu_dbus_registrar_server_init(ctxt); event = ecore_event_handler_add(E_EVENT_BORDER_FOCUS_IN, cb_focus_in, ctxt); ctxt->events[0] = event;