[Ayttm-commits] CVS: ayttm/src add_contact_window.h,1.5,1.6 chat_room.h,1.9,1.10 editcontacts.c,1.15,1.16 service.h,1.7,1.8 util.h,1.9,1.10

[Andy Maloney <address@hidden>]

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

Modified Files:
        add_contact_window.h chat_room.h editcontacts.c service.h 
        util.h 
Log Message:
Re-clean some un-cleaned header cleanup :-)

Index: add_contact_window.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/add_contact_window.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- add_contact_window.h        20 Jan 2003 12:33:44 -0000      1.5
+++ add_contact_window.h        20 Jan 2003 18:09:44 -0000      1.6
@@ -39,6 +39,6 @@
 #ifdef __cplusplus
 }
 #endif 
-GList * get_groups();
+
 GList * get_all_contacts();
 #endif

Index: chat_room.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- chat_room.h 16 Jan 2003 13:11:01 -0000      1.9
+++ chat_room.h 20 Jan 2003 18:09:44 -0000      1.10
@@ -19,12 +19,14 @@
  *
  */
 
+#ifndef __CHAT_ROOM_H__
+#define __CHAT_ROOM_H__
+
 #include <gtk/gtk.h>
-#include "account.h"
 #include <time.h>
 
-#ifndef __CHAT_ROOM_H__
-#define __CHAT_ROOM_H__
+#include "account.h"
+
 
 typedef struct _eb_chat_room_buddy
 {
@@ -84,8 +86,6 @@
 void eb_chat_room_buddy_leave( eb_chat_room * room, gchar * handle );
 gboolean eb_chat_room_buddy_connected( eb_chat_room * room, gchar * user );
 void open_join_chat_window();
-eb_chat_room * find_chat_room_by_id( gchar * id );
-eb_chat_room * find_chat_room_by_name( gchar * name, gint service_id );
 char* next_chatroom_name();
 void eb_chat_room_display_status (eb_account *remote, char *message);
 

Index: editcontacts.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/editcontacts.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- editcontacts.c      16 Jan 2003 13:11:01 -0000      1.15
+++ editcontacts.c      20 Jan 2003 18:09:44 -0000      1.16
@@ -25,22 +25,16 @@
 
 
 #include "intl.h"
-#include <gtk/gtk.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "account.h"
 #include "service.h"
 #include "gtk_globals.h"
 #include "status.h"
 #include "util.h"
-#include "contact.h"
 #include "dialog.h"
-#include "service.h"
 #include "value_pair.h"
 
 #include "pixmaps/ok.xpm"

Index: service.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/service.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- service.h   20 Jan 2003 14:13:29 -0000      1.7
+++ service.h   20 Jan 2003 18:09:44 -0000      1.8
@@ -27,10 +27,11 @@
 #ifndef __SERVICE_H__
 #define __SERVICE_H__
 
-#include "account.h"
+#include <gdk/gdk.h>
+
 #include "chat_room.h"
 #include "input_list.h"
-#include <gdk/gdk.h>
+
 
 extern int NUM_SERVICES;
 #define GET_SERVICE(x) eb_services[x->service_id]

Index: util.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/util.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- util.h      19 Jan 2003 11:18:38 -0000      1.9
+++ util.h      20 Jan 2003 18:09:44 -0000      1.10
@@ -28,7 +28,6 @@
 #ifndef __UTIL_H__
 #define __UTIL_H__
 
-#include <glib.h>
 #ifndef __MINGW32__
 # include <sys/types.h>
 # include <unistd.h>
@@ -36,8 +35,12 @@
 # include <io.h>
 # include <process.h>
 #endif
+
 #include "contact.h"
-#include "account.h"
+
+
+/* forward declarations */
+struct _eb_chat_room;
 
 #ifdef __cplusplus
 extern "C" {
@@ -87,6 +90,8 @@
                                           struct contact * rest );
 eb_account * find_suitable_file_transfer_account( eb_account * first,
                                                  struct contact * rest );
+struct _eb_chat_room * find_chat_room_by_id( gchar * id );
+struct _eb_chat_room * find_chat_room_by_name( gchar * name, gint service_id );
 GList * find_chatrooms_with_remote_account(eb_account *remote);
 grouplist * find_grouplist_by_nick(gchar * nick);
 grouplist * find_grouplist_by_name(gchar * name);