Prefix jingle-related files with wocky-

Jonny said on <https://bugs.freedesktop.org/show_bug.cgi?id=58198#c1>:

> I see you've moved this stuff into wocky/jingle-*.[ch]. Although I
> hate the "wocky-" prefix as much as anyone else, I think inconsistency
> is even worse. What are your thoughts on this?

I think he is correct.

23 files changed, 81 insertions, 81 deletions

diff --git a/wocky/Makefile.am b/wocky/Makefile.am
index fe6daa4..fde51ba 100644
--- a/wocky/Makefile.am
+++ b/wocky/Makefile.am
@@ -14,11 +14,11 @@ endif
 EXTRA_DIST =
 
 enumtype_sources = \
-  jingle-types.h \
-  jingle-info-internal.h \
   wocky-auth-registry.h \
   wocky-connector.h \
   wocky-data-form.h \
+  wocky-jingle-info-internal.h \
+  wocky-jingle-types.h \
   wocky-muc.h \
   wocky-pubsub-node.h \
   wocky-pubsub-service.h \
@@ -52,18 +52,6 @@ PROXY_SRC = \
   wocky-http-proxy.c
 
 handwritten_headers = \
-  google-relay.h \
-  jingle-content.h \
-  jingle-factory.h \
-  jingle-info-internal.h \
-  jingle-info.h \
-  jingle-media-rtp.h \
-  jingle-session.h \
-  jingle-transport-google.h \
-  jingle-transport-iceudp.h \
-  jingle-transport-iface.h \
-  jingle-transport-rawudp.h \
-  jingle-types.h \
   wocky.h \
   wocky-auth-handler.h \
   wocky-auth-registry.h \
@@ -78,9 +66,21 @@ handwritten_headers = \
   wocky-data-form.h \
   wocky-debug.h \
   wocky-disco-identity.h \
+  wocky-google-relay.h \
   wocky-jabber-auth.h \
   wocky-jabber-auth-digest.h \
   wocky-jabber-auth-password.h \
+  wocky-jingle-content.h \
+  wocky-jingle-factory.h \
+  wocky-jingle-info-internal.h \
+  wocky-jingle-info.h \
+  wocky-jingle-media-rtp.h \
+  wocky-jingle-session.h \
+  wocky-jingle-transport-google.h \
+  wocky-jingle-transport-iceudp.h \
+  wocky-jingle-transport-iface.h \
+  wocky-jingle-transport-rawudp.h \
+  wocky-jingle-types.h \
   wocky-ll-connector.h \
   wocky-ll-contact.h \
   wocky-loopback-stream.h \
@@ -118,16 +118,6 @@ handwritten_headers = \
   wocky-xmpp-writer.h
 
 handwritten_sources = \
-  google-relay.c \
-  jingle-content.c \
-  jingle-factory.c \
-  jingle-info.c \
-  jingle-media-rtp.c \
-  jingle-session.c \
-  jingle-transport-google.c \
-  jingle-transport-iceudp.c \
-  jingle-transport-iface.c \
-  jingle-transport-rawudp.c \
   wocky.c \
   wocky-auth-handler.c \
   wocky-auth-registry.c \
@@ -145,9 +135,19 @@ handwritten_sources = \
   wocky-disco-identity.c \
   wocky-heartbeat-source.c \
   wocky-heartbeat-source.h \
+  wocky-google-relay.c \
   wocky-jabber-auth.c \
   wocky-jabber-auth-digest.c \
   wocky-jabber-auth-password.c \
+  wocky-jingle-content.c \
+  wocky-jingle-factory.c \
+  wocky-jingle-info.c \
+  wocky-jingle-media-rtp.c \
+  wocky-jingle-session.c \
+  wocky-jingle-transport-google.c \
+  wocky-jingle-transport-iceudp.c \
+  wocky-jingle-transport-iface.c \
+  wocky-jingle-transport-rawudp.c \
   wocky-ll-connector.c \
   wocky-ll-contact.c \
   wocky-loopback-stream.c \
diff --git a/wocky/google-relay.c b/wocky/wocky-google-relay.c
index 2ddabf0..589820a 100644
--- a/wocky/google-relay.c
+++ b/wocky/wocky-google-relay.c
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "google-relay.h"
+#include "wocky-google-relay.h"
 
 #include <string.h>
 
diff --git a/wocky/google-relay.h b/wocky/wocky-google-relay.h
index d8a5fe0..89e61c7 100644
--- a/wocky/google-relay.h
+++ b/wocky/wocky-google-relay.h
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 
-#include "jingle-info.h"
+#include "wocky-jingle-info.h"
 
 G_BEGIN_DECLS
 
diff --git a/wocky/jingle-content.c b/wocky/wocky-jingle-content.c
index c299523..097fa96 100644
--- a/wocky/jingle-content.c
+++ b/wocky/wocky-jingle-content.c
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "jingle-content.h"
+#include "wocky-jingle-content.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,11 +28,11 @@
 #define WOCKY_DEBUG_FLAG WOCKY_DEBUG_JINGLE
 
 #include "wocky-debug-internal.h"
-#include "jingle-factory.h"
-#include "jingle-session.h"
-#include "jingle-transport-iface.h"
-#include "jingle-transport-google.h"
-#include "jingle-media-rtp.h"
+#include "wocky-jingle-factory.h"
+#include "wocky-jingle-session.h"
+#include "wocky-jingle-transport-iface.h"
+#include "wocky-jingle-transport-google.h"
+#include "wocky-jingle-media-rtp.h"
 #include "wocky-namespaces.h"
 #include "wocky-signals-marshal.h"
 
diff --git a/wocky/jingle-content.h b/wocky/wocky-jingle-content.h
index cf55798..4af1c54 100644
--- a/wocky/jingle-content.h
+++ b/wocky/wocky-jingle-content.h
@@ -22,9 +22,9 @@
 
 #include <glib-object.h>
 
-#include "jingle-factory.h"
-#include "jingle-transport-iface.h"
-#include "jingle-types.h"
+#include "wocky-jingle-factory.h"
+#include "wocky-jingle-transport-iface.h"
+#include "wocky-jingle-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/wocky/jingle-factory.c b/wocky/wocky-jingle-factory.c
index 1ebe466..34bff0b 100644
--- a/wocky/jingle-factory.c
+++ b/wocky/wocky-jingle-factory.c
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "jingle-factory.h"
+#include "wocky-jingle-factory.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -31,14 +31,14 @@
 
 #include "wocky-debug-internal.h"
 #include "wocky-signals-marshal.h"
-#include "jingle-media-rtp.h"
-#include "jingle-session.h"
-#include "jingle-transport-google.h"
-#include "jingle-transport-rawudp.h"
-#include "jingle-transport-iceudp.h"
+#include "wocky-jingle-media-rtp.h"
+#include "wocky-jingle-session.h"
+#include "wocky-jingle-transport-google.h"
+#include "wocky-jingle-transport-rawudp.h"
+#include "wocky-jingle-transport-iceudp.h"
 #include "wocky-namespaces.h"
 
-#include "google-relay.h"
+#include "wocky-google-relay.h"
 
 G_DEFINE_TYPE(WockyJingleFactory, wocky_jingle_factory, G_TYPE_OBJECT);
 
diff --git a/wocky/jingle-factory.h b/wocky/wocky-jingle-factory.h
index 49745ce..5ae8c04 100644
--- a/wocky/jingle-factory.h
+++ b/wocky/wocky-jingle-factory.h
@@ -22,8 +22,8 @@
 
 #include <glib-object.h>
 
-#include "jingle-info.h"
-#include "jingle-types.h"
+#include "wocky-jingle-info.h"
+#include "wocky-jingle-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/wocky/jingle-info-internal.h b/wocky/wocky-jingle-info-internal.h
index fa0707b..fa0707b 100644
--- a/wocky/jingle-info-internal.h
+++ b/wocky/wocky-jingle-info-internal.h
diff --git a/wocky/jingle-info.c b/wocky/wocky-jingle-info.c
index 4014de8..de7e8e7 100644
--- a/wocky/jingle-info.c
+++ b/wocky/wocky-jingle-info.c
@@ -19,14 +19,14 @@
 
 #include "config.h"
 
-#include "jingle-info.h"
-#include "jingle-info-internal.h"
+#include "wocky-jingle-info.h"
+#include "wocky-jingle-info-internal.h"
 
 #include <stdlib.h>
 
 #define WOCKY_DEBUG_FLAG WOCKY_DEBUG_JINGLE
 #include "wocky-debug-internal.h"
-#include "google-relay.h"
+#include "wocky-google-relay.h"
 #include "wocky-enumtypes.h"
 #include "wocky-signals-marshal.h"
 #include "wocky-namespaces.h"
diff --git a/wocky/jingle-info.h b/wocky/wocky-jingle-info.h
index d006da4..d006da4 100644
--- a/wocky/jingle-info.h
+++ b/wocky/wocky-jingle-info.h
diff --git a/wocky/jingle-media-rtp.c b/wocky/wocky-jingle-media-rtp.c
index fb88eec..31e69cc 100644
--- a/wocky/jingle-media-rtp.c
+++ b/wocky/wocky-jingle-media-rtp.c
@@ -23,7 +23,7 @@
  * (libjingle 0.3/0.4). */
 
 #include "config.h"
-#include "jingle-media-rtp.h"
+#include "wocky-jingle-media-rtp.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -33,11 +33,11 @@
 #define WOCKY_DEBUG_FLAG WOCKY_DEBUG_JINGLE
 
 #include "wocky-debug-internal.h"
-#include "jingle-content.h"
-#include "jingle-factory.h"
-#include "jingle-session.h"
+#include "wocky-jingle-content.h"
+#include "wocky-jingle-factory.h"
+#include "wocky-jingle-session.h"
 #include "wocky-namespaces.h"
-#include "jingle-transport-google.h"
+#include "wocky-jingle-transport-google.h"
 
 G_DEFINE_TYPE (WockyJingleMediaRtp,
     wocky_jingle_media_rtp, WOCKY_TYPE_JINGLE_CONTENT);
diff --git a/wocky/jingle-media-rtp.h b/wocky/wocky-jingle-media-rtp.h
index dcac35e..599a6b3 100644
--- a/wocky/jingle-media-rtp.h
+++ b/wocky/wocky-jingle-media-rtp.h
@@ -22,8 +22,8 @@
 
 #include <glib-object.h>
 
-#include "jingle-content.h"
-#include "jingle-types.h"
+#include "wocky-jingle-content.h"
+#include "wocky-jingle-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/wocky/jingle-session.c b/wocky/wocky-jingle-session.c
index 26f27c6..613c1ea 100644
--- a/wocky/jingle-session.c
+++ b/wocky/wocky-jingle-session.c
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "jingle-session.h"
+#include "wocky-jingle-session.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,12 +32,12 @@
 #include "wocky-debug-internal.h"
 #include "wocky-signals-marshal.h"
 #include "wocky-enumtypes.h"
-#include "jingle-content.h"
-#include "jingle-factory.h"
+#include "wocky-jingle-content.h"
+#include "wocky-jingle-factory.h"
 /* FIXME: the RTP-specific bits of this file should be separated from the
  *        generic Jingle code.
  */
-#include "jingle-media-rtp.h"
+#include "wocky-jingle-media-rtp.h"
 #include "wocky-namespaces.h"
 
 G_DEFINE_TYPE(WockyJingleSession, wocky_jingle_session, G_TYPE_OBJECT);
diff --git a/wocky/jingle-session.h b/wocky/wocky-jingle-session.h
index 4c1898e..815671d 100644
--- a/wocky/jingle-session.h
+++ b/wocky/wocky-jingle-session.h
@@ -23,9 +23,9 @@
 #include <glib-object.h>
 #include <wocky/wocky.h>
 
-#include "jingle-content.h"
-#include "jingle-factory.h"
-#include "jingle-types.h"
+#include "wocky-jingle-content.h"
+#include "wocky-jingle-factory.h"
+#include "wocky-jingle-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/wocky/jingle-transport-google.c b/wocky/wocky-jingle-transport-google.c
index 1d99b15..1c963c2 100644
--- a/wocky/jingle-transport-google.c
+++ b/wocky/wocky-jingle-transport-google.c
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "jingle-transport-google.h"
+#include "wocky-jingle-transport-google.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,9 +29,9 @@
 #define WOCKY_DEBUG_FLAG WOCKY_DEBUG_JINGLE
 
 #include "wocky-debug-internal.h"
-#include "jingle-content.h"
-#include "jingle-factory.h"
-#include "jingle-session.h"
+#include "wocky-jingle-content.h"
+#include "wocky-jingle-factory.h"
+#include "wocky-jingle-session.h"
 #include "wocky-namespaces.h"
 
 static void
diff --git a/wocky/jingle-transport-google.h b/wocky/wocky-jingle-transport-google.h
index ede7356..f96bc16 100644
--- a/wocky/jingle-transport-google.h
+++ b/wocky/wocky-jingle-transport-google.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include "jingle-types.h"
+#include "wocky-jingle-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/wocky/jingle-transport-iceudp.c b/wocky/wocky-jingle-transport-iceudp.c
index 15256fb..55a36cf 100644
--- a/wocky/jingle-transport-iceudp.c
+++ b/wocky/wocky-jingle-transport-iceudp.c
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "jingle-transport-iceudp.h"
+#include "wocky-jingle-transport-iceudp.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,9 +29,9 @@
 #define WOCKY_DEBUG_FLAG WOCKY_DEBUG_JINGLE
 
 #include "wocky-debug-internal.h"
-#include "jingle-content.h"
-#include "jingle-factory.h"
-#include "jingle-session.h"
+#include "wocky-jingle-content.h"
+#include "wocky-jingle-factory.h"
+#include "wocky-jingle-session.h"
 #include "wocky-namespaces.h"
 
 static void
diff --git a/wocky/jingle-transport-iceudp.h b/wocky/wocky-jingle-transport-iceudp.h
index 1aff196..b01c9fc 100644
--- a/wocky/jingle-transport-iceudp.h
+++ b/wocky/wocky-jingle-transport-iceudp.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include "jingle-types.h"
+#include "wocky-jingle-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/wocky/jingle-transport-iface.c b/wocky/wocky-jingle-transport-iface.c
index d20e522..ef45de5 100644
--- a/wocky/jingle-transport-iface.c
+++ b/wocky/wocky-jingle-transport-iface.c
@@ -18,12 +18,12 @@
  */
 
 #include "config.h"
-#include "jingle-transport-iface.h"
+#include "wocky-jingle-transport-iface.h"
 
 #include <glib.h>
 
-#include "jingle-content.h"
-#include "jingle-session.h"
+#include "wocky-jingle-content.h"
+#include "wocky-jingle-session.h"
 
 WockyJingleTransportIface *
 wocky_jingle_transport_iface_new (GType type,
diff --git a/wocky/jingle-transport-iface.h b/wocky/wocky-jingle-transport-iface.h
index 0801e28..eb4d9a9 100644
--- a/wocky/jingle-transport-iface.h
+++ b/wocky/wocky-jingle-transport-iface.h
@@ -23,8 +23,8 @@
 #include <glib-object.h>
 #include <wocky/wocky.h>
 
-#include "jingle-factory.h"
-#include "jingle-types.h"
+#include "wocky-jingle-factory.h"
+#include "wocky-jingle-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/wocky/jingle-transport-rawudp.c b/wocky/wocky-jingle-transport-rawudp.c
index ada1226..c662cfe 100644
--- a/wocky/jingle-transport-rawudp.c
+++ b/wocky/wocky-jingle-transport-rawudp.c
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "jingle-transport-rawudp.h"
+#include "wocky-jingle-transport-rawudp.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,9 +29,9 @@
 #define WOCKY_DEBUG_FLAG WOCKY_DEBUG_JINGLE
 
 #include "wocky-debug-internal.h"
-#include "jingle-content.h"
-#include "jingle-factory.h"
-#include "jingle-session.h"
+#include "wocky-jingle-content.h"
+#include "wocky-jingle-factory.h"
+#include "wocky-jingle-session.h"
 #include "wocky-namespaces.h"
 
 static void
diff --git a/wocky/jingle-transport-rawudp.h b/wocky/wocky-jingle-transport-rawudp.h
index b3fc8a0..cb7a2ae 100644
--- a/wocky/jingle-transport-rawudp.h
+++ b/wocky/wocky-jingle-transport-rawudp.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include "jingle-types.h"
+#include "wocky-jingle-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/wocky/jingle-types.h b/wocky/wocky-jingle-types.h
index 37d5c25..37d5c25 100644
--- a/wocky/jingle-types.h
+++ b/wocky/wocky-jingle-types.h