aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/gui/component/addressbook-component.c13
2 files changed, 10 insertions, 10 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index d0da0ade39..1b8330e4a2 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-05 Not Zed <NotZed@Ximian.com>
+
+ * gui/component/addressbook-component.c (bonobo_main_quit_cb):
+ removed.
+ (owner_unset_cb): Basically a noop, the shell does the quit, we
+ just note we have no owner anymore.
+
2003-03-04 JP Rosevear <jpr@ximian.com>
Fixes #37881
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 476ce73101..b1db690d2a 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -381,22 +381,15 @@ owner_set_cb (EvolutionShellComponent *shell_component,
addressbook_storage_setup (shell_component, evolution_homedir);
}
-static gboolean
-bonobo_main_quit_cb (gpointer closure)
-{
- bonobo_main_quit ();
- return TRUE;
-}
-
static void
owner_unset_cb (EvolutionShellComponent *shell_component,
GNOME_Evolution_Shell shell_interface,
gpointer user_data)
{
owner_count --;
- if (owner_count == 0) {
- g_idle_add (bonobo_main_quit_cb, NULL);
- }
+
+ if (owner_count == 0)
+ global_shell_client = NULL;
}
/* FIXME We should perhaps take the time to figure out if the book is editable. */