Mercurial > pidgin.yaz
changeset 10023:34bce9529cf4
[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>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 14 Sep 2004 04:31:31 +0000 |
| parents | 00a7ccf8ccd7 |
| children | 4b3e8548667c |
| files | src/eventloop.h src/main.c src/protocols/yahoo/util.c src/prpl.c src/roomlist.h |
| diffstat | 5 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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" {
--- 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);
--- 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>
--- 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);
--- 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 */