aboutsummaryrefslogtreecommitdiffstats
path: root/my-evolution/component-factory.c
diff options
context:
space:
mode:
Diffstat (limited to 'my-evolution/component-factory.c')
-rw-r--r--my-evolution/component-factory.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/my-evolution/component-factory.c b/my-evolution/component-factory.c
index bb58f29c65..d266bf2706 100644
--- a/my-evolution/component-factory.c
+++ b/my-evolution/component-factory.c
@@ -75,10 +75,9 @@ create_view (EvolutionShellComponent *shell,
return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
}
- offline_handler = gtk_object_get_data (GTK_OBJECT (shell),
- "offline-handler");
+ offline_handler = g_object_get_data (G_OBJECT (shell), "offline-handler");
shell_client = evolution_shell_component_get_owner (shell);
- corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
+ corba_shell = evolution_shell_client_corba_objref (shell_client);
control = e_summary_factory_new_control (physical_uri, corba_shell,
offline_handler, global_preferences);
if (!control)
@@ -101,7 +100,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
evolution_dir = g_strdup (evolution_homedir);
}
- corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
+ corba_shell = evolution_shell_client_corba_objref (shell_client);
e_summary_folder_init_folder_store (corba_shell);
e_summary_preferences_register_config_control_factory (corba_shell);
@@ -154,8 +153,7 @@ create_component (BonoboGenericFactory *factory,
g_signal_connect (shell_component, "owner_unset", G_CALLBACK (owner_unset_cb), NULL);
offline_handler = e_summary_offline_handler_new ();
- gtk_object_set_data (GTK_OBJECT (shell_component), "offline-handler",
- offline_handler);
+ g_object_set_data (G_OBJECT (shell_component), "offline-handler", offline_handler);
bonobo_object_add_interface (BONOBO_OBJECT (shell_component), BONOBO_OBJECT (offline_handler));
return BONOBO_OBJECT (shell_component);