scrollz (2.1-1.1) direct (non packaging) changes

--- scrollz-2.1.orig/include/config.h
+++ scrollz-2.1/include/config.h
@@ -47,7 +47,7 @@
  * file and the ircII can find it, this setting is overridden.
  */
 #ifndef DEFAULT_SERVER
-# define DEFAULT_SERVER	    "change.this.to.a.server"
+# define DEFAULT_SERVER	    "irc.debian.org"
 #endif
 
 /*
@@ -134,7 +134,7 @@
 #define DEFAULT_CTCP_REPLY_IGNORE_SECONDS 10
 #define DEFAULT_DCC_BLOCK_SIZE 2048
 #define DEFAULT_DISPLAY 1
-#define DEFAULT_DISPLAY_ENCODING "UTF-8"
+#define DEFAULT_DISPLAY_ENCODING "ISO8859-1"
 #define DEFAULT_DISPLAY_ANSI 1
 #define DEFAULT_EIGHT_BIT_CHARACTERS 1
 #define DEFAULT_ENCRYPT_PROGRAM NULL
@@ -158,10 +158,10 @@
 #define DEFAULT_HYPER_DCC 0
 #define DEFAULT_INDENT 1
 #define DEFAULT_INPUT_ALIASES 0
-#define DEFAULT_INPUT_ENCODING "UTF-8"
+#define DEFAULT_INPUT_ENCODING "ISO-8859-1"
 #define DEFAULT_INPUT_PROMPT NULL
 #define DEFAULT_INPUT_PROTECTION 1
-#define DEFAULT_IRC_ENCODING "UTF-8"
+#define DEFAULT_IRC_ENCODING "ISO-8859-1"
 #define DEFAULT_INSERT_MODE 1
 #define DEFAULT_INVERSE_VIDEO 1
 #define DEFAULT_ISO2022_SUPPORT 0
--- scrollz-2.1.orig/include/irc.h
+++ scrollz-2.1/include/irc.h
@@ -131,6 +131,9 @@
 # endif
 #endif
 
+#include <langinfo.h>
+#include <locale.h>
+
 #ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
 #endif
--- scrollz-2.1.orig/source/Makefile.in
+++ scrollz-2.1/source/Makefile.in
@@ -140,7 +140,7 @@
       ../include/menu.h ../include/screen.h ../include/input.h \
       ../include/output.h ../include/parse.h ../include/notify.h \
       ../include/ignore.h ../include/exec.h ../include/ircterm.h \
-      /usr/include/sys/stat.h ../include/myvars.h
+      ../include/myvars.h
 blowfish.o: blowfish.c ../include/irc.h ../include/defs.h \
       ../include/celerity.h ../include/config.h ../include/irc_std.h \
       ../include/debug.h ../include/struct.h ../include/mystructs.h \
--- scrollz-2.1.orig/source/rijndael-alg-ref.c
+++ scrollz-2.1/source/rijndael-alg-ref.c
@@ -35,13 +35,6 @@
      { 4, 4 } }
 }; 
 
-word8 mul(word8, word8);
-void KeyAddition(word8 [][], word8 [][], word8);
-void Substitution(word8 [][], word8 box[], word8);
-void ShiftRow(word8 [][], word8, word8);
-void MixColumn(word8 [][], word8);
-void InvMixColumn(word8 [][], word8);
-
 word8 mul(word8 a, word8 b) {
    /* multiply two elements of GF(2^m)
     * needed for MixColumn and InvMixColumn
--- scrollz-2.1.orig/source/vars.c
+++ scrollz-2.1/source/vars.c
@@ -363,6 +363,13 @@
 /**************************** PATCHED by Flier ******************************/
         int old_disp;
 /****************************************************************************/
+	char *charset;
+
+	/* Switch the locale to the environment values to get the right charset */
+	setlocale(LC_ALL, "");
+	charset = nl_langinfo(CODESET);
+	/* Switch back to the locale used before (POSIX or C) to prevent side effects. */
+	setlocale(LC_ALL, "C");
 
 	check_variable_order();
 
@@ -371,12 +378,22 @@
 	set_string_var(SHELL_VAR, DEFAULT_SHELL);
 	set_string_var(SHELL_FLAGS_VAR, DEFAULT_SHELL_FLAGS);
 	set_string_var(DECRYPT_PROGRAM_VAR, UP(DEFAULT_DECRYPT_PROGRAM));
-	set_string_var(DISPLAY_ENCODING_VAR, DEFAULT_DISPLAY_ENCODING);
 	set_string_var(ENCRYPT_PROGRAM_VAR, DEFAULT_ENCRYPT_PROGRAM);
 	set_string_var(CONTINUED_LINE_VAR, DEFAULT_CONTINUED_LINE);
-	set_string_var(INPUT_ENCODING_VAR, DEFAULT_INPUT_ENCODING);
+	if (charset == NULL || charset[0] == '\0')
+	{
+	   set_string_var(DISPLAY_ENCODING_VAR, DEFAULT_DISPLAY_ENCODING);
+	   set_string_var(INPUT_ENCODING_VAR, DEFAULT_INPUT_ENCODING);
+	   set_string_var(IRC_ENCODING_VAR, DEFAULT_IRC_ENCODING);
+	}
+	else
+	{
+	   set_string_var(DISPLAY_ENCODING_VAR, charset);
+	   set_string_var(INPUT_ENCODING_VAR, charset);
+	   set_string_var(IRC_ENCODING_VAR, charset);
+	}
+
 	set_string_var(INPUT_PROMPT_VAR, DEFAULT_INPUT_PROMPT);
-	set_string_var(IRC_ENCODING_VAR, DEFAULT_IRC_ENCODING);
 	set_string_var(HIGHLIGHT_CHAR_VAR, DEFAULT_HIGHLIGHT_CHAR);
 	set_string_var(HISTORY_FILE_VAR, DEFAULT_HISTORY_FILE);
 	set_string_var(LASTLOG_LEVEL_VAR, DEFAULT_LASTLOG_LEVEL);