aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/e-shell-view.c21
2 files changed, 24 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 10f2f09374..2324654892 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2000-09-13 Ettore Perazzoli <ettore@helixcode.com>
+
+ * e-shell-view.c (popdown_transient_folder_bar): New.
+ (storage_set_view_box_button_release_event_cb): Rewritten to use
+ it.
+ (folder_selected_cb): Pop down the transient folder bar if the
+ folder bar mode is `TRANSIENT'.
+
2000-09-12 Ettore Perazzoli <ettore@helixcode.com>
* ($(IDL_GENERATED)): Stupid `orbit-idl' wants a space after the
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 319e85fd38..f2a568b9b9 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -156,14 +156,10 @@ bonobo_widget_is_dead (BonoboWidget *bonobo_widget)
static void disconnect_popup_signals (EShellView *shell_view);
static void
-storage_set_view_box_button_release_event_cb (GtkWidget *widget,
- GdkEventButton *button_event,
- void *data)
+popdown_transient_folder_bar (EShellView *shell_view)
{
- EShellView *shell_view;
EShellViewPrivate *priv;
- shell_view = E_SHELL_VIEW (data);
priv = shell_view->priv;
gdk_pointer_ungrab (GDK_CURRENT_TIME);
@@ -177,6 +173,18 @@ storage_set_view_box_button_release_event_cb (GtkWidget *widget,
}
static void
+storage_set_view_box_button_release_event_cb (GtkWidget *widget,
+ GdkEventButton *button_event,
+ void *data)
+{
+ EShellView *shell_view;
+
+ shell_view = E_SHELL_VIEW (data);
+
+ popdown_transient_folder_bar (shell_view);
+}
+
+static void
popup_storage_set_view_close_button_clicked (ETitleBar *title_bar,
void *data)
{
@@ -338,6 +346,9 @@ folder_selected_cb (EStorageSetView *storage_set_view,
GTK_SIGNAL_FUNC (new_folder_cb),
shell_view);
}
+
+ if (priv->folder_bar_mode == E_SHELL_VIEW_SUBWINDOW_TRANSIENT)
+ popdown_transient_folder_bar (shell_view);
}
/* Callback called when the close button on the tree's title bar is clicked. */