# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1238906088 0
# Node ID fd97c0de433d8823a83192e866f3eb29bbab9d76
# Parent  9eb8c8ec0a75bde163dd706c3a5e3af5702ea02f
Add PURPLE to the media header sentinels and reorder includes to fix building gf2

diff -r 9eb8c8ec0a75 -r fd97c0de433d libpurple/media-gst.h
--- a/libpurple/media-gst.h	Sat Apr 04 07:39:33 2009 +0000
+++ b/libpurple/media-gst.h	Sun Apr 05 04:34:48 2009 +0000
@@ -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
 
-#endif  /* __MEDIA_GST_H_ */
+#endif  /* _PURPLE_MEDIA_GST_H_ */
diff -r 9eb8c8ec0a75 -r fd97c0de433d libpurple/media.h
--- a/libpurple/media.h	Sat Apr 04 07:39:33 2009 +0000
+++ b/libpurple/media.h	Sun Apr 05 04:34:48 2009 +0000
@@ -24,11 +24,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __MEDIA_H_
-#define __MEDIA_H_
-
-#include "signals.h"
-#include "util.h"
+#ifndef _PURPLE_MEDIA_H_
+#define _PURPLE_MEDIA_H_
 
 #include <glib.h>
 #include <glib-object.h>
@@ -129,6 +126,9 @@
 	PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
 } PurpleMediaNetworkProtocol;
 
+#include "signals.h"
+#include "util.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -685,4 +685,4 @@
 
 G_END_DECLS
 
-#endif  /* __MEDIA_H_ */
+#endif  /* _PURPLE_MEDIA_H_ */
diff -r 9eb8c8ec0a75 -r fd97c0de433d libpurple/mediamanager.h
--- a/libpurple/mediamanager.h	Sat Apr 04 07:39:33 2009 +0000
+++ b/libpurple/mediamanager.h	Sun Apr 05 04:34:48 2009 +0000
@@ -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 @@
 #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
 
-#endif  /* __MEDIA_MANAGER_H_ */
+#endif  /* _PURPLE_MEDIA_MANAGER_H_ */
diff -r 9eb8c8ec0a75 -r fd97c0de433d libpurple/util.h
--- a/libpurple/util.h	Sat Apr 04 07:39:33 2009 +0000
+++ b/libpurple/util.h	Sun Apr 05 04:34:48 2009 +0000
@@ -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 @@
  * 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.