cpw.darkrain42.xmpp.iq-handlers: 8a9c0c26: Further standardize the sentinel style (...

paul at darkrain42.org paul at darkrain42.org
Sun Apr 5 15:30:40 EDT 2009


-----------------------------------------------------------------
Revision: 8a9c0c26ae6432af9cf6ba478bfb09dd0e377de8
Ancestor: bbd3125487c5ee8bfd6e76a9af98d4688c6b5563
Author: paul at darkrain42.org
Date: 2009-04-05T19:21:22
Branch: im.pidgin.cpw.darkrain42.xmpp.iq-handlers
URL: http://d.pidgin.im/viewmtn/revision/info/8a9c0c26ae6432af9cf6ba478bfb09dd0e377de8

Modified files:
        libpurple/protocols/jabber/adhoccommands.h
        libpurple/protocols/jabber/auth.h
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/caps.h
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/disco.h
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/iq.h
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/message.h
        libpurple/protocols/jabber/oob.h
        libpurple/protocols/jabber/parser.h
        libpurple/protocols/jabber/pep.h
        libpurple/protocols/jabber/ping.h
        libpurple/protocols/jabber/presence.h
        libpurple/protocols/jabber/roster.h
        libpurple/protocols/jabber/si.h
        libpurple/protocols/jabber/usermood.h
        libpurple/protocols/jabber/usernick.h
        libpurple/protocols/jabber/usertune.h
        libpurple/protocols/jabber/xdata.h

ChangeLog: 

Further standardize the sentinel style (did someone say leading _s are theoretically a reserved namespace?)

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/adhoccommands.h	c882e33aefc07804fbcd0d9b735517cfcbd5d360
+++ libpurple/protocols/jabber/adhoccommands.h	8d18780c8a1e587a5371fc095ce7d58f72bea793
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _PURPLE_JABBER_ADHOCCOMMANDS_H_
-#define _PURPLE_JABBER_ADHOCCOMMANDS_H_
+#ifndef PURPLE_JABBER_ADHOCCOMMANDS_H_
+#define PURPLE_JABBER_ADHOCCOMMANDS_H_
 
 #include "jabber.h"
 
@@ -38,4 +38,4 @@ void jabber_adhoc_init_server_commands(J
 
 void jabber_adhoc_init_server_commands(JabberStream *js, GList **m);
 
-#endif /* _PURPLE_JABBER_ADHOCCOMMANDS_H_ */
+#endif /* PURPLE_JABBER_ADHOCCOMMANDS_H_ */
============================================================
--- libpurple/protocols/jabber/auth.h	8531133253329f8246c973703eb4aa19af27a0d5
+++ libpurple/protocols/jabber/auth.h	2a90010378843ebebd3db6b4c87094440ed64ec1
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_AUTH_H_
-#define _PURPLE_JABBER_AUTH_H_
+#ifndef PURPLE_JABBER_AUTH_H_
+#define PURPLE_JABBER_AUTH_H_
 
 #include "jabber.h"
 #include "xmlnode.h"
@@ -32,4 +32,4 @@ void jabber_auth_handle_failure(JabberSt
 void jabber_auth_handle_success(JabberStream *js, xmlnode *packet);
 void jabber_auth_handle_failure(JabberStream *js, xmlnode *packet);
 
-#endif /* _PURPLE_JABBER_AUTH_H_ */
+#endif /* PURPLE_JABBER_AUTH_H_ */
============================================================
--- libpurple/protocols/jabber/buddy.h	2c66e667ba011643a938ad8554fe3de88a9928b9
+++ libpurple/protocols/jabber/buddy.h	8d1fa59e5c9fa698b5cf0d3322397fefed9c4615
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_BUDDY_H_
-#define _PURPLE_JABBER_BUDDY_H_
+#ifndef PURPLE_JABBER_BUDDY_H_
+#define PURPLE_JABBER_BUDDY_H_
 
 typedef enum {
 	JABBER_BUDDY_STATE_UNKNOWN = -2,
@@ -123,4 +123,4 @@ gboolean jabber_buddy_has_capability(con
 										const gchar *cap);
 gboolean jabber_buddy_has_capability(const JabberBuddy *jb, const gchar *cap);
 
-#endif /* _PURPLE_JABBER_BUDDY_H_ */
+#endif /* PURPLE_JABBER_BUDDY_H_ */
============================================================
--- libpurple/protocols/jabber/caps.h	54e06b19e06eab75e72c513e76a90644b8433318
+++ libpurple/protocols/jabber/caps.h	65407c45024cc0731d99b57c380085f462908858
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _PURPLE_JABBER_CAPS_H_
-#define _PURPLE_JABBER_CAPS_H_
+#ifndef PURPLE_JABBER_CAPS_H_
+#define PURPLE_JABBER_CAPS_H_
 
 typedef struct _JabberCapsClientInfo JabberCapsClientInfo;
 
@@ -46,4 +46,4 @@ void jabber_caps_free_clientinfo(JabberC
 void jabber_caps_get_info(JabberStream *js, const char *who, const char *node, const char *ver, const char *ext, jabber_caps_get_info_cb cb, gpointer user_data);
 void jabber_caps_free_clientinfo(JabberCapsClientInfo *clientinfo);
 
-#endif /* _PURPLE_JABBER_CAPS_H_ */
+#endif /* PURPLE_JABBER_CAPS_H_ */
============================================================
--- libpurple/protocols/jabber/chat.h	c0bbce375c14390fe32a65d300ebbb780e7cf6df
+++ libpurple/protocols/jabber/chat.h	64957c6fb9b83298ecc5c07378e6821c3c8d209e
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_CHAT_H_
-#define _PURPLE_JABBER_CHAT_H_
+#ifndef PURPLE_JABBER_CHAT_H_
+#define PURPLE_JABBER_CHAT_H_
 
 #include "internal.h"
 #include "connection.h"
@@ -94,4 +94,4 @@ char *jabber_roomlist_room_serialize(Pur
 char *jabber_roomlist_room_serialize(PurpleRoomlistRoom *room);
 
 
-#endif /* _PURPLE_JABBER_CHAT_H_ */
+#endif /* PURPLE_JABBER_CHAT_H_ */
============================================================
--- libpurple/protocols/jabber/data.h	6dae8376bba85eeec08ccd847d4b3398bc4a2aba
+++ libpurple/protocols/jabber/data.h	b3974dd1898cde78b06c5206cf47a55397af733c
@@ -14,8 +14,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
  */
 
-#ifndef JABBER_DATA_H
-#define JABBER_DATA_H
+#ifndef PURPLE_JABBER_DATA_H
+#define PURPLE_JABBER_DATA_H
 
 #include "xmlnode.h"
 #include "jabber.h"
@@ -71,4 +71,4 @@ void jabber_data_uninit(void);
 void jabber_data_init(void);
 void jabber_data_uninit(void);
 
-#endif /* JABBER_DATA_H */
+#endif /* PURPLE_JABBER_DATA_H */
============================================================
--- libpurple/protocols/jabber/disco.h	2e2cd8127090a517c803b5ffd232b23c5dd6f8e4
+++ libpurple/protocols/jabber/disco.h	eb24d8f8cc5fce809805736de681cc2fa74f190a
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_DISCO_H_
-#define _PURPLE_JABBER_DISCO_H_
+#ifndef PURPLE_JABBER_DISCO_H_
+#define PURPLE_JABBER_DISCO_H_
 
 #include "jabber.h"
 
@@ -37,4 +37,4 @@ void jabber_disco_info_do(JabberStream *
 void jabber_disco_info_do(JabberStream *js, const char *who,
 		JabberDiscoInfoCallback *callback, gpointer data);
 
-#endif /* _PURPLE_JABBER_DISCO_H_ */
+#endif /* PURPLE_JABBER_DISCO_H_ */
============================================================
--- libpurple/protocols/jabber/google.h	c9f8f8701ebcfa11a2bd45896e3e21e9611b19f6
+++ libpurple/protocols/jabber/google.h	68e1b0e843201f8196f405b56d57fc0f783e3d7f
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#ifndef _PURPLE_JABBER_GOOGLE_H_
-#define _PURPLE_JABBER_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 @@ void jabber_google_send_jingle_info(Jabb
                                       xmlnode *child);
 void jabber_google_send_jingle_info(JabberStream *js);
 
-#endif   /* _PURPLE_JABBER_GOOGLE_H_ */
+#endif   /* PURPLE_JABBER_GOOGLE_H_ */
============================================================
--- libpurple/protocols/jabber/ibb.h	fc9b99d46502c00aa067b6688a5adb11d3749e77
+++ libpurple/protocols/jabber/ibb.h	45c8f2369ac36b86c0586189ec54d4c165f4c336
@@ -14,8 +14,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
  */
 
-#ifndef _PURPLE_JABBER_IBB_H_
-#define _PURPLE_JABBER_IBB_H_
+#ifndef PURPLE_JABBER_IBB_H_
+#define PURPLE_JABBER_IBB_H_
 
 #include "jabber.h"
 #include "iq.h"
@@ -118,4 +118,4 @@ void jabber_ibb_uninit(void);
 void jabber_ibb_init(void);
 void jabber_ibb_uninit(void);
 
-#endif /* _PURPLE_JABBER_IBB_H_ */
+#endif /* PURPLE_JABBER_IBB_H_ */
============================================================
--- libpurple/protocols/jabber/iq.h	3da2757e4da6e968ddaf8755077567eb4f3bd365
+++ libpurple/protocols/jabber/iq.h	4d71fd72742c2e96c449562d21daec4dbecdffe5
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_IQ_H_
-#define _PURPLE_JABBER_IQ_H_
+#ifndef PURPLE_JABBER_IQ_H_
+#define PURPLE_JABBER_IQ_H_
 
 typedef enum {
 	JABBER_IQ_SET,
@@ -106,4 +106,4 @@ void jabber_iq_register_handler(const ch
 void jabber_iq_register_handler(const char *node, const char *xmlns,
                                 JabberIqHandler *func);
 
-#endif /* _PURPLE_JABBER_IQ_H_ */
+#endif /* PURPLE_JABBER_IQ_H_ */
============================================================
--- libpurple/protocols/jabber/jabber.h	dd19382cee2dc4a6348c6e10721764bf98422b0d
+++ libpurple/protocols/jabber/jabber.h	ced1b9a91d958b4522fd9ca54d3d0776eee9a50e
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_H_
-#define _PURPLE_JABBER_H_
+#ifndef PURPLE_JABBER_H_
+#define PURPLE_JABBER_H_
 
 typedef enum {
 	JABBER_CAP_NONE           = 0,
@@ -329,4 +329,4 @@ void jabber_init_plugin(PurplePlugin *pl
 void jabber_register_commands(void);
 void jabber_init_plugin(PurplePlugin *plugin);
 
-#endif /* _PURPLE_JABBER_H_ */
+#endif /* PURPLE_JABBER_H_ */
============================================================
--- libpurple/protocols/jabber/jutil.h	0a047f7a52efe4f5972f05ce012bd7e636e344c3
+++ libpurple/protocols/jabber/jutil.h	32198fa56730eb5a903824d28023404ac9e249de
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_JUTIL_H_
-#define _PURPLE_JABBER_JUTIL_H_
+#ifndef PURPLE_JABBER_JUTIL_H_
+#define PURPLE_JABBER_JUTIL_H_
 
 typedef struct _JabberID {
 	char *node;
@@ -43,4 +43,4 @@ char *jabber_calculate_data_sha1sum(gcon
 PurpleConversation *jabber_find_unnormalized_conv(const char *name, PurpleAccount *account);
 
 char *jabber_calculate_data_sha1sum(gconstpointer data, size_t len);
-#endif /* _PURPLE_JABBER_JUTIL_H_ */
+#endif /* PURPLE_JABBER_JUTIL_H_ */
============================================================
--- libpurple/protocols/jabber/message.h	9752c7ff701e0b13700a13cb43fb7623cf49bd94
+++ libpurple/protocols/jabber/message.h	7fb848f03ba2d8c60a187176280c2e44ab407906
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_MESSAGE_H_
-#define _PURPLE_JABBER_MESSAGE_H_
+#ifndef PURPLE_JABBER_MESSAGE_H_
+#define PURPLE_JABBER_MESSAGE_H_
 
 #include "buddy.h"
 #include "jabber.h"
@@ -85,4 +85,4 @@ gboolean jabber_custom_smileys_isenabled
 gboolean jabber_custom_smileys_isenabled(JabberStream *js, const gchar *shortname,
 										 const gchar *namespace);
 
-#endif /* _PURPLE_JABBER_MESSAGE_H_ */
+#endif /* PURPLE_JABBER_MESSAGE_H_ */
============================================================
--- libpurple/protocols/jabber/oob.h	3c38cf401d5e380de983937455aa8233aba8b32a
+++ libpurple/protocols/jabber/oob.h	be13802ae1d207ee2d0aab065e85fd1e1bf19dde
@@ -19,12 +19,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_OOB_H_
-#define _PURPLE_JABBER_OOB_H_
+#ifndef PURPLE_JABBER_OOB_H_
+#define PURPLE_JABBER_OOB_H_
 
 #include "jabber.h"
 
 void jabber_oob_parse(JabberStream *js, const char *from, JabberIqType type,
                       const char *id, xmlnode *querynode);
 
-#endif /* _PURPLE_JABBER_OOB_H_ */
+#endif /* PURPLE_JABBER_OOB_H_ */
============================================================
--- libpurple/protocols/jabber/parser.h	bbc239a21eaa581c3c7c3f5a0546b085b4699532
+++ libpurple/protocols/jabber/parser.h	c526f48b9ac2937da268256ea33ef50693fcaacc
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_PARSER_H_
-#define _PURPLE_JABBER_PARSER_H_
+#ifndef PURPLE_JABBER_PARSER_H_
+#define PURPLE_JABBER_PARSER_H_
 
 #include "jabber.h"
 
@@ -28,4 +28,4 @@ void jabber_parser_process(JabberStream 
 void jabber_parser_free(JabberStream *js);
 void jabber_parser_process(JabberStream *js, const char *buf, int len);
 
-#endif /* _PURPLE_JABBER_PARSER_H_ */
+#endif /* PURPLE_JABBER_PARSER_H_ */
============================================================
--- libpurple/protocols/jabber/pep.h	4f339e49eb6b796b29106616bc73723d7ce0878f
+++ libpurple/protocols/jabber/pep.h	90be9b47f6ea6d8f84b02d7d9b660f8eb254d411
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _PURPLE_JABBER_PEP_H_
-#define _PURPLE_JABBER_PEP_H_
+#ifndef PURPLE_JABBER_PEP_H_
+#define PURPLE_JABBER_PEP_H_
 
 #include "jabber.h"
 #include "message.h"
@@ -82,4 +82,4 @@ void jabber_pep_publish(JabberStream *js
  */
 void jabber_pep_publish(JabberStream *js, xmlnode *publish);
 
-#endif /* _PURPLE_JABBER_PEP_H_ */
+#endif /* PURPLE_JABBER_PEP_H_ */
============================================================
--- libpurple/protocols/jabber/ping.h	f88c230d00db70e9b1ce9cfbf28730a832778549
+++ libpurple/protocols/jabber/ping.h	0e3ce3d9a12292e07eb6ca521dfacfb9da66de7d
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _PURPLE_JABBER_PING_H_
-#define _PURPLE_JABBER_PING_H_
+#ifndef PURPLE_JABBER_PING_H_
+#define PURPLE_JABBER_PING_H_
 
 #include "jabber.h"
 #include "iq.h"
@@ -30,4 +30,4 @@ gboolean jabber_ping_jid(JabberStream *j
                        JabberIqType, const char *id, xmlnode *child);
 gboolean jabber_ping_jid(JabberStream *js, const char *jid);
 
-#endif /* _PURPLE_JABBER_PING_H_ */
+#endif /* PURPLE_JABBER_PING_H_ */
============================================================
--- libpurple/protocols/jabber/presence.h	a77bd82d513655a2ba4eef03d8c9f2d70e7e7e3d
+++ libpurple/protocols/jabber/presence.h	901969d9f560d639c57ee7b0a7a6e3d19d20e80a
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_PRESENCE_H_
-#define _PURPLE_JABBER_PRESENCE_H_
+#ifndef PURPLE_JABBER_PRESENCE_H_
+#define PURPLE_JABBER_PRESENCE_H_
 
 #include "buddy.h"
 #include "jabber.h"
@@ -35,4 +35,4 @@ void purple_status_to_jabber(const Purpl
 void jabber_presence_fake_to_self(JabberStream *js, const PurpleStatus *status);
 void purple_status_to_jabber(const PurpleStatus *status, JabberBuddyState *state, char **msg, int *priority);
 
-#endif /* _PURPLE_JABBER_PRESENCE_H_ */
+#endif /* PURPLE_JABBER_PRESENCE_H_ */
============================================================
--- libpurple/protocols/jabber/roster.h	7606311fb1037ff3c2391e2ba9595ccdb4614b38
+++ libpurple/protocols/jabber/roster.h	cfed14bc7f94c643a00c6872c94cbaa5b6fbdd93
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_ROSTER_H_
-#define _PURPLE_JABBER_ROSTER_H_
+#ifndef PURPLE_JABBER_ROSTER_H_
+#define PURPLE_JABBER_ROSTER_H_
 
 #include "jabber.h"
 
@@ -40,4 +40,4 @@ void jabber_roster_remove_buddy(PurpleCo
 void jabber_roster_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy,
 		PurpleGroup *group);
 
-#endif /* _PURPLE_JABBER_ROSTER_H_ */
+#endif /* PURPLE_JABBER_ROSTER_H_ */
============================================================
--- libpurple/protocols/jabber/si.h	7f7670dc39469b5b2b27acf03a6c84dff7a0eee7
+++ libpurple/protocols/jabber/si.h	1a3533fb2a65d039d4e8165801815b38d24d856b
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_SI_H_
-#define _PURPLE_JABBER_SI_H_
+#ifndef PURPLE_JABBER_SI_H_
+#define PURPLE_JABBER_SI_H_
 
 #include "ft.h"
 
@@ -35,4 +35,4 @@ void jabber_si_uninit(void);
 void jabber_si_init(void);
 void jabber_si_uninit(void);
 
-#endif /* _PURPLE_JABBER_SI_H_ */
+#endif /* PURPLE_JABBER_SI_H_ */
============================================================
--- libpurple/protocols/jabber/usermood.h	7918264a871671c09a149351efbca4eb41ba43d2
+++ libpurple/protocols/jabber/usermood.h	d48cf7738c3a8b2b14d8332004bd9c0f2a5fcdd1
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _PURPLE_JABBER_USERMOOD_H_
-#define _PURPLE_JABBER_USERMOOD_H_
+#ifndef PURPLE_JABBER_USERMOOD_H_
+#define PURPLE_JABBER_USERMOOD_H_
 
 #include "jabber.h"
 
@@ -34,4 +34,4 @@ void jabber_mood_set(JabberStream *js,
 		     const char *mood, /* must be one of the valid strings defined in the XEP */
 		     const char *text /* might be NULL */);
 
-#endif /* _PURPLE_JABBER_USERMOOD_H_ */
+#endif /* PURPLE_JABBER_USERMOOD_H_ */
============================================================
--- libpurple/protocols/jabber/usernick.h	03dbe7fe8929cd8068b7ddff82fd97950e1cbc43
+++ libpurple/protocols/jabber/usernick.h	6df8a95233386ac9c3ef6639274a1433e6922dc8
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _PURPLE_JABBER_USERNICK_H_
-#define _PURPLE_JABBER_USERNICK_H_
+#ifndef PURPLE_JABBER_USERNICK_H_
+#define PURPLE_JABBER_USERNICK_H_
 
 #include "jabber.h"
 
@@ -29,4 +29,4 @@ void jabber_nick_init_action(GList **m);
 void jabber_nick_init(void);
 void jabber_nick_init_action(GList **m);
 
-#endif /* _PURPLE_JABBER_USERNICK_H_ */
+#endif /* PURPLE_JABBER_USERNICK_H_ */
============================================================
--- libpurple/protocols/jabber/usertune.h	7c6fdf7b95a6e9507037dcfb3ef94d61b5e5146a
+++ libpurple/protocols/jabber/usertune.h	6efef4cbf3738f31eb2c9d72bff7834db16bee43
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _PURPLE_JABBER_USERTUNE_H_
-#define _PURPLE_JABBER_USERTUNE_H_
+#ifndef PURPLE_JABBER_USERTUNE_H_
+#define PURPLE_JABBER_USERTUNE_H_
 
 #include "jabber.h"
 
@@ -40,4 +40,4 @@ void jabber_tune_set(PurpleConnection *g
 
 void jabber_tune_set(PurpleConnection *gc, const PurpleJabberTuneInfo *tuneinfo);
 
-#endif /* _PURPLE_JABBER_USERTUNE_H_ */
+#endif /* PURPLE_JABBER_USERTUNE_H_ */
============================================================
--- libpurple/protocols/jabber/xdata.h	220e9ab6c7597200660f8007b99c02ca418bde96
+++ libpurple/protocols/jabber/xdata.h	877e76fbb2c5ef0880ad04cb6967c7741673097f
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_XDATA_H_
-#define _PURPLE_JABBER_XDATA_H_
+#ifndef PURPLE_JABBER_XDATA_H_
+#define PURPLE_JABBER_XDATA_H_
 
 #include "jabber.h"
 #include "xmlnode.h"
@@ -35,4 +35,4 @@ void *jabber_x_data_request_with_actions
 void *jabber_x_data_request(JabberStream *js, xmlnode *packet, jabber_x_data_cb cb, gpointer user_data);
 void *jabber_x_data_request_with_actions(JabberStream *js, xmlnode *packet, GList *actions, int defaultaction, jabber_x_data_action_cb cb, gpointer user_data);
 
-#endif /* _PURPLE_JABBER_XDATA_H_ */
+#endif /* PURPLE_JABBER_XDATA_H_ */


More information about the Commits mailing list