Mercurial > pidgin

changeset 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 267a2b69e36e
children c124bef68132
files src/account.h src/blist.h src/connection.h src/conversation.h src/eventloop.h src/gtkblist.h src/gtkconv.h src/gtkdialogs.h
diffstat 8 files changed, 39 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/src/account.h	Fri Sep 10 04:30:37 2004 +0000
+++ b/src/account.h	Fri Sep 10 04:43:31 2004 +0000
@@ -27,7 +27,7 @@
 #ifndef _GAIM_ACCOUNT_H_
 #define _GAIM_ACCOUNT_H_
 
-#include <glib.h>
+#include "internal.h"
 
 typedef struct _GaimAccountUiOps GaimAccountUiOps;
 typedef struct _GaimAccount      GaimAccount;
--- a/src/blist.h	Fri Sep 10 04:30:37 2004 +0000
+++ b/src/blist.h	Fri Sep 10 04:43:31 2004 +0000
@@ -40,10 +40,6 @@
 typedef struct _GaimContact GaimContact;
 typedef struct _GaimBuddy GaimBuddy;
 
-#include "account.h"
-#include "buddyicon.h"
-#include "status.h"
-
 /**************************************************************************/
 /* Enumerations                                                           */
 /**************************************************************************/
@@ -77,12 +73,16 @@
 
 typedef enum
 {
-	GAIM_BLIST_NODE_FLAG_NO_SAVE = 1,	/**< node should not be saved with the buddy list */
+	GAIM_BLIST_NODE_FLAG_NO_SAVE = 1 /**< node should not be saved with the buddy list */
+
 } GaimBlistNodeFlags;
 
 #define GAIM_BLIST_NODE_HAS_FLAG(b, f) ((b)->flags & (f))
 #define GAIM_BLIST_NODE_SHOULD_SAVE(b) (! GAIM_BLIST_NODE_HAS_FLAG(b, GAIM_BLIST_NODE_FLAG_NO_SAVE))
 
+#include "account.h"
+#include "buddyicon.h"
+#include "status.h"
 
 /**************************************************************************/
 /* Data Structures                                                        */
--- a/src/connection.h	Fri Sep 10 04:30:37 2004 +0000
+++ b/src/connection.h	Fri Sep 10 04:43:31 2004 +0000
@@ -27,9 +27,6 @@
 #ifndef _GAIM_CONNECTION_H_
 #define _GAIM_CONNECTION_H_
 
-#include <stdlib.h>
-#include <time.h>
-
 typedef struct _GaimConnection GaimConnection;
 
 /**
@@ -45,6 +42,7 @@
 	GAIM_CONNECTION_NO_NEWLINES = 0x0010, /**< No new lines are allowed in outgoing messages */
 	GAIM_CONNECTION_NO_FONTSIZE = 0x0020, /**< Connection does not send/receive font sizes */
 	GAIM_CONNECTION_NO_URLDESC = 0x0040  /**< Connection does not support descriptions with links */
+
 } GaimConnectionFlags;
 
 typedef enum
@@ -56,6 +54,7 @@
 } GaimConnectionState;
 
 #include "account.h"
+#include "internal.h"
 #include "plugin.h"
 
 typedef struct
--- a/src/conversation.h	Fri Sep 10 04:30:37 2004 +0000
+++ b/src/conversation.h	Fri Sep 10 04:43:31 2004 +0000
@@ -118,6 +118,7 @@
 	GAIM_MESSAGE_WHISPER   = 0x0080, /**< Whispered message.       */
 	GAIM_MESSAGE_ERROR     = 0x0200, /**< Error message.           */
 	GAIM_MESSAGE_DELAYED   = 0x0400  /**< Delayed message.         */
+
 } GaimMessageFlags;
 
 /**
@@ -130,6 +131,7 @@
 	GAIM_CBFLAGS_HALFOP        = 0x0002, /**< Half-op                      */
 	GAIM_CBFLAGS_OP            = 0x0004, /**< Channel Op or Moderator      */
 	GAIM_CBFLAGS_FOUNDER       = 0x0008  /**< Channel Founder              */
+
 } GaimConvChatBuddyFlags;
 
 #include "account.h"
--- a/src/eventloop.h	Fri Sep 10 04:30:37 2004 +0000
+++ b/src/eventloop.h	Fri Sep 10 04:43:31 2004 +0000
@@ -25,7 +25,7 @@
 #ifndef _GAIM_EVENTLOOP_H_
 #define _GAIM_EVENTLOOP_H_
 
-#include <glib.h>
+#include "internal.h"
 
 #ifdef __cplusplus
 extern "C" {
--- a/src/gtkblist.h	Fri Sep 10 04:30:37 2004 +0000
+++ b/src/gtkblist.h	Fri Sep 10 04:43:31 2004 +0000
@@ -25,8 +25,7 @@
 #ifndef _GAIM_GTKBLIST_H_
 #define _GAIM_GTKBLIST_H_
 
-#include "gtkgaim.h"
-#include "blist.h"
+typedef struct _GaimGtkBuddyList GaimGtkBuddyList;
 
 enum {
 	STATUS_ICON_COLUMN,
@@ -37,7 +36,8 @@
 	BUDDY_ICON_COLUMN,
 	NODE_COLUMN,
 	BLIST_COLUMNS
-	};
+
+};
 
 typedef enum {
 	GAIM_STATUS_ICON_LARGE,
@@ -45,13 +45,16 @@
 
 } GaimStatusIconSize;
 
+#include "gtkgaim.h"
+#include "blist.h"
+
 /**************************************************************************
  * @name Structures
  **************************************************************************/
 /**
  * Like, everything you need to know about the gtk buddy list
  */
-typedef struct {
+struct _GaimGtkBuddyList {
 	GtkWidget *window;
 	GtkWidget *vbox;                /**< This is the vbox that everything gets packed into.  Your plugin might
 					   want to pack something in it itself.  Go, plugins! */
@@ -86,7 +89,7 @@
 	GdkPixbuf *east, *south;                 /**< Drop shadow stuff */
 	GdkWindow *east_shadow, *south_shadow;   /**< Drop shadow stuff */
 
-} GaimGtkBuddyList;
+};
 
 #define GAIM_GTK_BLIST(list) ((GaimGtkBuddyList *)(list)->ui_data)
 #define GAIM_IS_GTK_BLIST(list) \
--- 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())
-
 /*@}*/
 
 /**************************************************************************
--- a/src/gtkdialogs.h	Fri Sep 10 04:30:37 2004 +0000
+++ b/src/gtkdialogs.h	Fri Sep 10 04:43:31 2004 +0000
@@ -54,7 +54,6 @@
  */
 #define GAIM_GTK_UI "gtk-gaim"
 
-
 #define GAIM_DIALOG(x)	x = gtk_window_new(GTK_WINDOW_TOPLEVEL); \
 			gtk_window_set_type_hint(GTK_WINDOW(x), GDK_WINDOW_TYPE_HINT_DIALOG)
 #define GAIM_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->window) & GDK_WINDOW_STATE_ICONIFIED)