[Ayttm-commits] CVS: ayttm/src browser.c,1.3,1.4 chat_room.c,1.3,1.4 globals.h,1.2,1.3 main.c,1.1.1.1,1.2 message_parse.c,1.4,1.5 status.c,1.8,1.9

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv21816/src

Modified Files:
        browser.c chat_room.c globals.h main.c message_parse.c 
        status.c 
Log Message:
more include fixes


Index: browser.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/browser.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- browser.c   1 Jan 2003 14:22:45 -0000       1.3
+++ browser.c   1 Jan 2003 17:32:43 -0000       1.4
@@ -30,17 +30,16 @@
 
 #include "intl.h"
 #include <stdio.h>
-#ifndef __MINGW32__
-#include <stdlib.h>
-#endif
 #include <string.h>
 
-#include <gdk/gdkprivate.h>
-#ifndef __MINGW32__
-#include <gdk/gdkx.h>
-#else
+#ifdef __MINGW32__
 #include <gdk/gdkwin32.h>
+#else
+#include <gdk/gdkx.h>
+#include <stdlib.h>
 #endif
+
+#include <gdk/gdkprivate.h>
 #include "dialog.h"
 #include "util.h"
 #include "gtk_globals.h"

Index: chat_room.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- chat_room.c 31 Dec 2002 16:46:27 -0000      1.3
+++ chat_room.c 1 Jan 2003 17:32:43 -0000       1.4
@@ -1,19 +1,16 @@
 #include <string.h>
-#include <gtk/gtk.h>
 #include "globals.h"
-#include "account.h"
-#include "service.h"
 #include "intl.h"
-#include "chat_room.h"
 #include "gtk_eb_html.h"
 #include "util.h"
+#include "sound.h"
+#include "dialog.h"
+#include "smileys.h"
+
 #include "pixmaps/tb_mail_send.xpm"
 #include "pixmaps/cancel.xpm"
 #include "pixmaps/ok.xpm"
 #include "pixmaps/tb_volume.xpm"
-#include "sound.h"
-#include "dialog.h"
-#include "smileys.h"
 
 GList * chat_rooms = NULL;
 

Index: globals.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/globals.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globals.h   1 Jan 2003 14:22:45 -0000       1.2
+++ globals.h   1 Jan 2003 17:32:43 -0000       1.3
@@ -100,7 +100,6 @@
 
 /* alternate web browser */
 extern gint use_alternate_browser;
-extern gchar alternate_browser[];
 
 /* auto resizing of contact list */
 extern gint do_noautoresize;

Index: main.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/main.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- main.c      23 Dec 2002 22:05:36 -0000      1.1.1.1
+++ main.c      1 Jan 2003 17:32:43 -0000       1.2
@@ -28,36 +28,27 @@
 #endif
 
 #include "intl.h"
-#include <gtk/gtk.h>
 
 #include <sys/stat.h>
-#include <sys/types.h>
 #ifdef __MINGW32__
 #include <winsock2.h>
 #else
-#include <sys/socket.h>
 #include <sys/un.h>
 #endif
 #include <fcntl.h>
 #if defined( _WIN32 )
 #include <direct.h>
 #define mkdir( x, y )  _mkdir( x )
-#else
-#include <unistd.h>
 #endif
-#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
 #include <errno.h>
-#include <glib.h>
 #include "status.h"
-#include "service.h"
 #include "plugin.h"
 #include "gtk_globals.h"
-#include "account.h"
 #include "dialog.h"
 #include "util.h"
 #include "sound.h"
@@ -312,7 +303,6 @@
 #else
                struct sockaddr_in remote;
 #endif
-               int sock;
                short length;
                int ret;
 

Index: message_parse.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/message_parse.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- message_parse.c     31 Dec 2002 16:46:27 -0000      1.4
+++ message_parse.c     1 Jan 2003 17:32:43 -0000       1.5
@@ -24,33 +24,25 @@
   ***************************/
 
 #include "intl.h"
-#include <gtk/gtk.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <sys/time.h>
-#ifndef __MINGW32__
+
+#ifdef __MINGW32__
+#include <winsock2.h>
+#else
 #include <sys/wait.h>
 #include <sys/socket.h>
-#else
-#include <winsock2.h>
-#endif
-#include <sys/stat.h>
-#ifndef __MINGW32__
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <pthread.h>
 #endif
+
+#include <sys/stat.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <signal.h>
-#ifndef __MINGW32__
-#include <pthread.h>
-#endif
-#include"account.h"
-#include"contact.h"
-#include"service.h"
 #include"chat_window.h"
 #include"message_parse.h"
 #include"util.h"

Index: status.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/status.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- status.c    1 Jan 2003 01:54:05 -0000       1.8
+++ status.c    1 Jan 2003 17:32:43 -0000       1.9
@@ -32,14 +32,9 @@
 #include "intl.h"
 #include <stdlib.h>
 #include <string.h>
-#include <gtk/gtk.h>
-#include <time.h>
 #include <assert.h>
-#include "service.h"
 #include "globals.h"
 #include "status.h"
-#include "contact.h"
-#include "account.h"
 #include "chat_window.h"
 #include "about.h"
 #include "help_menu.h"
@@ -50,9 +45,9 @@
 #include "message_parse.h"
 #include "contact_actions.h"
 #include "sound.h"
-#include "trigger.h"
 #include "triggerdecls.h"
 #include "plugin.h"
+
 #include "pixmaps/login_icon.xpm"
 #include "pixmaps/blank_icon.xpm"
 #include "pixmaps/logoff_icon.xpm"