[network-manager-applet/NMA_0_8] editor: remove pointless warning message



commit e73d73c4c363523046b5cd7ceb723f30ca518e5b
Author: Dan Williams <dcbw redhat com>
Date:   Tue Apr 19 11:08:40 2011 -0500

    editor: remove pointless warning message
    
    Dispose handlers can get run more than once.  Don't log that since
    it's not unexpected.

 src/connection-editor/ce-polkit-button.c |   26 +++++++++++---------------
 1 files changed, 11 insertions(+), 15 deletions(-)
---
diff --git a/src/connection-editor/ce-polkit-button.c b/src/connection-editor/ce-polkit-button.c
index aedcd7d..d85d9a7 100644
--- a/src/connection-editor/ce-polkit-button.c
+++ b/src/connection-editor/ce-polkit-button.c
@@ -254,24 +254,20 @@ dispose (GObject *object)
 	CEPolkitButtonPrivate *priv = CE_POLKIT_BUTTON_GET_PRIVATE (object);
 	GSList *iter;
 
-	if (priv->disposed) {
-		g_warning ("%s: CEPolkitButton object %p disposed twice", __func__, object);
-		G_OBJECT_CLASS (ce_polkit_button_parent_class)->dispose (object);
-		return;
-	}
-
-	priv->disposed = TRUE;
+	if (priv->disposed == FALSE) {
+		priv->disposed = TRUE;
 
-	/* Mark any ongoing permissions calls as disposed */
-	for (iter = priv->perm_calls; iter; iter = g_slist_next (iter))
-		((PermInfo *) iter->data)->disposed = TRUE;
+		/* Mark any ongoing permissions calls as disposed */
+		for (iter = priv->perm_calls; iter; iter = g_slist_next (iter))
+			((PermInfo *) iter->data)->disposed = TRUE;
 
-	if (priv->check_id)
-		g_signal_handler_disconnect (priv->settings, priv->check_id);
+		if (priv->check_id)
+			g_signal_handler_disconnect (priv->settings, priv->check_id);
 
-	g_object_unref (priv->settings);
-	g_object_unref (priv->auth);
-	g_object_unref (priv->stock);
+		g_object_unref (priv->settings);
+		g_object_unref (priv->auth);
+		g_object_unref (priv->stock);
+	}
 
 	G_OBJECT_CLASS (ce_polkit_button_parent_class)->dispose (object);
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]