diff options
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/e-shell.c | 4 | ||||
| -rw-r--r-- | shell/main.c | 7 |
3 files changed, 11 insertions, 6 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 508aee6be4..a1ed3bd662 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,11 @@ 2000-05-07 Ettore Perazzoli <ettore@helixcode.com> + * main.c (main): Connect to "no_views_left", not "destroy". + + * e-shell.c (view_destroy_cb): Grmpf. + +2000-05-07 Ettore Perazzoli <ettore@helixcode.com> + * e-shell.c (e_shell_construct): Output a warning message if the shortcut file is not found. (setup_storages): Output a warning message if the local storage diff --git a/shell/e-shell.c b/shell/e-shell.c index 3e5b9038f9..f69606ab18 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -102,10 +102,10 @@ view_destroy_cb (GtkObject *object, g_assert (E_IS_SHELL_VIEW (object)); shell = E_SHELL (data); - shell->priv->views = g_list_remove (shell->priv->views, shell); + shell->priv->views = g_list_remove (shell->priv->views, object); if (shell->priv->views == NULL) - gtk_signal_emit (GTK_OBJECT (object), signals[NO_VIEWS_LEFT]); + gtk_signal_emit (GTK_OBJECT (shell), signals[NO_VIEWS_LEFT]); } diff --git a/shell/main.c b/shell/main.c index 1bf97e8c74..589281a3d1 100644 --- a/shell/main.c +++ b/shell/main.c @@ -31,8 +31,7 @@ static void -shell_destroy_cb (GtkObject *object, - gpointer data) +no_views_left_cb (EShell *shell, gpointer data) { gtk_main_quit (); } @@ -103,8 +102,8 @@ main (int argc, char **argv) exit (1); } - gtk_signal_connect (GTK_OBJECT (shell), "destroy", - GTK_SIGNAL_FUNC (shell_destroy_cb), NULL); + gtk_signal_connect (GTK_OBJECT (shell), "no_views_left", + GTK_SIGNAL_FUNC (no_views_left_cb), NULL); e_shell_new_view (shell, NULL); |