discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=eb58e2ca70346ea30ffb07c20ee0030d2cd3bf59
commit eb58e2ca70346ea30ffb07c20ee0030d2cd3bf59
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Fri Mar 11 13:53:42 2016 -0500
remove eldbus init/shutdown calls from the codebase
this is handled by e_msgbus
---
src/bin/e_notification.c | 2 --
src/bin/e_sys.c | 2 --
src/modules/appmenu/e_mod_main.c | 2 --
src/modules/battery/e_mod_upower.c | 2 --
src/modules/bluez4/ebluez4.c | 3 ---
src/modules/connman/e_mod_main.c | 2 --
src/modules/fileman/e_mod_dbus.c | 2 --
src/modules/music-control/e_mod_main.c | 2 --
src/modules/packagekit/e_mod_packagekit.c | 2 --
src/modules/systray/e_mod_notifier_host_dbus.c | 2 --
src/modules/wizard/page_110.c | 5 -----
11 files changed, 26 deletions(-)
diff --git a/src/bin/e_notification.c b/src/bin/e_notification.c
index 08883c8..305b5b7 100644
--- a/src/bin/e_notification.c
+++ b/src/bin/e_notification.c
@@ -193,7 +193,6 @@ e_notification_server_register(const
E_Notification_Server_Info *server_info, E_
n_data = calloc(1, sizeof(Notification_Data));
EINA_SAFETY_ON_NULL_RETURN_VAL(n_data, EINA_FALSE);
- eldbus_init();
n_data->conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
n_data->iface = eldbus_service_interface_register(n_data->conn, PATH,
&desc);
n_data->notify_cb = n_cb;
@@ -212,7 +211,6 @@ e_notification_server_unregister(void)
EINA_SAFETY_ON_NULL_RETURN(n_data);
eldbus_service_interface_unregister(n_data->iface);
eldbus_connection_unref(n_data->conn);
- eldbus_shutdown();
free(n_data);
n_data = NULL;
}
diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c
index cddd4e4..481e55b 100644
--- a/src/bin/e_sys.c
+++ b/src/bin/e_sys.c
@@ -176,7 +176,6 @@ e_sys_init(void)
Eldbus_Connection *conn;
Eldbus_Object *obj;
- eldbus_init();
conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
obj = eldbus_object_get(conn, "org.freedesktop.login1",
"/org/freedesktop/login1");
@@ -222,7 +221,6 @@ e_sys_shutdown(void)
close(_e_sys_systemd_inhibit_fd);
_e_sys_systemd_inhibit_fd = -1;
}
- eldbus_shutdown();
return 1;
}
diff --git a/src/modules/appmenu/e_mod_main.c b/src/modules/appmenu/e_mod_main.c
index bac9de0..7f29c17 100644
--- a/src/modules/appmenu/e_mod_main.c
+++ b/src/modules/appmenu/e_mod_main.c
@@ -165,7 +165,6 @@ e_modapi_init(E_Module *m)
appmenu_module = m;
- eldbus_init();
ctxt->conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
event = ecore_event_handler_add(E_EVENT_CLIENT_FOCUS_IN, cb_focus_in, ctxt);
@@ -200,7 +199,6 @@ e_modapi_shutdown(E_Module *m)
appmenu_dbus_registrar_server_shutdown(ctxt);
eldbus_connection_unref(ctxt->conn);
- eldbus_shutdown();
free(ctxt);
return 1;
}
diff --git a/src/modules/battery/e_mod_upower.c
b/src/modules/battery/e_mod_upower.c
index 8fd85fc..8ae4431 100644
--- a/src/modules/battery/e_mod_upower.c
+++ b/src/modules/battery/e_mod_upower.c
@@ -310,7 +310,6 @@ _battery_upower_start(void)
{
Eldbus_Object *obj;
- eldbus_init();
conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, 0);
@@ -348,5 +347,4 @@ _battery_upower_stop(void)
eldbus_proxy_unref(upower_proxy);
eldbus_object_unref(obj);
eldbus_connection_unref(conn);
- eldbus_shutdown();
}
diff --git a/src/modules/bluez4/ebluez4.c b/src/modules/bluez4/ebluez4.c
index b7891d3..9b8252d 100644
--- a/src/modules/bluez4/ebluez4.c
+++ b/src/modules/bluez4/ebluez4.c
@@ -739,8 +739,6 @@ ebluez4_eldbus_init(void)
ctxt = calloc(1, sizeof(Context));
- eldbus_init();
-
ctxt->conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
obj = eldbus_object_get(ctxt->conn, BLUEZ_BUS, MANAGER_PATH);
ctxt->man_proxy = eldbus_proxy_get(obj, MANAGER_INTERFACE);
@@ -768,7 +766,6 @@ ebluez4_eldbus_shutdown(void)
eldbus_connection_unref(ctxt->conn);
free(ctxt);
- eldbus_shutdown();
}
void
diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c
index 39395b4..48ab73e 100644
--- a/src/modules/connman/e_mod_main.c
+++ b/src/modules/connman/e_mod_main.c
@@ -635,7 +635,6 @@ e_modapi_init(E_Module *m)
ctxt = E_NEW(E_Connman_Module_Context, 1);
if (!ctxt)
goto error_connman_context;
- eldbus_init();
c = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
if (!c)
goto error_dbus_bus_get;
@@ -683,7 +682,6 @@ e_modapi_shutdown(E_Module *m)
return 0;
e_connman_system_shutdown();
- eldbus_shutdown();
_econnman_instances_free(ctxt);
_econnman_configure_registry_unregister();
diff --git a/src/modules/fileman/e_mod_dbus.c b/src/modules/fileman/e_mod_dbus.c
index 2f291c0..7ffddc8 100644
--- a/src/modules/fileman/e_mod_dbus.c
+++ b/src/modules/fileman/e_mod_dbus.c
@@ -339,7 +339,6 @@ e_fileman_dbus_init(void)
if (_daemon)
return;
- eldbus_init();
_daemon = _e_fileman_dbus_daemon_new();
}
@@ -351,6 +350,5 @@ e_fileman_dbus_shutdown(void)
_e_fileman_dbus_daemon_free(_daemon);
_daemon = NULL;
- eldbus_shutdown();
}
diff --git a/src/modules/music-control/e_mod_main.c
b/src/modules/music-control/e_mod_main.c
index acd7ca9..b8f67b8 100644
--- a/src/modules/music-control/e_mod_main.c
+++ b/src/modules/music-control/e_mod_main.c
@@ -359,7 +359,6 @@ cb_name_owner_has(void *data, const Eldbus_Message *msg,
Eina_Bool
music_control_dbus_init(E_Music_Control_Module_Context *ctxt, const char *bus)
{
- eldbus_init();
ctxt->conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
EINA_SAFETY_ON_NULL_RETURN_VAL(ctxt->conn, EINA_FALSE);
@@ -427,7 +426,6 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
media_player2_player_proxy_unref(ctxt->mpris2_player);
mpris_media_player2_proxy_unref(ctxt->mrpis2);
eldbus_connection_unref(ctxt->conn);
- eldbus_shutdown();
e_gadcon_provider_unregister(&_gc_class);
diff --git a/src/modules/packagekit/e_mod_packagekit.c
b/src/modules/packagekit/e_mod_packagekit.c
index 3aa6caf..2791360 100644
--- a/src/modules/packagekit/e_mod_packagekit.c
+++ b/src/modules/packagekit/e_mod_packagekit.c
@@ -525,7 +525,6 @@ packagekit_dbus_connect(E_PackageKit_Module_Context *ctxt)
Eldbus_Object *obj;
//DBG("PKGKIT: dbus_init()");
- eldbus_init();
ctxt->conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
if (!ctxt->conn)
@@ -570,5 +569,4 @@ packagekit_dbus_disconnect(E_PackageKit_Module_Context
*ctxt)
E_FREE_FUNC(obj, eldbus_object_unref);
eldbus_connection_unref(ctxt->conn);
- eldbus_shutdown();
}
diff --git a/src/modules/systray/e_mod_notifier_host_dbus.c
b/src/modules/systray/e_mod_notifier_host_dbus.c
index 75867dc..2f079cb 100644
--- a/src/modules/systray/e_mod_notifier_host_dbus.c
+++ b/src/modules/systray/e_mod_notifier_host_dbus.c
@@ -524,7 +524,6 @@ systray_notifier_dbus_init(Context_Notifier_Host *ctx)
{
Eldbus_Pending *p;
- eldbus_init();
ctx->conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
if (!ctx->conn) return;
p = eldbus_name_request(ctx->conn,
@@ -554,5 +553,4 @@ void systray_notifier_dbus_shutdown(Context_Notifier_Host
*ctx)
ctx->watcher = NULL;
}
eldbus_connection_unref(ctx->conn);
- eldbus_shutdown();
}
diff --git a/src/modules/wizard/page_110.c b/src/modules/wizard/page_110.c
index 4f6e066..9ae5e73 100644
--- a/src/modules/wizard/page_110.c
+++ b/src/modules/wizard/page_110.c
@@ -122,7 +122,6 @@ wizard_page_show(E_Wizard_Page *pg)
Eina_Bool have_connman = EINA_FALSE;
#ifdef USE_MODULE_CONNMAN
- eldbus_init();
conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
#endif
if (conn)
@@ -178,10 +177,6 @@ wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
eldbus_connection_unref(conn);
conn = NULL;
-#ifdef USE_MODULE_CONNMAN
- eldbus_shutdown();
-#endif
-
return 1;
}
/*
--
