diff src/roomlist.h @ 9999:5d9c991549cd

[gaim-migrate @ 10913] Cleanup on isle 7 committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 09 Sep 2004 22:06:06 +0000
parents 7ab20f829190
children 34bce9529cf4
line wrap: on
line diff
--- a/src/roomlist.h	Thu Sep 09 12:07:33 2004 +0000
+++ b/src/roomlist.h	Thu Sep 09 22:06:06 2004 +0000
@@ -26,22 +26,41 @@
 #ifndef _GAIM_ROOMLIST_H_
 #define _GAIM_ROOMLIST_H_
 
+typedef struct _GaimRoomlist GaimRoomlist;
+typedef struct _GaimRoomlistRoom GaimRoomlistRoom;
+typedef struct _GaimRoomlistField GaimRoomlistField;
+typedef struct _GaimRoomlistUiOps GaimRoomlistUiOps;
 
-#include <glib/glist.h>
+/**
+ * The types of rooms.
+ *
+ * These are ORable flags.
+ */
+typedef enum
+{
+	GAIM_ROOMLIST_ROOMTYPE_CATEGORY = 0x01, /**< It's a category, but not a room you can join. */
+	GAIM_ROOMLIST_ROOMTYPE_ROOM = 0x02      /**< It's a room, like the kind you can join. */
+
+} GaimRoomlistRoomType;
+
+/**
+ * The types of fields.
+ */
+typedef enum
+{
+	GAIM_ROOMLIST_FIELD_BOOL,
+	GAIM_ROOMLIST_FIELD_INT,
+	GAIM_ROOMLIST_FIELD_STRING /**< We do a g_strdup on the passed value if it's this type. */
+
+} GaimRoomlistFieldType;
+
 #include "account.h"
-
+#include "internal.h"
 
 /**************************************************************************/
 /** Data Structures                                                       */
 /**************************************************************************/
 
-typedef struct _GaimRoomlist GaimRoomlist;
-typedef struct _GaimRoomlistRoom GaimRoomlistRoom;
-typedef enum _GaimRoomlistRoomType GaimRoomlistRoomType;
-typedef struct _GaimRoomlistField GaimRoomlistField;
-typedef enum _GaimRoomlistFieldType GaimRoomlistFieldType;
-typedef struct _GaimRoomlistUiOps GaimRoomlistUiOps;
-
 /**
  * Represents a list of rooms for a given connection on a given protocol.
  */
@@ -56,16 +75,6 @@
 };
 
 /**
- * The types of rooms.
- *
- * These are ORable flags.
- */
-enum _GaimRoomlistRoomType {
-	GAIM_ROOMLIST_ROOMTYPE_CATEGORY = 0x01, /**< It's a category, but not a room you can join. */
-	GAIM_ROOMLIST_ROOMTYPE_ROOM = 0x02,     /**< It's a room, like the kind you can join. */
-};
-
-/**
  * Represents a room.
  */
 struct _GaimRoomlistRoom {
@@ -77,15 +86,6 @@
 };
 
 /**
- * The types of fields.
- */
-enum _GaimRoomlistFieldType {
-	GAIM_ROOMLIST_FIELD_BOOL,
-	GAIM_ROOMLIST_FIELD_INT,
-	GAIM_ROOMLIST_FIELD_STRING, /**< We do a g_strdup on the passed value if it's this type. */
-};
-
-/**
  * A field a room might have.
  */
 struct _GaimRoomlistField {