From 55809b9010a93ea473b5522dac789d27ea976dd3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 15 Apr 2012 12:06:46 -0400 Subject: [PATCH] Have EDBusServer load modules and extensions. --- libebackend/e-data-factory.c | 4 ---- libebackend/e-dbus-server.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libebackend/e-data-factory.c b/libebackend/e-data-factory.c index 65c198b..8f27afd 100644 --- a/libebackend/e-data-factory.c +++ b/libebackend/e-data-factory.c @@ -107,10 +107,6 @@ data_factory_constructed (GObject *object) /* Chain up to parent's constructed() method. */ G_OBJECT_CLASS (e_data_factory_parent_class)->constructed (object); - /* Load all module libraries containing extensions. */ - - e_dbus_server_load_modules (E_DBUS_SERVER (object)); - /* Collect all backend factories into a hash table. */ list = e_extensible_list_extensions ( diff --git a/libebackend/e-dbus-server.c b/libebackend/e-dbus-server.c index 3e70e4f..917ea44 100644 --- a/libebackend/e-dbus-server.c +++ b/libebackend/e-dbus-server.c @@ -148,6 +148,17 @@ dbus_server_finalize (GObject *object) } static void +dbus_server_constructed (GObject *object) +{ + e_dbus_server_load_modules (E_DBUS_SERVER (object)); + + e_extensible_load_extensions (E_EXTENSIBLE (object)); + + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (e_dbus_server_parent_class)->constructed (object); +} + +static void dbus_server_bus_acquired (EDBusServer *server, GDBusConnection *connection) { @@ -237,6 +248,7 @@ e_dbus_server_class_init (EDBusServerClass *class) object_class = G_OBJECT_CLASS (class); object_class->finalize = dbus_server_finalize; + object_class->constructed = dbus_server_constructed; class->bus_acquired = dbus_server_bus_acquired; class->bus_name_acquired = dbus_server_bus_name_acquired; -- 2.7.4