Mercurial > pidgin.yaz

diff src/gtkconv.h @ 10008:50c1724d5e59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10925] Lots of needless shuffling of stuff around. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Fri, 10 Sep 2004 04:43:31 +0000
parents 4d3a61dcb942
children c9f95600d6ce
line wrap: on
line diff
--- a/src/gtkconv.h	Fri Sep 10 04:30:37 2004 +0000
+++ b/src/gtkconv.h	Fri Sep 10 04:43:31 2004 +0000
@@ -25,9 +25,10 @@
 #ifndef _GAIM_GTKCONVERSATION_H_
 #define _GAIM_GTKCONVERSATION_H_
 
-#include "gtkgaim.h"
-
-#include "conversation.h"
+typedef struct _GaimGtkWindow       GaimGtkWindow;
+typedef struct _GaimGtkImPane       GaimGtkImPane;
+typedef struct _GaimGtkChatPane     GaimGtkChatPane;
+typedef struct _GaimGtkConversation GaimGtkConversation;
 
 enum {
 	CHAT_USERS_ICON_COLUMN,
@@ -36,16 +37,27 @@
 	CHAT_USERS_COLUMNS
 };
 
+#define GAIM_GTK_WINDOW(win) \
+	((GaimGtkWindow *)(win)->ui_data)
+
+#define GAIM_GTK_CONVERSATION(conv) \
+	((GaimGtkConversation *)(conv)->ui_data)
+
+#define GAIM_IS_GTK_WINDOW(win) \
+	(gaim_conv_window_get_ui_ops(win) == gaim_gtk_conversations_get_win_ui_ops())
+
+#define GAIM_IS_GTK_CONVERSATION(conv) \
+	(gaim_conversation_get_ui_ops(conv) == \
+	 gaim_gtk_conversations_get_conv_ui_ops())
+
+#include "gtkgaim.h"
+#include "conversation.h"
+
 /**************************************************************************
  * @name Structures
  **************************************************************************/
 /*@{*/
 
-typedef struct _GaimGtkWindow       GaimGtkWindow;
-typedef struct _GaimGtkImPane       GaimGtkImPane;
-typedef struct _GaimGtkChatPane     GaimGtkChatPane;
-typedef struct _GaimGtkConversation GaimGtkConversation;
-
 /**
  * A GTK+ representation of a graphical window containing one or more
  * conversations.
@@ -186,19 +198,6 @@
 	} u;
 };
 
-#define GAIM_GTK_WINDOW(win) \
-	((GaimGtkWindow *)(win)->ui_data)
-
-#define GAIM_GTK_CONVERSATION(conv) \
-	((GaimGtkConversation *)(conv)->ui_data)
-
-#define GAIM_IS_GTK_WINDOW(win) \
-	(gaim_conv_window_get_ui_ops(win) == gaim_gtk_conversations_get_win_ui_ops())
-
-#define GAIM_IS_GTK_CONVERSATION(conv) \
-	(gaim_conversation_get_ui_ops(conv) == \
-	 gaim_gtk_conversations_get_conv_ui_ops())
-
 /*@}*/
 
 /**************************************************************************