[Ayttm-commits] CVS: ayttm/src prefs.h,NONE,1.1 Makefile.am,1.2,1.3 account.c,1.1.1.1,1.2 account.h,1.2,1.3 add_contact_window.c,1.4,1.5 add_unknown_account.c,1.1.1.1,1.2 chat_window.h,1.1.1.1,1.2 contact.h,1.1.1.1,1.2 contact_actions.h,1.1.1.1,1.2 dialog.h,1.1.1.1,1.2 edit_account_window.c,1.3,1.4 edit_contact_window.c,1.2,1.3 edit_group_window.c,1.3,1.4 editcontacts.c,1.5,1.6 info_window.h,1.1.1.1,1.2 log_window.c,1.4,1.5 plugin_api.c,1.1.1.1,1.2 prefs.c,1.5,1.6 service.h,1.1.1.1,1.2 speech.c,1.1.1.1,1.2 trigger.c,1.3,1.4 trigger.h,1.1.1.1,1.2 util.h,1.1.1.1,1.2 value_pair.c,1.1.1.1,1.2 value_pair.h,1.1.1.1,1.2 prefs_new.c,1.1.1.1,NONE

[Colin Leroy <address@hidden>]

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

Modified Files:
        Makefile.am account.c account.h add_contact_window.c 
        add_unknown_account.c chat_window.h contact.h 
        contact_actions.h dialog.h edit_account_window.c 
        edit_contact_window.c edit_group_window.c editcontacts.c 
        info_window.h log_window.c plugin_api.c prefs.c service.h 
        speech.c trigger.c trigger.h util.h value_pair.c value_pair.h 
Added Files:
        prefs.h 
Removed Files:
        prefs_new.c 
Log Message:
another include patch by Andy


--- NEW FILE: prefs.h ---
/*
 * Yattm
 *
 * Copyright (C) 1999, Torrey Searle <address@hidden>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 */

#ifndef __PREFS_H__
#define __PREFS_H__

#include <glib.h>


#define MAX_PREF_NAME_LEN 255
#define MAX_PREF_LEN 1024

typedef struct _ptr_list {
                char key[MAX_PREF_NAME_LEN+1];
                void *value;
} ptr_list;

void write_prefs();
void eb_read_prefs();
void build_prefs();
void rebuild_import_menu();
void rebuild_profile_menu();

#if defined(__MINGW32__) && defined(__IN_PLUGIN__)
__declspec(dllimport) void *GetPref(char *key);
#else
extern void *GetPref(char *key);
#endif

void *SetPref(char *key, void *data);
int iGetLocalPref(char *key);
void iSetLocalPref(char *key, int data);
float fGetLocalPref(char *key);
void fSetLocalPref(char *key, float data);
char *cGetLocalPref(char *key);
void cSetLocalPref(char *key, char *data);
void rebuild_set_status_menu();
void save_account_info(char *service, GList *pairs);
void reload_service_accounts(int service_id);

#endif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 27 Dec 2002 17:34:30 -0000      1.2
+++ Makefile.am 3 Jan 2003 23:26:07 -0000       1.3
@@ -12,7 +12,7 @@
 
 noinst_HEADERS = account.h service.h contact.h gtk_globals.h globals.h 
externs.h status.h \
        info_window.h chat_window.h util.h add_contact_window.h sound.h \
-       about.h dialog.h away_window.h message_parse.h help_menu.h \
+       about.h dialog.h prefs.h away_window.h message_parse.h help_menu.h \
        chat_room.h value_pair.h log_window.h info_window.h log_window.h \
        gtkspell.h trigger.h triggerdecls.h console_session.h \
        gtk_eb_html.h browser.h input_list.h plugin.h plugin_api.h debug.h \

Index: account.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/account.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- account.c   23 Dec 2002 22:05:29 -0000      1.1.1.1
+++ account.c   3 Jan 2003 23:26:07 -0000       1.2
@@ -20,16 +20,11 @@
  */
 
 #include "intl.h"
-#include <gtk/gtk.h>
-#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "account.h"
-#include "service.h"
-#include "contact.h"
+
 #include "globals.h"
 #include "triggerdecls.h"
 #include "value_pair.h"

Index: account.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/account.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- account.h   2 Jan 2003 07:11:09 -0000       1.2
+++ account.h   3 Jan 2003 23:26:07 -0000       1.3
@@ -28,7 +28,9 @@
 #define __ACCOUNT_H__
 
 #include <gtk/gtk.h>
-#include "contact.h"
+
+/* forward declarations */
+struct contact;
 
 #ifdef __cplusplus
 extern "C" {

Index: add_contact_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/add_contact_window.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- add_contact_window.c        2 Jan 2003 09:37:54 -0000       1.4
+++ add_contact_window.c        3 Jan 2003 23:26:07 -0000       1.5
@@ -25,15 +25,13 @@
 
 #include "intl.h"
 #include <string.h>
-#include <gtk/gtk.h>
-#include "service.h"
+
 #include "status.h"
-#include "account.h"
-#include "contact.h"
 #include "globals.h"
 #include "util.h"
 #include "dialog.h"
 #include "add_contact_window.h"
+
 #include "pixmaps/tb_preferences.xpm"
 #include "pixmaps/cancel.xpm"
 

Index: add_unknown_account.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/add_unknown_account.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- add_unknown_account.c       23 Dec 2002 22:05:32 -0000      1.1.1.1
+++ add_unknown_account.c       3 Jan 2003 23:26:07 -0000       1.2
@@ -20,15 +20,13 @@
  */
 
 #include "intl.h"
-#include <gtk/gtk.h>
 #include <string.h>
-#include "contact.h"
-#include "service.h"
+
 #include "status.h"
-#include "account.h"
 #include "util.h"
 #include "globals.h"
 #include "dialog.h"
+
 #include "pixmaps/tb_preferences.xpm"
 #include "pixmaps/cancel.xpm"
 

Index: chat_window.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- chat_window.h       23 Dec 2002 22:05:30 -0000      1.1.1.1
+++ chat_window.h       3 Jan 2003 23:26:07 -0000       1.2
@@ -25,13 +25,14 @@
  *
  */
 
-#ifndef __chat_window__
-#define __chat_window__
+#ifndef __CHAT_WINDOW_H__
+#define __CHAT_WINDOW_H__
+
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <time.h>
+
 #include "contact.h"
-#include "account.h"
 #include "log_window.h"
 #include "service.h"
 

Index: contact.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/contact.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- contact.h   23 Dec 2002 22:05:31 -0000      1.1.1.1
+++ contact.h   3 Jan 2003 23:26:07 -0000       1.2
@@ -27,7 +27,6 @@
 #ifndef __CONTACT_H__
 #define __CONTACT_H__
 
-#include <gtk/gtk.h>
 #include "account.h"
 #include "trigger.h"
 

Index: contact_actions.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/contact_actions.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- contact_actions.h   23 Dec 2002 22:05:31 -0000      1.1.1.1
+++ contact_actions.h   3 Jan 2003 23:26:07 -0000       1.2
@@ -1,8 +1,30 @@
-#include "account.h"
+/*
+ * Yattm
+ *
+ * Copyright (C) 1999, Torrey Searle <address@hidden>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef __CONTACT_ACTIONS_H__
+#define __CONTACT_ACTIONS_H__
+
 #include "contact.h"
 
-#ifndef CONTACT_ACTIONS_H
-#define CONTACT_ACTIONS_H
 void eb_do_send_file(eb_account *ea);
 void eb_view_log(struct contact *contact);
+
 #endif

Index: dialog.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/dialog.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- dialog.h    23 Dec 2002 22:05:32 -0000      1.1.1.1
+++ dialog.h    3 Jan 2003 23:26:07 -0000       1.2
@@ -110,35 +110,6 @@
 } /* extern "C" */
 #endif
 
-/*prefs.c*/
-#define MAX_PREF_NAME_LEN 255
-#define MAX_PREF_LEN 1024
-typedef struct _ptr_list {
-               char key[MAX_PREF_NAME_LEN+1];
-               void *value;
-} ptr_list;
-
-void write_prefs();
-void eb_read_prefs();
-void build_prefs();
-void rebuild_import_menu();
-void rebuild_profile_menu();
-#if defined(__MINGW32__) && defined(__IN_PLUGIN__)
-__declspec(dllimport) void *GetPref(char *key);
-#else
-extern void *GetPref(char *key);
-#endif
-void *SetPref(char *key, void *data);
-int iGetLocalPref(char *key);
-void iSetLocalPref(char *key, int data);
-float fGetLocalPref(char *key);
-void fSetLocalPref(char *key, float data);
-char *cGetLocalPref(char *key);
-void cSetLocalPref(char *key, char *data);
-void rebuild_set_status_menu();
-void save_account_info(char *service, GList *pairs);
-void reload_service_accounts(int service_id);
-
 /*editcontacts.c*/
 void eb_new_user();
 

Index: edit_account_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_account_window.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- edit_account_window.c       2 Jan 2003 09:37:54 -0000       1.3
+++ edit_account_window.c       3 Jan 2003 23:26:07 -0000       1.4
@@ -24,15 +24,13 @@
 #endif
 
 #include "intl.h"
-#include <gtk/gtk.h>
 #include <string.h>
-#include "contact.h"
-#include "service.h"
+
 #include "status.h"
-#include "account.h"
 #include "util.h"
 #include "globals.h"
 #include "dialog.h"
+
 #include "pixmaps/tb_preferences.xpm"
 #include "pixmaps/cancel.xpm"
 

Index: edit_contact_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_contact_window.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- edit_contact_window.c       2 Jan 2003 09:37:54 -0000       1.2
+++ edit_contact_window.c       3 Jan 2003 23:26:07 -0000       1.3
@@ -24,14 +24,13 @@
 #endif
 
 #include "intl.h"
-#include <gtk/gtk.h>
 #include <string.h>
-#include "contact.h"
-#include "service.h"
+
 #include "status.h"
 #include "dialog.h"
 #include "util.h"
 #include "add_contact_window.h"
+
 #include "pixmaps/tb_edit.xpm"
 #include "pixmaps/cancel.xpm"
 

Index: edit_group_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_group_window.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- edit_group_window.c 2 Jan 2003 09:37:54 -0000       1.3
+++ edit_group_window.c 3 Jan 2003 23:26:07 -0000       1.4
@@ -24,14 +24,12 @@
 #endif
 
 #include "intl.h"
-#include <gtk/gtk.h>
 #include <string.h>
-#include "contact.h"
-#include "service.h"
+
 #include "status.h"
 #include "dialog.h"
 #include "util.h"
-#include "account.h"
+
 
 static gint window_open = 0;
 static GtkWidget * edit_group_window;

Index: editcontacts.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/editcontacts.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- editcontacts.c      2 Jan 2003 09:37:54 -0000       1.5
+++ editcontacts.c      3 Jan 2003 23:26:07 -0000       1.6
@@ -29,22 +29,17 @@
 #endif
 
 #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"
 #include "pixmaps/cancel.xpm"
 #include "pixmaps/tb_trash.xpm"

Index: info_window.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/info_window.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- info_window.h       23 Dec 2002 22:05:36 -0000      1.1.1.1
+++ info_window.h       3 Jan 2003 23:26:07 -0000       1.2
@@ -25,14 +25,13 @@
  *
  */
 
-#ifndef __info_window__
-#define __info_window__
+#ifndef __INFO_WINDOW_H__
+#define __INFO_WINDOW_H__
 
 
 
 #include <gtk/gtk.h>
 #include <stdio.h>
-#include "contact.h"
 #include "account.h"
 
 

Index: log_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/log_window.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- log_window.c        2 Jan 2003 09:37:55 -0000       1.4
+++ log_window.c        3 Jan 2003 23:26:07 -0000       1.5
@@ -31,16 +31,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <assert.h>
-#include <glib.h>
+
 #include "globals.h"
-#include "contact.h"
 #include "gtk_eb_html.h"
 #include "log_window.h"
 #include "util.h"
+
 #include "pixmaps/cancel.xpm"
 
 int current_row=-1, last_pos=-1;

Index: plugin_api.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/plugin_api.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- plugin_api.c        23 Dec 2002 22:05:39 -0000      1.1.1.1
+++ plugin_api.c        3 Jan 2003 23:26:07 -0000       1.2
@@ -20,13 +20,9 @@
  */
 
 #include "intl.h"
-#include <stdio.h>
-#include <gtk/gtk.h>
 #include "globals.h"
-#include "plugin_api.h"
 #include "plugin.h"
 #include "dialog.h"
-#include "account.h"
 
 static void eb_gtk_dialog_callback(GtkWidget *widget, gpointer data)
 {

Index: prefs.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- prefs.c     1 Jan 2003 14:22:45 -0000       1.5
+++ prefs.c     3 Jan 2003 23:26:07 -0000       1.6
@@ -31,7 +31,6 @@
 
 #include "intl.h"
 #include <gdk/gdkkeysyms.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "util.h"

Index: service.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/service.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- service.h   23 Dec 2002 22:05:38 -0000      1.1.1.1
+++ service.h   3 Jan 2003 23:26:07 -0000       1.2
@@ -27,11 +27,9 @@
 #ifndef __SERVICE_H__
 #define __SERVICE_H__
 
-#include "account.h"
 #include "chat_room.h"
 #include "input_list.h"
-#include <gtk/gtk.h>
-#include <stdio.h>
+
 
 extern int NUM_SERVICES;
 #define GET_SERVICE(x) eb_services[x->service_id]

Index: speech.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/speech.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- speech.c    23 Dec 2002 22:05:39 -0000      1.1.1.1
+++ speech.c    3 Jan 2003 23:26:07 -0000       1.2
@@ -25,12 +25,9 @@
 
 #include "intl.h"
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <pthread.h>
-#include "account.h"
+
 #include "util.h"
 #include "speech.h"
 #include "globals.h"

Index: trigger.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/trigger.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- trigger.c   2 Jan 2003 09:37:55 -0000       1.3
+++ trigger.c   3 Jan 2003 23:26:07 -0000       1.4
@@ -31,7 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "contact.h"
 #include "triggerdecls.h"
 #include "chat_window.h"
 #include "dialog.h"
@@ -39,6 +38,7 @@
 #include "globals.h"
 #include "file_select.h"
 #include "util.h"
+
 #include "pixmaps/tb_preferences.xpm"
 #include "pixmaps/cancel.xpm"
 

Index: trigger.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/trigger.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- trigger.h   23 Dec 2002 22:05:40 -0000      1.1.1.1
+++ trigger.h   3 Jan 2003 23:26:07 -0000       1.2
@@ -26,7 +26,6 @@
 #ifndef __TRIGGER_H__
 #define __TRIGGER_H__
 
-#include <gtk/gtk.h>
 
 typedef enum {NO_TYPE, USER_ONLINE, USER_OFFLINE, USER_ON_OFF_LINE} 
trigger_type;
 typedef enum {NO_ACTION, PLAY_SOUND, EXECUTE, DIALOG, POUNCE} trigger_action;

Index: util.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/util.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- util.h      23 Dec 2002 22:05:40 -0000      1.1.1.1
+++ util.h      3 Jan 2003 23:26:07 -0000       1.2
@@ -21,13 +21,14 @@
 
 /*
  *  util.h
- *  generic usefull stuff
+ *  generic useful stuff
  *
  */
 
+#ifndef __UTIL_H__
+#define __UTIL_H__
 
-#include<gtk/gtk.h>
-#include<glib.h>
+#include <glib.h>
 #ifndef __MINGW32__
 #include <sys/types.h>
 #include <unistd.h>
@@ -37,8 +38,6 @@
 #endif
 #include "contact.h"
 #include "service.h"
-#include "account.h"
-#include "chat_room.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -126,3 +125,5 @@
 #ifndef NAME_MAX
 #define NAME_MAX 4096
 #endif
+
+#endif /* __UTIL_H__ */

Index: value_pair.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/value_pair.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- value_pair.c        23 Dec 2002 22:05:41 -0000      1.1.1.1
+++ value_pair.c        3 Jan 2003 23:26:07 -0000       1.2
@@ -19,10 +19,8 @@
  *
  */
 #include "intl.h"
-#include<glib.h>
-#include<string.h>
-#include<stdio.h>
-#include<stdlib.h>
+#include <string.h>
+#include <stdlib.h>
 #include "value_pair.h"
 #include "util.h"
 

Index: value_pair.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/value_pair.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- value_pair.h        23 Dec 2002 22:05:40 -0000      1.1.1.1
+++ value_pair.h        3 Jan 2003 23:26:07 -0000       1.2
@@ -19,8 +19,13 @@
  *
  */
 
-#include<glib.h>
-#include "dialog.h"
+#ifndef __VALUE_PAIR_H__
+#define __VALUE_PAIR_H__
+
+#include <stdio.h>
+
+#include "prefs.h"
+
 
 typedef struct _value_pair
 {
@@ -42,3 +47,5 @@
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
+
+#endif /* __VALUE_PAIR_H__ */

--- prefs_new.c DELETED ---