# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1095136291 0
# Node ID 34bce9529cf477473a86deebaf36e30542161cb0
# Parent  00a7ccf8ccd7fa80c323e5a8d2e7b3679839fb98
[gaim-migrate @ 10955]
A few minor tweaks to how things are included.

Dave, sorry I didn't have time to look at your status patches tonight.
Hopefully I'll be able to tomorrow night.

committer: Tailor Script <tailor@pidgin.im>

diff -r 00a7ccf8ccd7 -r 34bce9529cf4 src/eventloop.h
--- a/src/eventloop.h	Tue Sep 14 03:51:36 2004 +0000
+++ b/src/eventloop.h	Tue Sep 14 04:31:31 2004 +0000
@@ -25,7 +25,7 @@
 #ifndef _GAIM_EVENTLOOP_H_
 #define _GAIM_EVENTLOOP_H_
 
-#include "internal.h"
+#include <glib.h>
 
 #ifdef __cplusplus
 extern "C" {
diff -r 00a7ccf8ccd7 -r 34bce9529cf4 src/main.c
--- a/src/main.c	Tue Sep 14 03:51:36 2004 +0000
+++ b/src/main.c	Tue Sep 14 04:31:31 2004 +0000
@@ -221,8 +221,8 @@
 
 	/* Do we already have a main window opened? If so, bring it back, baby... ribs... yeah */
 	if (mainwindow) {
-			gtk_window_present(GTK_WINDOW(mainwindow));
-			return;
+		gtk_window_present(GTK_WINDOW(mainwindow));
+		return;
 	}
 
 	mainwindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
diff -r 00a7ccf8ccd7 -r 34bce9529cf4 src/protocols/yahoo/util.c
--- a/src/protocols/yahoo/util.c	Tue Sep 14 03:51:36 2004 +0000
+++ b/src/protocols/yahoo/util.c	Tue Sep 14 04:31:31 2004 +0000
@@ -24,8 +24,10 @@
 #include "config.h"
 #endif
 
+#include "debug.h"
+#include "internal.h"
 #include "prpl.h"
-#include "debug.h"
+
 #include "yahoo.h"
 
 #include <string.h>
diff -r 00a7ccf8ccd7 -r 34bce9529cf4 src/prpl.c
--- a/src/prpl.c	Tue Sep 14 03:51:36 2004 +0000
+++ b/src/prpl.c	Tue Sep 14 04:31:31 2004 +0000
@@ -270,7 +270,6 @@
 	GaimBuddy *buddy;
 	GaimPresence *presence;
 	GaimStatus *status;
-	gboolean was_online = FALSE;
 
 	g_return_if_fail(account   != NULL);
 	g_return_if_fail(name      != NULL);
diff -r 00a7ccf8ccd7 -r 34bce9529cf4 src/roomlist.h
--- a/src/roomlist.h	Tue Sep 14 03:51:36 2004 +0000
+++ b/src/roomlist.h	Tue Sep 14 04:31:31 2004 +0000
@@ -55,7 +55,7 @@
 } GaimRoomlistFieldType;
 
 #include "account.h"
-#include "internal.h"
+#include "glib.h"
 
 /**************************************************************************/
 /** Data Structures                                                       */