From 8ded5c9c10e4079fded6889ec4b10c37226468d4 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 10 Apr 2002 19:01:14 +0000 Subject: Shell config page routines. Right now handles the default folders page. * e-shell-config.c: Shell config page routines. Right now handles the default folders page. * glade/e-shell-config-default-folders.glade: New. * GNOME_Evolution_Shell.oaf.in: Add info for the default folders config page. * main.c (idle_cb): If we successfully registered the shell, register the config factory. * evolution-shell-client.c (evolution_shell_client_new): Note the fact that it frees the corba_shell when it is destroyed. * evolution-folder-selector-button.c (evolution_folder_selector_button_construct, destroy): Use bonobo_object_ref/unref on the shell client, not gtk. * e-shell.c (e_shell_construct): Pass local_directory to e_setup_check_db. (handle_default_uri): Fix the config db paths here to match the other routines. * e-setup.c (e_setup_check_db): Make this take the evolution directory path as well so we can properly set up file: URIs for the default folders. svn path=/trunk/; revision=16423 --- shell/evolution-folder-selector-button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'shell/evolution-folder-selector-button.c') diff --git a/shell/evolution-folder-selector-button.c b/shell/evolution-folder-selector-button.c index 2ca81da05f..35ddf19c7a 100644 --- a/shell/evolution-folder-selector-button.c +++ b/shell/evolution-folder-selector-button.c @@ -165,7 +165,7 @@ destroy (GtkObject *object) folder_selector_button = EVOLUTION_FOLDER_SELECTOR_BUTTON (object); priv = folder_selector_button->priv; - gtk_object_unref (GTK_OBJECT (priv->shell_client)); + bonobo_object_unref (BONOBO_OBJECT (priv->shell_client)); g_free (priv->title); for (i = 0; priv->possible_types[i]; i++) g_free (priv->possible_types[i]); @@ -253,7 +253,7 @@ evolution_folder_selector_button_construct (EvolutionFolderSelectorButton *folde priv = folder_selector_button->priv; priv->shell_client = shell_client; - gtk_object_ref (GTK_OBJECT (shell_client)); + bonobo_object_ref (BONOBO_OBJECT (shell_client)); priv->corba_storage_registry = evolution_shell_client_get_storage_registry_interface (shell_client); priv->title = g_strdup (title); -- cgit