seahorse r2675 - in trunk: . src

[nnielsen svn gnome org]

Author: nnielsen
Date: Tue Dec 16 17:55:02 2008
New Revision: 2675
URL: http://svn.gnome.org/viewvc/seahorse?rev=2675&view=rev

Log:
	* src/seahorse-key-manager.c: Fix erroneous unref of widget
	owned by glade.


Modified:
   trunk/ChangeLog
   trunk/src/seahorse-key-manager.c

Modified: trunk/src/seahorse-key-manager.c
==============================================================================
--- trunk/src/seahorse-key-manager.c	(original)
+++ trunk/src/seahorse-key-manager.c	Tue Dec 16 17:55:02 2008
@@ -643,13 +643,20 @@
 }
 #endif
 
+static gboolean
+quit_app_later (gpointer unused)
+{
+	seahorse_context_destroy (seahorse_context_for_app ());
+	return FALSE;
+}
+
+
 static void 
 on_app_quit (GtkAction* action, SeahorseKeyManager* self) 
 {
 	g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self));
-	g_return_if_fail (action == NULL || GTK_IS_ACTION (action));
-	
-	seahorse_context_destroy (seahorse_context_for_app ());
+	g_return_if_fail (GTK_IS_ACTION (action));
+	g_idle_add (quit_app_later, NULL);
 }
 
 /* When this window closes we quit seahorse */
@@ -658,7 +665,7 @@
 {
 	g_return_val_if_fail (SEAHORSE_IS_KEY_MANAGER (self), FALSE);
 	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	on_app_quit (NULL, self);
+	g_idle_add (quit_app_later, NULL);
 	return TRUE;
 }
 
@@ -1005,10 +1012,6 @@
 	SeahorseKeyManager *self = SEAHORSE_KEY_MANAGER (obj);
 	gint i;
 	
-	if (self->pv->notebook)
-		g_object_unref (self->pv->notebook);
-	self->pv->notebook = NULL;
-	
 	if (self->pv->view_actions)
 		g_object_unref (self->pv->view_actions);
 	self->pv->view_actions = NULL;