aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-shell-importer.c3
-rw-r--r--shell/e-shell-view.c14
3 files changed, 15 insertions, 8 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index e5569ec848..f467592c2f 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-03 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-shell-importer.c (show_import_wizard): Make the WM close
+ button in the dialog hide instead of destroying, using
+ gnome_dialog_close_hides(). [#15572]
+
2002-08-28 Dan Winship <danw@ximian.com>
* e-shell.c (setup_components): Pass a selection_order to
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 43cbee91a8..dd73742e4b 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -1234,6 +1234,7 @@ show_import_wizard (BonoboUIComponent *component,
gtk_window_set_transient_for (GTK_WINDOW (data->dialog), GTK_WINDOW (user_data));
gtk_signal_connect (GTK_OBJECT (data->dialog), "destroy",
GTK_SIGNAL_FUNC (close_dialog), &dialog_open);
+ gnome_dialog_close_hides (GNOME_DIALOG (data->dialog), TRUE);
data->druid = glade_xml_get_widget (data->wizard, "druid1");
gtk_signal_connect (GTK_OBJECT (data->druid), "cancel",
@@ -1252,8 +1253,6 @@ show_import_wizard (BonoboUIComponent *component,
gtk_box_pack_start (GTK_BOX (GNOME_DRUID_PAGE_STANDARD (data->typedialog)->vbox), data->typepage->vbox, TRUE, TRUE, 0);
-
-
data->intelligent = glade_xml_get_widget (data->wizard, "page2-intelligent");
gtk_signal_connect (GTK_OBJECT (data->intelligent), "next",
GTK_SIGNAL_FUNC (next_intelligent_page), data);
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 97cf88af30..7fc10fb761 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -808,8 +808,8 @@ switch_on_folder_tree_click (EShellView *shell_view,
/* Callbacks. */
-/* Callback when a new folder is added. removed when we clear the
- delayed_selection */
+/* Callback when a new folder is added. Removed when we clear the
+ delayed_selection. */
static void
new_folder_cb (EStorageSet *storage_set,
const char *path,
@@ -822,6 +822,8 @@ new_folder_cb (EStorageSet *storage_set,
shell_view = E_SHELL_VIEW (data);
priv = shell_view->priv;
+ g_print ("%s %s -- delayed_selection %s\n", __FUNCTION__, path, priv->delayed_selection);
+
delayed_path = strchr (priv->delayed_selection, ':');
if (delayed_path) {
delayed_path ++;
@@ -1315,10 +1317,6 @@ destroy (GtkObject *object)
storage set used for the delayed selection mechanism. */
cleanup_delayed_selection (shell_view);
- /* This is necessary to remove the signal handler for folder_new on the
- storage set used for the delayed selection mechanism. */
- cleanup_delayed_selection (shell_view);
-
gtk_object_unref (GTK_OBJECT (priv->tooltips));
if (priv->history != NULL)
@@ -2188,6 +2186,8 @@ create_new_view_for_uri (EShellView *shell_view,
priv = shell_view->priv;
+ g_print ("%s %s\n", __FUNCTION__, uri);
+
view = get_view_for_uri (shell_view, uri, view_info);
if (view == NULL)
return FALSE;
@@ -2203,6 +2203,8 @@ create_new_view_for_uri (EShellView *shell_view,
g_assert (page_num != -1);
set_current_notebook_page (shell_view, page_num);
+ g_print ("%s set notebook page %d\n", __FUNCTION__, page_num);
+
g_hash_table_insert (priv->uri_to_view, view->uri, view);
return TRUE;