[Ayttm-commits] CVS: ayttm/src prefs_window.c,NONE,1.1 prefs_window.h,NONE,1.1 Makefile.am,1.20,1.21 edit_local_accounts.c,1.5,1.6 main.c,1.20,1.21 plugin.c,1.7,1.8 prefs.c,1.29,1.30 prefs.h,1.5,1.6 status.c,1.42,1.43

[Andy Maloney <address@hidden>]

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

Modified Files:
        Makefile.am edit_local_accounts.c main.c plugin.c prefs.c 
        prefs.h status.c 
Added Files:
        prefs_window.c prefs_window.h 
Log Message:
Move prefs window stuff to its own files (prefs_window.[ch]) from prefs.c

--- NEW FILE: prefs_window.c ---
/*
 * Ayttm 
 *
 * Copyright (C) 2003, the Ayttm team
 * 
 * Ayttm is a derivative of Everybuddy
 * Copyright (C) 1999-2002, 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
[...2408 lines suppressed...]
     destroy_proxy();
     destroy_general_prefs();
     destroy_chat_prefs();
     destroy_sound_prefs();
     /* reset current parent so error dialogs work correctly */
#ifdef HAVE_ICONV_H
     destroy_encodings();
#endif
         destroy_modules();
     /* it'd be nice to check validity of recoding here 
        and cancel change if not supported */

#ifdef HAVE_ISPELL
     if ((!do_spell_checking) && (gtkspell_running()))
             gtkspell_stop();
#endif
     gtk_widget_destroy(current_parent_widget);
     current_parent_widget = NULL;

}

--- NEW FILE: prefs_window.h ---
/*
 * Ayttm
 *
 * Copyright (C) 2003, the Ayttm team
 * 
 * Ayttm is a derivative of Everybuddy
 * Copyright (C) 1999-2002, 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_WINDOW_H__
#define __PREFS_WINDOW_H__


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

#ifdef __cplusplus
extern "C" {
#endif

void rebuild_set_status_menu();

#ifdef __cplusplus
}
#endif

#endif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile.am 28 Jan 2003 08:08:55 -0000      1.20
+++ Makefile.am 3 Feb 2003 11:11:26 -0000       1.21
@@ -5,7 +5,7 @@
 ayttm_SOURCES = main.c contactlist.c edit_local_accounts.c service.c status.c \
        account.c info_window.c chat_window.c util.c add_contact_window.c \
        edit_contact_window.c edit_account_window.c  sound.c dialog.c \
-       prefs.c away_window.c browser.c message_parse.c progress_window.c \
+       prefs.c prefs_window.c away_window.c browser.c message_parse.c 
progress_window.c \
        chat_room.c value_pair.c edit_group_window.c log_window.c \
        trigger.c console_session.c input_list.c nomodule.c \
        plugin_api.c plugin.c file_select.c contact_actions.c \
@@ -14,7 +14,7 @@
 
 noinst_HEADERS = account.h service.h contact.h gtk_globals.h globals.h \
        status.h info_window.h chat_window.h util.h add_contact_window.h \
-       sound.h dialog.h prefs.h progress_window.h away_window.h \
+       sound.h dialog.h prefs.h prefs_window.h progress_window.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 trigger.h console_session.h \
        browser.h input_list.h plugin.h plugin_api.h debug.h \

Index: edit_local_accounts.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_local_accounts.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- edit_local_accounts.c       29 Jan 2003 19:19:22 -0000      1.5
+++ edit_local_accounts.c       3 Feb 2003 11:11:26 -0000       1.6
@@ -34,6 +34,7 @@
 #include "util.h"
 #include "dialog.h"
 #include "value_pair.h"
+#include "prefs_window.h"
 
 #include "pixmaps/ok.xpm"
 #include "pixmaps/cancel.xpm"

Index: main.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/main.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- main.c      29 Jan 2003 19:31:40 -0000      1.20
+++ main.c      3 Feb 2003 11:11:26 -0000       1.21
@@ -60,6 +60,7 @@
 #include "smileys.h"
 #include "console_session.h"
 #include "crash.h"
+#include "prefs_window.h"
 
 
 #define PACKAGE "ayttm"

Index: plugin.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/plugin.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.c    29 Jan 2003 19:19:23 -0000      1.7
+++ plugin.c    3 Feb 2003 11:11:26 -0000       1.8
@@ -39,6 +39,7 @@
 #include "nomodule.h"
 #include "value_pair.h"
 #include "dialog.h"
+#include "prefs_window.h"
 
 
 char *PLUGIN_TYPE_TXT[]={"SERVICE", "UTILITY", "SOUND", "LOG", "GUI", 
"UNKNOWN"};

Index: prefs.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- prefs.c     29 Jan 2003 19:19:23 -0000      1.29
+++ prefs.c     3 Feb 2003 11:11:26 -0000       1.30
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003, the Ayttm team
  * 
- * Ayttm is derivative of Everybuddy
+ * Ayttm is a derivative of Everybuddy
  * Copyright (C) 1999-2002, Torrey Searle <address@hidden>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,1856 +22,53 @@
  *
  */
[...2672 lines suppressed...]
-     destroy_proxy();
-     destroy_general_prefs();
-     destroy_chat_prefs();
-     destroy_sound_prefs();
-     /* reset current parent so error dialogs work correctly */
-#ifdef HAVE_ICONV_H
-     destroy_encodings();
-#endif
-        destroy_modules();
-     /* it'd be nice to check validity of recoding here 
-       and cancel change if not supported */
-
-#ifdef HAVE_ISPELL
-     if ((!do_spell_checking) && (gtkspell_running()))
-            gtkspell_stop();
-#endif
-     gtk_widget_destroy(current_parent_widget);
-     current_parent_widget = NULL;
-
-}

Index: prefs.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- prefs.h     29 Jan 2003 19:19:23 -0000      1.5
+++ prefs.h     3 Feb 2003 11:11:26 -0000       1.6
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003, the Ayttm team
  * 
- * Ayttm is derivative of Everybuddy
+ * Ayttm is a derivative of Everybuddy
  * Copyright (C) 1999-2002, Torrey Searle <address@hidden>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -31,17 +31,6 @@
 #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();
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -49,19 +38,22 @@
 #if defined(__MINGW32__) && defined(__IN_PLUGIN__)
 __declspec(dllimport) void *GetPref(char *key);
 #else
-extern void *GetPref(char *key);
+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, LList *pairs);
-void reload_service_accounts(int service_id);
+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   save_account_info(char *service, LList *pairs);
+void   reload_service_accounts(int service_id);
 
 #ifdef __cplusplus
 }

Index: status.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/status.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- status.c    31 Jan 2003 11:50:42 -0000      1.42
+++ status.c    3 Feb 2003 11:11:26 -0000       1.43
@@ -47,6 +47,8 @@
 #include "contact_actions.h"
 #include "sound.h"
 #include "plugin.h"
+#include "prefs_window.h"
+
 #include "gtk/gtkutils.h"
 #include "gtk/about.h"