Mercurial > pidgin3 / changeset

--- a/libpurple/protocols/jabber/google.h	Sun Apr 05 19:14:19 2009 +0000
+++ b/libpurple/protocols/jabber/google.h	Sun Apr 05 19:16:14 2009 +0000
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#ifndef _PURPLE_GOOGLE_H_
-#define _PURPLE_GOOGLE_H_
+#ifndef _PURPLE_JABBER_GOOGLE_H_
+#define _PURPLE_JABBER_GOOGLE_H_
 
 /* This is a place for Google Talk-specific XMPP extensions to live
  * such that they don't intermingle with code for the XMPP RFCs and XEPs :) */
@@ -58,4 +58,4 @@
                                       xmlnode *child);
 void jabber_google_send_jingle_info(JabberStream *js);
 
-#endif   /* _PURPLE_GOOGLE_H_ */
+#endif   /* _PURPLE_JABBER_GOOGLE_H_ */

--- a/libpurple/protocols/jabber/jingle/content.h	Sun Apr 05 19:14:19 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/content.h	Sun Apr 05 19:16:14 2009 +0000
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#ifndef JINGLE_CONTENT_H
-#define JINGLE_CONTENT_H
+#ifndef PURPLE_JABBER_JINGLE_CONTENT_H
+#define PURPLE_JABBER_JINGLE_CONTENT_H
 
 
 #include "jabber.h"
@@ -113,5 +113,5 @@
 
 G_END_DECLS
 
-#endif /* JINGLE_CONTENT_H */
+#endif /* PURPLE_JABBER_JINGLE_CONTENT_H */
 

--- a/libpurple/protocols/jabber/jingle/iceudp.h	Sun Apr 05 19:14:19 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/iceudp.h	Sun Apr 05 19:16:14 2009 +0000
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#ifndef JINGLE_ICEUDP_H
-#define JINGLE_ICEUDP_H
+#ifndef PURPLE_JABBER_JINGLE_ICEUDP_H
+#define PURPLE_JABBER_JINGLE_ICEUDP_H
 
 #include <glib.h>
 #include <glib-object.h>
@@ -110,5 +110,5 @@
 
 G_END_DECLS
 
-#endif /* JINGLE_ICEUDP_H */
+#endif /* PURPLE_JABBER_JINGLE_ICEUDP_H */
 

--- a/libpurple/protocols/jabber/jingle/jingle.h	Sun Apr 05 19:14:19 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/jingle.h	Sun Apr 05 19:16:14 2009 +0000
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
  */
  
-#ifndef JINGLE_H
-#define JINGLE_H
+#ifndef PURPLE_JABBER_JINGLE_H
+#define PURPLE_JABBER_JINGLE_H
 
 #include "jabber.h"
 
@@ -84,4 +84,4 @@
 
 G_END_DECLS
 
-#endif /* JINGLE_H */
+#endif /* PURPLE_JABBER_JINGLE_H */

--- a/libpurple/protocols/jabber/jingle/rawudp.h	Sun Apr 05 19:14:19 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/rawudp.h	Sun Apr 05 19:16:14 2009 +0000
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#ifndef JINGLE_RAWUDP_H
-#define JINGLE_RAWUDP_H
+#ifndef PURPLE_JABBER_JINGLE_RAWUDP_H
+#define PURPLE_JABBER_JINGLE_RAWUDP_H
 
 #include <glib.h>
 #include <glib-object.h>
@@ -97,5 +97,5 @@
 
 G_END_DECLS
 
-#endif /* JINGLE_RAWUDP_H */
+#endif /* PURPLE_JABBER_JINGLE_RAWUDP_H */
 

--- a/libpurple/protocols/jabber/jingle/rtp.h	Sun Apr 05 19:14:19 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/rtp.h	Sun Apr 05 19:16:14 2009 +0000
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#ifndef JINGLE_RTP_H
-#define JINGLE_RTP_H
+#ifndef PURPLE_JABBER_JINGLE_RTP_H
+#define PURPLE_JABBER_JINGLE_RTP_H
 
 #include "config.h"
 
@@ -88,5 +88,5 @@
 
 #endif /* USE_VV */
 
-#endif /* JINGLE_RTP_H */
+#endif /* PURPLE_JABBER_JINGLE_RTP_H */
 

--- a/libpurple/protocols/jabber/jingle/session.h	Sun Apr 05 19:14:19 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/session.h	Sun Apr 05 19:16:14 2009 +0000
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#ifndef JINGLE_SESSION_H
-#define JINGLE_SESSION_H
+#ifndef PURPLE_JABBER_JINGLE_SESSION_H
+#define PURPLE_JABBER_JINGLE_SESSION_H
 
 #include "iq.h"
 #include "jabber.h"
@@ -111,5 +111,5 @@
 
 G_END_DECLS
 
-#endif /* JINGLE_SESSION_H */
+#endif /* PURPLE_JABBER_JINGLE_SESSION_H */
 

--- a/libpurple/protocols/jabber/jingle/transport.h	Sun Apr 05 19:14:19 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/transport.h	Sun Apr 05 19:16:14 2009 +0000
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#ifndef JINGLE_TRANSPORT_H
-#define JINGLE_TRANSPORT_H
+#ifndef PURPLE_JABBER_JINGLE_TRANSPORT_H
+#define PURPLE_JABBER_JINGLE_TRANSPORT_H
 
 #include <glib.h>
 #include <glib-object.h>
@@ -84,5 +84,5 @@
 
 G_END_DECLS
 
-#endif /* JINGLE_TRANSPORT_H */
+#endif /* PURPLE_JABBER_JINGLE_TRANSPORT_H */