aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog13
-rw-r--r--shell/e-local-storage.c4
-rw-r--r--shell/e-shell-startup-wizard.c3
-rw-r--r--shell/e-uri-schema-registry.c2
4 files changed, 17 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 37c4d83acb..3e75d24a2c 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,16 @@
+2002-11-13 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-shell-startup-wizard.c (e_shell_startup_wizard_create):
+ Connect finish_func to the "next" signal for now, since GnomeDruid
+ seems to be borked.
+
+ * e-uri-schema-registry.c (schema_handler_new): g_object_ref()
+ @component instead of bonobo_object_ref().
+
+ * e-local-storage.c (create_folder): g_object_ref() for the
+ component_client, instead of bonobo_object_ref().
+ (remove_folder_step): Likewise.
+
2002-11-13 Not Zed <NotZed@Ximian.com>
* evolution-storage.c: remove GTK_OBJECT cast and other GTK stuff.
diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c
index 266cd22817..349dfe46ba 100644
--- a/shell/e-local-storage.c
+++ b/shell/e-local-storage.c
@@ -449,7 +449,7 @@ create_folder (ELocalStorage *local_storage,
callback_data->callback = callback;
callback_data->callback_data = data;
- bonobo_object_ref (BONOBO_OBJECT (component_client));
+ g_object_ref (component_client);
evolution_shell_component_client_async_create_folder (component_client,
physical_uri,
@@ -590,7 +590,7 @@ remove_folder_step (AsyncRemoveFolderCallbackData *callback_data)
type = e_folder_get_type_string (folder);
client = e_folder_type_registry_get_handler_for_type (priv->folder_type_registry, type);
- bonobo_object_ref (BONOBO_OBJECT (client));
+ g_object_ref (client);
evolution_shell_component_client_async_remove_folder (client, physical_uri, type,
component_async_remove_folder_callback,
diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c
index 36d96ef083..6fffc623d0 100644
--- a/shell/e-shell-startup-wizard.c
+++ b/shell/e-shell-startup-wizard.c
@@ -878,8 +878,7 @@ e_shell_startup_wizard_create (void)
data->finish = glade_xml_get_widget (data->wizard, "done-page");
g_return_val_if_fail (data->start != NULL, FALSE);
g_return_val_if_fail (data->finish != NULL, FALSE);
- g_signal_connect (data->finish, "finish",
- G_CALLBACK (finish_func), data);
+ g_signal_connect (data->finish, "next", G_CALLBACK (finish_func), data);
make_mail_dialog_pages (data);
g_return_val_if_fail (data->mailer != CORBA_OBJECT_NIL, TRUE);
diff --git a/shell/e-uri-schema-registry.c b/shell/e-uri-schema-registry.c
index 650efa2908..c52c1e97db 100644
--- a/shell/e-uri-schema-registry.c
+++ b/shell/e-uri-schema-registry.c
@@ -55,7 +55,7 @@ schema_handler_new (const char *schema,
handler->schema = g_strdup (schema);
handler->component = component;
- bonobo_object_ref (BONOBO_OBJECT (component));
+ g_object_ref (component);
return handler;
}