diff options
| author | Dan Williams <dcbw@redhat.com> | 2015-02-16 15:07:58 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2015-02-16 15:07:58 -0600 |
| commit | 8beedc3e565b343aeb36aed96741044040011c3d (patch) | |
| tree | b7dc4751a540f97e263ce3e4754dc37ccbdf2912 | |
| parent | 41cb54e9ee5491ff74b574c48cf0b603c226586d (diff) | |
| download | network-manager-applet-8beedc3e565b343aeb36aed96741044040011c3d.tar.gz | |
applet: simplify mobile broadband menu item finalization
| -rw-r--r-- | src/mb-menu-item.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/mb-menu-item.c b/src/mb-menu-item.c index ee471e27..4f204f17 100644 --- a/src/mb-menu-item.c +++ b/src/mb-menu-item.c @@ -42,8 +42,6 @@ typedef struct { guint32 int_strength; GtkWidget *detail; GtkWidget *hbox; - - gboolean destroyed; } NMMbMenuItemPrivate; static const char * @@ -216,23 +214,11 @@ nm_mb_menu_item_init (NMMbMenuItem *self) } static void -dispose (GObject *object) +finalize (GObject *object) { - NMMbMenuItem *self = NM_MB_MENU_ITEM (object); - NMMbMenuItemPrivate *priv = NM_MB_MENU_ITEM_GET_PRIVATE (self); - - if (priv->destroyed) { - G_OBJECT_CLASS (nm_mb_menu_item_parent_class)->dispose (object); - return; - } - priv->destroyed = TRUE; - - gtk_widget_destroy (priv->desc); - gtk_widget_destroy (priv->strength); - gtk_widget_destroy (priv->hbox); - g_free (priv->desc_string); + g_free (NM_MB_MENU_ITEM_GET_PRIVATE (object)->desc_string); - G_OBJECT_CLASS (nm_mb_menu_item_parent_class)->dispose (object); + G_OBJECT_CLASS (nm_mb_menu_item_parent_class)->finalize (object); } static void @@ -243,6 +229,6 @@ nm_mb_menu_item_class_init (NMMbMenuItemClass *klass) g_type_class_add_private (klass, sizeof (NMMbMenuItemPrivate)); /* virtual methods */ - object_class->dispose = dispose; + object_class->finalize = finalize; } |