Skip to content

Commit

Permalink
Remove unnecessary disconnect in trash-bar, causes log warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
mtwebster committed Aug 21, 2013
1 parent 1a3ce11 commit 505a37a
Showing 1 changed file with 2 additions and 19 deletions.
21 changes: 2 additions & 19 deletions src/nemo-trash-bar.c
Expand Up @@ -49,7 +49,6 @@ enum {
struct NemoTrashBarPrivate
{
NemoView *view;
gulong selection_handler_id;
};

G_DEFINE_TYPE (NemoTrashBar, nemo_trash_bar, GTK_TYPE_INFO_BAR);
Expand All @@ -70,9 +69,8 @@ selection_changed_cb (NemoView *view,
static void
connect_view_and_update_button (NemoTrashBar *bar)
{
bar->priv->selection_handler_id =
g_signal_connect (bar->priv->view, "selection-changed",
G_CALLBACK (selection_changed_cb), bar);
g_signal_connect (bar->priv->view, "selection-changed",
G_CALLBACK (selection_changed_cb), bar);

selection_changed_cb (bar->priv->view, bar);
}
Expand All @@ -98,20 +96,6 @@ nemo_trash_bar_set_property (GObject *object,
}
}

static void
nemo_trash_bar_finalize (GObject *obj)
{
NemoTrashBar *bar;

bar = NEMO_TRASH_BAR (obj);

if (bar->priv->selection_handler_id) {
g_signal_handler_disconnect (bar->priv->view, bar->priv->selection_handler_id);
}

G_OBJECT_CLASS (nemo_trash_bar_parent_class)->finalize (obj);
}

static void
nemo_trash_bar_trash_state_changed (NemoTrashMonitor *trash_monitor,
gboolean state,
Expand All @@ -134,7 +118,6 @@ nemo_trash_bar_class_init (NemoTrashBarClass *klass)
object_class = G_OBJECT_CLASS (klass);

object_class->set_property = nemo_trash_bar_set_property;
object_class->finalize = nemo_trash_bar_finalize;

g_object_class_install_property (object_class,
PROP_VIEW,
Expand Down

0 comments on commit 505a37a

Please sign in to comment.