summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2011-03-16 09:30:34 +0000
committerJonny Lamb <jonny.lamb@collabora.co.uk>2011-03-16 09:30:34 +0000
commit55acacdf14ece714bfeb74b5554303ddc1687264 (patch)
tree62813172dbbb70d95d58d43fed2a43aa159bfbd7
parente1ab0e953cfe66aa4d20c318c47b985d2802703a (diff)
meta-porter: clarify porter disposed weak ref callback name
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--wocky/wocky-meta-porter.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/wocky/wocky-meta-porter.c b/wocky/wocky-meta-porter.c
index 48b23c2..7414cc9 100644
--- a/wocky/wocky-meta-porter.c
+++ b/wocky/wocky-meta-porter.c
@@ -463,7 +463,7 @@ _new_connection (GSocketService *service,
return TRUE;
}
-static void porter_disposed_cb (gpointer data, GObject *porter);
+static void stanza_handler_porter_disposed_cb (gpointer data, GObject *porter);
static void
free_handler (gpointer data)
@@ -481,7 +481,7 @@ free_handler (gpointer data)
wocky_porter_unregister_handler (porter, id);
g_object_weak_unref (G_OBJECT (porter),
- porter_disposed_cb, handler);
+ stanza_handler_porter_disposed_cb, handler);
}
g_hash_table_destroy (handler->porters);
@@ -1030,7 +1030,7 @@ porter_handler_cb (WockyPorter *porter,
}
static void
-porter_disposed_cb (gpointer data,
+stanza_handler_porter_disposed_cb (gpointer data,
GObject *porter)
{
StanzaHandler *handler = data;
@@ -1067,7 +1067,8 @@ register_porter_handler (StanzaHandler *handler,
g_hash_table_insert (handler->porters, porter, GUINT_TO_POINTER (id));
- g_object_weak_ref (G_OBJECT (porter), porter_disposed_cb, handler);
+ g_object_weak_ref (G_OBJECT (porter),
+ stanza_handler_porter_disposed_cb, handler);
}
static void