aboutsummaryrefslogtreecommitdiffstats
path: root/my-evolution/component-factory.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-11-21 05:57:43 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-11-21 05:57:43 +0800
commitba846b6b545490d957af46038c9b686b440ca25a (patch)
tree9928fe710ac606e1a49b908e244ea1a3b6ad3fc8 /my-evolution/component-factory.c
parent37cdfc6c84183613ed796cc218e60e78e07ddc0a (diff)
downloadgsoc2013-evolution-ba846b6b545490d957af46038c9b686b440ca25a.tar.gz
gsoc2013-evolution-ba846b6b545490d957af46038c9b686b440ca25a.tar.zst
gsoc2013-evolution-ba846b6b545490d957af46038c9b686b440ca25a.zip
Use GConf.
* e-summary.c (e_summary_init): Use GConf. * e-summary-tasks.c: Replaced member config_listener in ESummaryTasks with a gconf_client. (setup_gconf_client): Renamed from setup_config_listener(). Set up the GConf client and invoke gconf_client_add_dir() on the interesting namespaces. (gconf_client_value_changed_cb): Renamed from config_listener_value_changed_cb and changed prototype to match that of the "value_changed" signal in GConfClient. (setup_task_folder): Updated to use GConf. * e-summary-calendar.c: Replaced member config_listener with a gconf_listener. (setup_calendar): Use GConf. (setup_gconf_client): Renamed from setup_config_listener. Set up a GConf client and invoke gconf_client_add_dir() on the interesting namespaces. (gconf_client_value_changed_cb): Renamed from config_listener_key_changed_cb() and changed prototype to match that of the "value_changed" signal in GConfClient. (locale_uses_24h_time_format): Removed. (e_summary_calendar_free): g_object_unref() the gconf_client. * Makefile.am: Add rules to install the schemas. * apps_evolution_summary.schemas: New. * e-summary-preferences.c: Did a global GList -> GSList switch. (e_summary_preferences_restore): Use GConfClient instead of EConfigListener. (vector_from_folder_list): Removed since GConf makes this useless. (folder_list_from_vector): Likewise. (str_list_from_vector): Likewise. (vector_from_str_list): Likewise. (make_initial_weather_list): Likewise. (make_initial_rdf_list): Likewise. (make_initial_mail_list): Likewise. (e_summary_preferences_save): Use GConf. (e_summary_preferences_init): No need to set up defaults here. * e-summary.h: Changed members display_folders, rdf_urls, stations in ESummaryPrefs to be GSLists instead of GLists; updated all the functions that use them accordingly. svn path=/trunk/; revision=18863
Diffstat (limited to 'my-evolution/component-factory.c')
-rw-r--r--my-evolution/component-factory.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/my-evolution/component-factory.c b/my-evolution/component-factory.c
index d266bf2706..481d817403 100644
--- a/my-evolution/component-factory.c
+++ b/my-evolution/component-factory.c
@@ -127,9 +127,7 @@ component_destroy (BonoboObject *factory,
}
static BonoboObject *
-create_component (BonoboGenericFactory *factory,
- const char *id,
- void *data)
+create_component (void)
{
EvolutionShellComponent *shell_component;
ESummaryOfflineHandler *offline_handler;
@@ -164,12 +162,15 @@ void
component_factory_init (void)
{
BonoboGenericFactory *factory;
+ Bonobo_RegistrationResult result;
+ BonoboObject *shell_component;
- factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID,
- create_component,
- NULL);
+ shell_component = create_component ();
- if (factory == NULL)
+ result = bonobo_activation_active_server_register (COMPONENT_ID,
+ bonobo_object_corba_objref (BONOBO_OBJECT (shell_component)));
+
+ if (result != Bonobo_ACTIVATION_REG_SUCCESS)
g_error ("Cannot register Evolution Summary component factory.");
}