diff options
Diffstat (limited to 'mail/mail-config-factory.c')
| -rw-r--r-- | mail/mail-config-factory.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/mail/mail-config-factory.c b/mail/mail-config-factory.c index f7ce73fd38..c34d7a6b55 100644 --- a/mail/mail-config-factory.c +++ b/mail/mail-config-factory.c @@ -51,8 +51,7 @@ config_control_destroy_callback (EvolutionConfigControl *config_control, void *u { struct _config_data *data = user_data; - gtk_widget_unref (data->prefs); - + g_object_unref (data->prefs); g_free (data); } @@ -74,6 +73,7 @@ config_control_factory_cb (BonoboGenericFactory *factory, const char *component_ data = g_new (struct _config_data, 1); + /* TODO: should use ascii_str*cmp? */ if (!strcmp (component_id, MAIL_ACCOUNTS_CONTROL_ID)) { prefs = mail_accounts_tab_new (shell); data->apply = (ApplyFunc) mail_accounts_tab_apply; @@ -91,7 +91,7 @@ config_control_factory_cb (BonoboGenericFactory *factory, const char *component_ } data->prefs = prefs; - gtk_object_ref (GTK_OBJECT (prefs)); + g_object_ref((prefs)); gtk_widget_show_all (prefs); @@ -109,10 +109,8 @@ config_control_factory_cb (BonoboGenericFactory *factory, const char *component_ g_assert_not_reached (); } - gtk_signal_connect (GTK_OBJECT (control), "apply", - GTK_SIGNAL_FUNC (config_control_apply_callback), data); - gtk_signal_connect (GTK_OBJECT (control), "destroy", - GTK_SIGNAL_FUNC (config_control_destroy_callback), data); + g_signal_connect(control, "apply", G_CALLBACK (config_control_apply_callback), data); + g_signal_connect(control, "destroy", G_CALLBACK (config_control_destroy_callback), data); return BONOBO_OBJECT (control); } @@ -122,9 +120,9 @@ mail_config_register_factory (GNOME_Evolution_Shell shell) { g_return_val_if_fail (shell != CORBA_OBJECT_NIL, FALSE); - factory = bonobo_generic_factory_new_multi (CONFIG_CONTROL_FACTORY_ID, - config_control_factory_cb, - shell); + factory = bonobo_generic_factory_new (CONFIG_CONTROL_FACTORY_ID, + config_control_factory_cb, + shell); if (factory != NULL) { return TRUE; |