pidgin: 061002cf: Add PURPLE to the media header sentinels...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: 061002cf5a01655976ebc13c0df0e62feb4186ac
Ancestor: 2c36a90a26f2451978aa41b23e9980337514057d
Author: paul at darkrain42.org
Date: 2009-04-05T04:34:48
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/061002cf5a01655976ebc13c0df0e62feb4186ac

Modified files:
        libpurple/media-gst.h libpurple/media.h
        libpurple/mediamanager.h libpurple/util.h

ChangeLog: 

Add PURPLE to the media header sentinels and reorder includes to fix building gf2

-------------- next part --------------
============================================================
--- libpurple/media-gst.h	2776c2ca7d64aa9942da583344ce3a35daa90211
+++ libpurple/media-gst.h	b67531f0268822811ecd9a25dd5c3fe83ed99aad
@@ -24,8 +24,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __MEDIA_GST_H_
-#define __MEDIA_GST_H_
+#ifndef _PURPLE_MEDIA_GST_H_
+#define _PURPLE_MEDIA_GST_H_
 
 #include "media.h"
 #include "mediamanager.h"
@@ -170,4 +170,4 @@ G_END_DECLS
 
 G_END_DECLS
 
-#endif  /* __MEDIA_GST_H_ */
+#endif  /* _PURPLE_MEDIA_GST_H_ */
============================================================
--- libpurple/media.h	281235c05c06c9d5a070d2cc335c8c518a1f920b
+++ libpurple/media.h	4c1dcb02c72b8557990b82685642fa13da3ec96f
@@ -24,12 +24,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __MEDIA_H_
-#define __MEDIA_H_
+#ifndef _PURPLE_MEDIA_H_
+#define _PURPLE_MEDIA_H_
 
-#include "signals.h"
-#include "util.h"
-
 #include <glib.h>
 #include <glib-object.h>
 
@@ -129,6 +126,9 @@ typedef enum {
 	PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
 } PurpleMediaNetworkProtocol;
 
+#include "signals.h"
+#include "util.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -685,4 +685,4 @@ G_END_DECLS
 
 G_END_DECLS
 
-#endif  /* __MEDIA_H_ */
+#endif  /* _PURPLE_MEDIA_H_ */
============================================================
--- libpurple/mediamanager.h	0253311263ab2d3210b342e8bc4bdc71b6d07e2c
+++ libpurple/mediamanager.h	22c4034cd150d0000bb47b4a9abce3556e80416f
@@ -24,12 +24,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __MEDIA_MANAGER_H_
-#define __MEDIA_MANAGER_H_
+#ifndef _PURPLE_MEDIA_MANAGER_H_
+#define _PURPLE_MEDIA_MANAGER_H_
 
 #include <glib.h>
 #include <glib-object.h>
 
+/** @copydoc _PurpleMediaManager */
+typedef struct _PurpleMediaManager PurpleMediaManager;
+/** @copydoc _PurpleMediaManagerClass */
+typedef struct _PurpleMediaManagerClass PurpleMediaManagerClass;
+
 #include "connection.h"
 #include "media.h"
 
@@ -42,11 +47,6 @@ G_BEGIN_DECLS
 #define PURPLE_IS_MEDIA_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA_MANAGER))
 #define PURPLE_MEDIA_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManagerClass))
 
-/** @copydoc _PurpleMediaManager */
-typedef struct _PurpleMediaManager PurpleMediaManager;
-/** @copydoc _PurpleMediaManagerClass */
-typedef struct _PurpleMediaManagerClass PurpleMediaManagerClass;
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -220,4 +220,4 @@ G_END_DECLS
 
 G_END_DECLS
 
-#endif  /* __MEDIA_MANAGER_H_ */
+#endif  /* _PURPLE_MEDIA_MANAGER_H_ */
============================================================
--- libpurple/util.h	86b413ac07ff8f7e000fe25ceef6575a80f38339
+++ libpurple/util.h	6c69049f77be8fb8aa227211e46dd9caa266bcec
@@ -31,23 +31,26 @@
 
 #include <stdio.h>
 
+typedef struct _PurpleUtilFetchUrlData PurpleUtilFetchUrlData;
+typedef struct _PurpleMenuAction PurpleMenuAction;
+typedef struct _PurpleKeyValuePair PurpleKeyValuePair;
+
 #include "account.h"
 #include "xmlnode.h"
 #include "notify.h"
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct _PurpleUtilFetchUrlData PurpleUtilFetchUrlData;
-
-typedef struct _PurpleMenuAction
+struct _PurpleMenuAction
 {
 	char *label;
 	PurpleCallback callback;
 	gpointer data;
 	GList *children;
-} PurpleMenuAction;
+};
 
 typedef char *(*PurpleInfoFieldFormatCallback)(const char *field, size_t len);
 
@@ -57,12 +60,12 @@ typedef char *(*PurpleInfoFieldFormatCal
  * This is used by, among other things, purple_gtk_combo* functions to pass in a
  * list of key-value pairs so it can display a user-friendly value.
  */
-typedef struct _PurpleKeyValuePair
+struct _PurpleKeyValuePair
 {
 	gchar *key;
 	void *value;
 
-} PurpleKeyValuePair;
+};
 
 /**
  * Creates a new PurpleMenuAction.