[telepathy-gabble/master] rename GabblePubsubEventHandlerFunction and GabblePubsubEventHandler

[Guillaume Desmottes]

---
 src/wocky-pubsub.c |    8 ++++----
 src/wocky-pubsub.h |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/wocky-pubsub.c b/src/wocky-pubsub.c
index d237375..1a450de 100644
--- a/src/wocky-pubsub.c
+++ b/src/wocky-pubsub.c
@@ -174,10 +174,10 @@ wocky_pubsub_class_init (WockyPubsubClass *wocky_pubsub_class)
 typedef struct
 {
     const gchar *ns;
-    GabblePubsubEventHandlerFunction handle_function;
-} GabblePubsubEventHandler;
+    WockyPubsubEventHandlerFunction handle_function;
+} PubsubEventHandler;
 
-static const GabblePubsubEventHandler pubsub_event_handlers[] =
+static const PubsubEventHandler pubsub_event_handlers[] =
 {
     { NS_NICK, gabble_conn_aliasing_pep_nick_event_handler },
     { NS_OLPC_BUDDY_PROPS, olpc_buddy_info_properties_event_handler},
@@ -194,7 +194,7 @@ gabble_pubsub_event_handler (GabbleConnection *conn,
     const gchar *from,
     WockyXmppNode *item_node)
 {
-  const GabblePubsubEventHandler *i;
+  const PubsubEventHandler *i;
   const gchar *event_ns;
 
   if (node_iter (item_node) == NULL)
diff --git a/src/wocky-pubsub.h b/src/wocky-pubsub.h
index 0151e98..75a7ebc 100644
--- a/src/wocky-pubsub.h
+++ b/src/wocky-pubsub.h
@@ -58,7 +58,7 @@ GType wocky_pubsub_get_type (void);
 WockyPubsub * wocky_pubsub_new (WockySession *session);
 
 /* not methods */
-typedef gboolean (* GabblePubsubEventHandlerFunction) (GabbleConnection *conn,
+typedef gboolean (* WockyPubsubEventHandlerFunction) (GabbleConnection *conn,
     WockyXmppStanza *msg,
     const gchar *from);
 
-- 
1.5.6.5