From: Pekka Riikonen <priikone@silcnet.org>
Date: Thu, 24 May 2001 19:25:25 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: robodoc-323~297
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=9dcec4c5b144c5f81a956a1bd9b699155ebd7a28

	updates.
---

diff --git a/CHANGES b/CHANGES
index 0b94233a..7dc6e698 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,14 @@
+Thu May 24 19:08:55 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
+
+	* Imported a modified version of Irssi client to the source tree.
+	  The Irssi will be used to create a new client called
+	  Irssi SILC.  Imported to irssi/.
+
+	  Added silc_core_init_finish function to the Irssi.  Affected
+	  file irssi/configure.in.
+
+	  A lot changes in the Makefile.ams around the irssi tree.
+
 Tue May 22 22:23:49 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
 	* Do not rehash if the new size is same as the old size of the
diff --git a/apps/irssi/autogen.sh b/apps/irssi/autogen.sh
index 2ab56be6..a1ab44a3 100755
--- a/apps/irssi/autogen.sh
+++ b/apps/irssi/autogen.sh
@@ -88,9 +88,9 @@ esac
 rm -f aclocal.m4
 if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
   echo "Running libtoolize..."
-  libtoolize --force --copy
+  libtoolize --copy
 fi
-aclocalinclude="$ACLOCAL_FLAGS -I ."
+aclocalinclude="$ACLOCAL_FLAGS"
 echo "Running aclocal $aclocalinclude ..."
 aclocal $aclocalinclude
 if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
diff --git a/apps/irssi/config b/apps/irssi/config
index 876b4020..3213db46 100644
--- a/apps/irssi/config
+++ b/apps/irssi/config
@@ -1,33 +1,18 @@
 lservers = (
-  { address = "irc.stealth.net"; chatnet = IRCNet; port = 6668; },
-  { address = "irc.efnet.net"; chatnet = EFNet; port = 6667; },
-  { address = "irc.undernet.org"; chatnet = Undernet; port = 6667; },
-  { address = "irc.dal.net"; chatnet = DALnet; port = 6667; },
-  { address = "irc.openprojects.net"; chatnet = OPN; port = 6667; },
-  { address = "irc.ptlink.net"; chatnet = PTlink; port = 6667; }
-  { address = "silc.pspt.fi"; chatnet = SILC; port = 706; }
+  { address = "silc.pspt.fi"; chatnet = SILCNet; port = 706; }
 );
 
 chatnets = {
-  IRCNet = { type = "IRC"; max_kicks = 4; max_modes = 3; max_msgs = 5; max_whois = 4; };
-  EFNet = { type = "IRC"; max_kicks = 4; max_modes = 4; max_msgs = 3; };
-  Undernet = { type = "IRC"; max_kicks = 4; max_modes = 3; max_msgs = 3; max_query_chans = "1"; };
-  DALNet = { type = "IRC"; max_kicks = 4; max_modes = 6; max_msgs = 3; };
-  OPN = { type = "IRC"; max_kicks = 1; max_modes = 6; max_msgs = 100; };
-  PTLink = { type = "IRC"; max_kicks = 1; max_modes = 6; max_msgs = 100; };
-  SILC = { type = "SILC"; };
+  SILCNet = { type = "SILC"; };
 };
 
 channels = (
-  { name = "#irssi"; chatnet = ircnet; autojoin = No; },
-  { name = "#irssi"; chatnet = opn; autojoin = No; },
-  { name = "#silc"; chatnet = silc; autojoin = No; }
+  { name = "#silc"; chatnet = silcnet; autojoin = No; }
 );
 
 aliases = {
-  J = "join";
-  WJOIN = "join -window";
-  WQUERY = "query -window";
+  JOIN = "join -window";
+  QUERY = "query -window";
   LEAVE = "part";
   BYE = "quit";
   EXIT = "quit";
@@ -56,10 +41,19 @@ aliases = {
   IG = "ignore";
   UNIG = "unignore";
   SB = "scrollback";
-  UMODE = "mode $N";
   WC = "window close";
   WN = "window new hide";
-  SV = "say Irssi $J - http://irssi.org/";
   GOTO = "sb goto";
   CHAT = "dcc chat";
 };
+
+settings = {
+  "fe-common/core" = {
+    autocreate_own_query = "no";
+    use_status_window = "no";
+    autoclose_windows = "no";
+    use_msgs_window = "no";
+    autocreate_windows = "no";
+  };
+  "fe-text" = { topicbar = "no"; mail_counter = "yes"; };
+};
diff --git a/apps/irssi/configure.in b/apps/irssi/configure.in
index 8b68463e..ee82fced 100644
--- a/apps/irssi/configure.in
+++ b/apps/irssi/configure.in
@@ -647,12 +647,13 @@ for c in $CHAT_MODULES; do
 
 	file="$srcdir/src/$c/$c.c"
         echo "/* this file is automatically generated by configure - don't change */" > $file
-	echo "void ${c}_core_init(void); void ${c}_core_deinit(void);" >> $file
+	echo "void ${c}_core_init(void); void ${c}_core_init_finish(void); void ${c}_core_deinit(void);" >> $file
 	if test "x$module_inits" != "x"; then
         	echo "$module_inits" | $sedpath -e 's/()/(void)/g' -e 's/ /void /g' >> $file
         	echo "$module_deinits" | $sedpath -e 's/ *$//' -e 's/()/(void)/g' -e 's/ /void /g' -e 's/^/void /' >> $file
 	fi
         echo "void ${c}_init(void) { ${c}_core_init(); $module_inits }" >> $file
+        echo "void ${c}_init_finish(void) { ${c}_core_init_finish(); $module_inits }" >> $file
         echo "void ${c}_deinit(void) { $module_deinits ${c}_core_deinit(); }" >> $file
 
 	if test -f $srcdir/src/fe-common/$c/module.h; then
diff --git a/apps/irssi/default-config.h b/apps/irssi/default-config.h
deleted file mode 100644
index 635030b8..00000000
--- a/apps/irssi/default-config.h
+++ /dev/null
@@ -1,67 +0,0 @@
-const char *default_config =
-"lservers = (\n"
-"  { address = \"irc.stealth.net\"; chatnet = IRCNet; port = 6668; },\n"
-"  { address = \"irc.efnet.net\"; chatnet = EFNet; port = 6667; },\n"
-"  { address = \"irc.undernet.org\"; chatnet = Undernet; port = 6667; },\n"
-"  { address = \"irc.dal.net\"; chatnet = DALnet; port = 6667; },\n"
-"  { address = \"irc.openprojects.net\"; chatnet = OPN; port = 6667; },\n"
-"  { address = \"irc.ptlink.net\"; chatnet = PTlink; port = 6667; }\n"
-"  { address = \"silc.pspt.fi\"; chatnet = SILC; port = 706; }\n"
-");\n"
-"\n"
-"chatnets = {\n"
-"  IRCNet = { type = \"IRC\"; max_kicks = 4; max_modes = 3; max_msgs = 5; max_whois = 4; };\n"
-"  EFNet = { type = \"IRC\"; max_kicks = 4; max_modes = 4; max_msgs = 3; };\n"
-"  Undernet = { type = \"IRC\"; max_kicks = 4; max_modes = 3; max_msgs = 3; max_query_chans = \"1\"; };\n"
-"  DALNet = { type = \"IRC\"; max_kicks = 4; max_modes = 6; max_msgs = 3; };\n"
-"  OPN = { type = \"IRC\"; max_kicks = 1; max_modes = 6; max_msgs = 100; };\n"
-"  PTLink = { type = \"IRC\"; max_kicks = 1; max_modes = 6; max_msgs = 100; };\n"
-"  SILC = { type = \"SILC\"; };\n"
-"};\n"
-"\n"
-"channels = (\n"
-"  { name = \"#irssi\"; chatnet = ircnet; autojoin = No; },\n"
-"  { name = \"#irssi\"; chatnet = opn; autojoin = No; },\n"
-"  { name = \"#silc\"; chatnet = silc; autojoin = No; }\n"
-");\n"
-"\n"
-"aliases = {\n"
-"  J = \"join\";\n"
-"  WJOIN = \"join -window\";\n"
-"  WQUERY = \"query -window\";\n"
-"  LEAVE = \"part\";\n"
-"  BYE = \"quit\";\n"
-"  EXIT = \"quit\";\n"
-"  SIGNOFF = \"quit\";\n"
-"  DESCRIBE = \"action\";\n"
-"  DATE = \"time\";\n"
-"  HOST = \"userhost\";\n"
-"  LAST = \"lastlog\";\n"
-"  SAY = \"msg *\";\n"
-"  WI = \"whois\";\n"
-"  WII = \"whois $0 $0\";\n"
-"  WW = \"whowas\";\n"
-"  W = \"who\";\n"
-"  N = \"names\";\n"
-"  M = \"msg\";\n"
-"  T = \"topic\";\n"
-"  C = \"clear\";\n"
-"  CL = \"clear\";\n"
-"  K = \"kick\";\n"
-"  KB = \"kickban\";\n"
-"  KN = \"knockout\";\n"
-"  BANS = \"ban\";\n"
-"  B = \"ban\";\n"
-"  MUB = \"unban *\";\n"
-"  UB = \"unban\";\n"
-"  IG = \"ignore\";\n"
-"  UNIG = \"unignore\";\n"
-"  SB = \"scrollback\";\n"
-"  UMODE = \"mode $N\";\n"
-"  WC = \"window close\";\n"
-"  WN = \"window new hide\";\n"
-"  SV = \"say Irssi $J - http://irssi.org/\";\n"
-"  GOTO = \"sb goto\";\n"
-"  CHAT = \"dcc chat\";\n"
-"};\n"
-;
diff --git a/apps/irssi/src/core/settings.c b/apps/irssi/src/core/settings.c
index 28485601..10ecba92 100644
--- a/apps/irssi/src/core/settings.c
+++ b/apps/irssi/src/core/settings.c
@@ -492,7 +492,7 @@ static CONFIG_REC *parse_configfile(const char *fname)
 	char *real_fname;
 
 	real_fname = fname != NULL ? g_strdup(fname) :
-		g_strdup_printf("%s"G_DIR_SEPARATOR_S".irssi"
+		g_strdup_printf("%s"G_DIR_SEPARATOR_S".silc"
 				G_DIR_SEPARATOR_S"config", g_get_home_dir());
 
 	if (stat(real_fname, &statbuf) == 0)
diff --git a/apps/irssi/src/fe-common/core/autorun.c b/apps/irssi/src/fe-common/core/autorun.c
index b305b82e..f49b6c30 100644
--- a/apps/irssi/src/fe-common/core/autorun.c
+++ b/apps/irssi/src/fe-common/core/autorun.c
@@ -31,8 +31,8 @@ static void sig_autorun(void)
 	LINEBUF_REC *buffer = NULL;
 	int f, ret, recvlen;
 
-	/* open ~/.irssi/startup and run all commands in it */
-	path = g_strdup_printf("%s/.irssi/startup", g_get_home_dir());
+	/* open ~/.silc/startup and run all commands in it */
+	path = g_strdup_printf("%s/.silc/startup", g_get_home_dir());
 	f = open(path, O_RDONLY);
 	g_free(path);
 	if (f == -1) {
diff --git a/apps/irssi/src/fe-common/core/module-formats.c b/apps/irssi/src/fe-common/core/module-formats.c
index 2258c7e4..286c27b9 100644
--- a/apps/irssi/src/fe-common/core/module-formats.c
+++ b/apps/irssi/src/fe-common/core/module-formats.c
@@ -21,8 +21,6 @@
 #include "module.h"
 #include "formats.h"
 
-//	{ "line_start_irssi", "{line_start}{hilight Irssi:} ", 0 },
-
 FORMAT_REC fecommon_core_formats[] = {
 	{ MODULE_NAME, "Core", 0 },
 
@@ -30,7 +28,8 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ NULL, "Windows", 0 },
 
 	{ "line_start", "{line_start}", 0 },
-	{ "line_start_irssi", "{line_start} ", 0 },
+/*	{ "line_start_irssi", "{line_start}{hilight Irssi:} ", 0 }, */
+	{ "line_start_irssi", "{line_start}", 0 },
         { "timestamp", "{timestamp $Z} ", 6, { 1, 1, 1, 1, 1, 1 } },
 	{ "servertag", "[$0] ", 1, { 0 } },
 	{ "daychange", "Day changed to $[-2.0]{0} $3 $2", 4, { 1, 1, 1, 0 } },
diff --git a/apps/irssi/src/fe-text/silc.c b/apps/irssi/src/fe-text/silc.c
index 7c05703c..a4203e47 100644
--- a/apps/irssi/src/fe-text/silc.c
+++ b/apps/irssi/src/fe-text/silc.c
@@ -148,10 +148,12 @@ static void textui_finish_init(void)
 #endif
 	signal_emit("irssi init finished", 0);
 
+#if 0
 	if (display_firsttimer) {
 		printtext_window(active_win, MSGLEVEL_CLIENTNOTICE,
 				 "%s", firsttimer_text);
 	}
+#endif
 
 	screen_refresh_thaw();
 }
diff --git a/apps/irssi/src/silc/core/silc-core.c b/apps/irssi/src/silc/core/silc-core.c
index 9126d6d9..ddd39e40 100644
--- a/apps/irssi/src/silc/core/silc-core.c
+++ b/apps/irssi/src/silc/core/silc-core.c
@@ -338,7 +338,7 @@ static int silc_verify_public_key(SilcClient client,
 static unsigned char *silc_ask_passphrase(SilcClient client,
 					  SilcClientConnection conn)
 {
-	return NULL;
+  return NULL;
 }
 
 /* Find authentication method and authentication data by hostname and
@@ -480,6 +480,71 @@ static SERVER_CONNECT_REC *create_server_connect(void)
   return g_malloc0(sizeof(SILC_SERVER_CONNECT_REC));
 }
 
+/* Checks user information and saves them to the config file it they
+   do not exist there already. */
+
+static void silc_init_userinfo(void)
+{
+  const char *set, *nick, *user_name;
+  char *str;   
+        
+  /* check if nick/username/realname wasn't read from setup.. */
+  set = settings_get_str("real_name");
+  if (set == NULL || *set == '\0') {
+    str = g_getenv("SILCNAME");
+    if (!str)
+      str = g_getenv("IRCNAME");
+    settings_set_str("real_name",
+		     str != NULL ? str : g_get_real_name());
+  }
+ 
+  /* username */
+  user_name = settings_get_str("user_name");
+  if (user_name == NULL || *user_name == '\0') {
+    str = g_getenv("SILCUSER");
+    if (!str)
+      str = g_getenv("IRCUSER");
+    settings_set_str("user_name",
+		     str != NULL ? str : g_get_user_name());
+    
+    user_name = settings_get_str("user_name");
+  }
+         
+  /* nick */
+  nick = settings_get_str("nick");
+  if (nick == NULL || *nick == '\0') {
+    str = g_getenv("SILCNICK");
+    if (!str)
+      str = g_getenv("IRCNICK");
+    settings_set_str("nick", str != NULL ? str : user_name);
+    
+    nick = settings_get_str("nick");
+  }
+                
+  /* alternate nick */
+  set = settings_get_str("alternate_nick");
+  if (set == NULL || *set == '\0') {
+    if (strlen(nick) < 9)
+      str = g_strconcat(nick, "_", NULL);
+    else { 
+      str = g_strdup(nick);
+      str[strlen(str)-1] = '_';
+    }
+    settings_set_str("alternate_nick", str);
+    g_free(str);
+  }
+
+  /* host name */
+  set = settings_get_str("hostname");
+  if (set == NULL || *set == '\0') {
+    str = g_getenv("SILCHOST");
+    if (!str)
+      str = g_getenv("IRCHOST");
+    if (str != NULL)
+      settings_set_str("hostname", str);
+  }
+}
+
 /* Init SILC. Called from src/fe-text/silc.c */
 
 void silc_core_init(void)
@@ -513,7 +578,6 @@ void silc_core_init_finish(void)
     silc_hmac_register_default();
     silc_client_create_key_pair(opt_pkcs, opt_bits, 
 				NULL, NULL, NULL, NULL, NULL);
-    silc_free(opt_pkcs);
     exit(0);
   }
 
@@ -524,7 +588,6 @@ void silc_core_init_finish(void)
     silc_hash_register_default();
     silc_hmac_register_default();
     silc_client_show_key(opt_keyfile);
-    silc_free(opt_keyfile);
     exit(0);
   }
 
@@ -595,6 +658,7 @@ void silc_core_init_finish(void)
   chat_protocol_register(rec);
   g_free(rec);
 
+  silc_init_userinfo();
   silc_server_init();
   silc_channels_init();
   silc_queries_init();
diff --git a/prepare b/prepare
index 352c3b2a..041f9e5c 100755
--- a/prepare
+++ b/prepare
@@ -55,15 +55,13 @@ echo "#define SILC_VERSION_STRING \"$version\"" >>$file
 echo "#define SILC_PROTOCOL_VERSION_STRING \"SILC-1.0-$version\"" >>$file
 
 # preparing irssi
-if [ -d irssi ]; then
-  cd irssi
-  ./autogen.sh 2>/dev/null 1>/dev/null
-  cd ..
-  file=irssi/irssi-version.h
-  version_date=`date +%Y%m%d`
-  echo "/* automatically created by autogen.sh */" > $file
-  echo "#define IRSSI_VERSION \"$version (Irssi base: @VERSION@ - SILC base: SILC Toolkit $version)\"" >> $file
-  echo "#define IRSSI_VERSION_DATE \"$version_date\"" >> $file
-fi
+cd irssi
+./autogen.sh 2>/dev/null 1>/dev/null
+cd ..
+file=irssi/irssi-version.h.in
+version_date=`date +%Y%m%d`
+echo "/* automatically created by autogen.sh */" > $file
+echo "#define IRSSI_VERSION \"$version (Irssi base: @VERSION@ - SILC base: SILC Toolkit $version)\"" >> $file
+echo "#define IRSSI_VERSION_DATE \"$version_date\"" >> $file
 
 echo "Done, now run ./configure and make."
diff --git a/prepare-clean b/prepare-clean
index 11bd17a8..ec809792 100755
--- a/prepare-clean
+++ b/prepare-clean
@@ -54,24 +54,22 @@ rm -f silc/Makefile.in silc/log* silc/*.log
 rm -f aclocal.m4
 rm -f config.status
 rm -f configure
-if [ -d irssi ]; then
-  cd irssi
-  rm -f COPYING
-  rm -f INSTALL
-  rm -f Makefile.in
-  rm -f */Makefile.in
-  rm -f */*/Makefile.in
-  rm -f */*/*/Makefile.in
-  rm -f */*/*/*/Makefile.in
-  rm -f default-theme.h
-  rm -f libtool-shared
-  rm -f stamp-*
-  rm -f docs/startup*.txt
-  cd docs/help
-  cp Makefile.am.gen ..
-  rm -f * 2>/dev/null
-  mv ../Makefile.am.gen .
-  cd ../..
-  rm -f docs/help/in/Makefile.am
-fi
+cd irssi
+rm -f COPYING
+rm -f INSTALL
+rm -f Makefile.in
+rm -f */Makefile.in
+rm -f */*/Makefile.in
+rm -f */*/*/Makefile.in
+rm -f */*/*/*/Makefile.in
+rm -f default-theme.h
+rm -f libtool-shared
+rm -f stamp-*
+rm -f docs/startup*.txt
+cd docs/help
+cp Makefile.am.gen ..
+rm -f * 2>/dev/null
+mv ../Makefile.am.gen .
+cd ../..
+rm -f docs/help/in/Makefile.am
 echo "Done."