[Ayttm-commits] CVS: ayttm/src chat_window.c,1.56,1.57 prefs_window.c,1.3,1.4

[Andy Maloney <address@hidden>]

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

Modified Files:
        chat_window.c prefs_window.c 
Log Message:
Fix compile for when we don't have iconv

Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- chat_window.c       16 Mar 2003 12:57:27 -0000      1.56
+++ chat_window.c       16 Mar 2003 15:05:01 -0000      1.57
@@ -36,6 +36,11 @@
 #include <gdk/gdkkeysyms.h>
 #include <ctype.h>
 
+#ifdef HAVE_ICONV_H
+#include <iconv.h>
+#include <errno.h>
+#endif
+
 #include "util.h"
 #include "add_contact_window.h"
 #include "sound.h"
@@ -70,10 +75,6 @@
 #endif
 
 
-#ifdef HAVE_ICONV_H
-#include <iconv.h>
-#include <errno.h>
-
 #define GET_CHAT_WINDOW(cur_cw) {\
        if( iGetLocalPref("do_tabbed_chat") ) { \
                chat_window *bck = cur_cw; \
@@ -91,6 +92,8 @@
 
 LList *outgoing_message_filters=NULL;
 LList *incoming_message_filters=NULL;
+
+#ifdef HAVE_ICONV_H
 
 /*
     Recodes source text with iconv() and puts it in translated_text

Index: prefs_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs_window.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- prefs_window.c      5 Feb 2003 08:32:27 -0000       1.3
+++ prefs_window.c      16 Mar 2003 15:05:01 -0000      1.4
@@ -66,7 +66,9 @@
 static void build_proxy_prefs(GtkWidget *);
 static void build_layout_prefs(GtkWidget *);
 static void build_chat_prefs(GtkWidget *);
+#ifdef HAVE_ICONV_H
 static void build_encoding_prefs(GtkWidget *);
+#endif
 static void build_modules_prefs(GtkWidget *);
 static void ok_callback(GtkWidget * widget, gpointer data);
 static void cancel_callback(GtkWidget * widget, gpointer data);
@@ -1154,7 +1156,6 @@
 #define ENCODE_LEN 64
 int use_recoding = 0;
 
-static GtkWidget * modules_path_text = NULL;
 static GtkWidget * local_encoding_entry = NULL;
 static GtkWidget * remote_encoding_entry = NULL;
 
@@ -1270,6 +1271,7 @@
        PLUGIN_ERROR_COL
 };
 
+static GtkWidget       *modules_path_text = NULL;
 static GtkWidget       *plugin_prefs_win = NULL;
 
 static void build_modules_list(GtkWidget * module_list)