aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2002-09-25 04:05:20 +0800
committerDan Winship <danw@src.gnome.org>2002-09-25 04:05:20 +0800
commitab7d63ce8e057eaa31a1777af0837cd1005e7f44 (patch)
tree09e2af4a666980db356425ce425f7963cfacb17a
parent691be386bde8f62cff577977b8da2172de9d10bd (diff)
downloadgsoc2013-evolution-ab7d63ce8e057eaa31a1777af0837cd1005e7f44.tar.gz
gsoc2013-evolution-ab7d63ce8e057eaa31a1777af0837cd1005e7f44.tar.zst
gsoc2013-evolution-ab7d63ce8e057eaa31a1777af0837cd1005e7f44.zip
Don't destroy the dialog. It does that itself whenever it emits
* e-shell.c (folder_selection_dialog_folder_selected_cb): Don't destroy the dialog. It does that itself whenever it emits folder_selected. * e-shell-folder-selection-dialog.c (double_click_cb): Don't close the dialog if the user double-clicks a bad folder. Just ignore it (like we do when they click OK on a bad folder). svn path=/trunk/; revision=18205
-rw-r--r--shell/ChangeLog10
-rw-r--r--shell/e-shell-folder-selection-dialog.c4
-rw-r--r--shell/e-shell.c2
3 files changed, 12 insertions, 4 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 7642a60eec..20b59fc098 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-24 Dan Winship <danw@ximian.com>
+
+ * e-shell.c (folder_selection_dialog_folder_selected_cb): Don't
+ destroy the dialog. It does that itself whenever it emits
+ folder_selected.
+
+ * e-shell-folder-selection-dialog.c (double_click_cb): Don't close
+ the dialog if the user double-clicks a bad folder. Just ignore it
+ (like we do when they click OK on a bad folder).
+
2002-09-24 Ettore Perazzoli <ettore@ximian.com>
[#14019]
diff --git a/shell/e-shell-folder-selection-dialog.c b/shell/e-shell-folder-selection-dialog.c
index 5a0296cbbb..f4300a2dd0 100644
--- a/shell/e-shell-folder-selection-dialog.c
+++ b/shell/e-shell-folder-selection-dialog.c
@@ -325,9 +325,9 @@ double_click_cb (EStorageSetView *essv,
gtk_signal_emit (GTK_OBJECT (folder_selection_dialog),
signals[FOLDER_SELECTED],
e_shell_folder_selection_dialog_get_selected_path (folder_selection_dialog));
- }
- gnome_dialog_close (GNOME_DIALOG (folder_selection_dialog));
+ gnome_dialog_close (GNOME_DIALOG (folder_selection_dialog));
+ }
}
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 503c3069ef..3fedf7dd56 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -289,8 +289,6 @@ folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_
g_free (corba_folder.evolutionUri);
CORBA_exception_free (&ev);
-
- gtk_widget_destroy (GTK_WIDGET (folder_selection_dialog));
}