[network-manager-applet] editor: remove pointless warning message
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] editor: remove pointless warning message
- Date: Tue, 19 Apr 2011 16:07:28 +0000 (UTC)
commit f2409ab26ea61ebb60d95b34f292c975dad3fe79
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 | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/src/connection-editor/ce-polkit-button.c b/src/connection-editor/ce-polkit-button.c
index 2d4fc31..5bd806a 100644
--- a/src/connection-editor/ce-polkit-button.c
+++ b/src/connection-editor/ce-polkit-button.c
@@ -196,20 +196,16 @@ dispose (GObject *object)
{
CEPolkitButtonPrivate *priv = CE_POLKIT_BUTTON_GET_PRIVATE (object);
- 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;
- if (priv->perm_id)
- g_signal_handler_disconnect (priv->client, priv->perm_id);
+ if (priv->perm_id)
+ g_signal_handler_disconnect (priv->client, priv->perm_id);
- g_object_unref (priv->client);
- g_object_unref (priv->auth);
- g_object_unref (priv->stock);
+ g_object_unref (priv->client);
+ 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]