diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-03-16 09:24:35 +0000 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-03-16 09:24:35 +0000 |
| commit | e1ab0e953cfe66aa4d20c318c47b985d2802703a (patch) | |
| tree | 0c7112fde97eb2d07bb6bb16ba865d753256695a | |
| parent | ec72ecf69ad36a96ebbb028af1a7d83a2f36b7f7 (diff) | |
meta-porter: remove unnecessary weak reffing of the c2s porter
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| -rw-r--r-- | wocky/wocky-meta-porter.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/wocky/wocky-meta-porter.c b/wocky/wocky-meta-porter.c index 75d8ff3..48b23c2 100644 --- a/wocky/wocky-meta-porter.c +++ b/wocky/wocky-meta-porter.c @@ -114,26 +114,12 @@ static void register_porter_handlers (WockyMetaPorter *self, WockyPorter *porter, WockyContact *contact); static void -porter_disposed (gpointer user_data, - GObject *obj) -{ - PorterData *data = user_data; - - data->porter = NULL; -} - -static void porter_data_free (gpointer data) { PorterData *p = data; if (p->porter != NULL) - { - g_object_weak_unref (G_OBJECT (p->porter), - porter_disposed, data); - - g_object_unref (p->porter); - } + g_object_unref (p->porter); if (p->timeout_id > 0) g_source_remove (p->timeout_id); @@ -261,8 +247,6 @@ create_porter (WockyMetaPorter *self, g_hash_table_insert (priv->porters, g_object_ref (contact), data); } - g_object_weak_ref (G_OBJECT (data->porter), porter_disposed, data); - g_signal_connect (data->porter, "closing", G_CALLBACK (porter_closing_cb), data); g_signal_connect (data->porter, "remote-closed", |