aboutsummaryrefslogtreecommitdiffstats
path: root/shell/main.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-07-20 15:32:34 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-07-20 15:32:34 +0800
commit1168da7072a57fb9fc66be77df43e82392659c18 (patch)
tree7d6cd4043be44186bbda30bacda3a6ed624f7319 /shell/main.c
parentb05db271facb10107b78a7d7c58a1ab9e744eda5 (diff)
downloadgsoc2013-evolution-1168da7072a57fb9fc66be77df43e82392659c18.tar.gz
gsoc2013-evolution-1168da7072a57fb9fc66be77df43e82392659c18.tar.zst
gsoc2013-evolution-1168da7072a57fb9fc66be77df43e82392659c18.zip
Added/fixed support for multiple views.
svn path=/trunk/; revision=4234
Diffstat (limited to 'shell/main.c')
-rw-r--r--shell/main.c23
1 files changed, 2 insertions, 21 deletions
diff --git a/shell/main.c b/shell/main.c
index 69816873c2..e614a7ce83 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -39,6 +39,7 @@ static EShell *shell;
static void
no_views_left_cb (EShell *shell, gpointer data)
{
+ e_shell_quit (shell);
gtk_main_quit ();
}
@@ -138,21 +139,6 @@ development_warning ()
gtk_object_destroy (GTK_OBJECT (warning_dialog));
}
-static void
-view_delete_event_cb (GtkWidget *widget,
- GdkEventAny *event,
- void *data)
-{
- EShell *shell;
-
- shell = E_SHELL (data);
-
- gtk_widget_destroy (widget);
-
- /* FIXME we should keep track of the number of views and exit when all the views are gone. */
- e_shell_quit (shell);
-}
-
static gint
idle_cb (gpointer data)
{
@@ -178,13 +164,8 @@ idle_cb (gpointer data)
gtk_signal_connect (GTK_OBJECT (shell), "destroy",
GTK_SIGNAL_FUNC (destroy_cb), NULL);
- if (! e_shell_restore_from_settings (shell)) {
+ if (! e_shell_restore_from_settings (shell))
view = e_shell_new_view (shell, STARTUP_URI);
- /* FIXME: Do this for all the shell views even when the shell
- is restored. */
- gtk_signal_connect (GTK_OBJECT (view), "delete_event",
- GTK_SIGNAL_FUNC (view_delete_event_cb), shell);
- }
if (!getenv ("EVOLVE_ME_HARDER"))
development_warning ();