+++ /dev/null
-diff -ur irssi-0.8.1.orig/src/irc/core/channels-query.c irssi-0.8.1/src/irc/core/channels-query.c
---- irssi-0.8.1.orig/src/irc/core/channels-query.c Fri Dec 7 23:10:11 2001
-+++ irssi-0.8.1/src/irc/core/channels-query.c Mon Mar 11 15:07:55 2002
-@@ -364,7 +364,8 @@
- /* Add channel to query lists */
- if (!channel->no_modes)
- query_add_channel(channel, CHANNEL_QUERY_MODE);
-- query_add_channel(channel, CHANNEL_QUERY_WHO);
-+ if (settings_get_bool("channel_auto_who"))
-+ query_add_channel(channel, CHANNEL_QUERY_WHO);
- if (!channel->no_modes)
- query_add_channel(channel, CHANNEL_QUERY_BMODE);
-
-@@ -481,6 +482,7 @@
- void channels_query_init(void)
- {
- settings_add_bool("misc", "channel_sync", TRUE);
-+ settings_add_bool("misc", "channel_auto_who", TRUE);
-
- signal_add("server connected", (SIGNAL_FUNC) sig_connected);
- signal_add("server disconnected", (SIGNAL_FUNC) sig_disconnected);
+++ /dev/null
-diff -ur irssi-0.8.4.orig/src/irc/dcc/dcc-rec.h irssi-0.8.4/src/irc/dcc/dcc-rec.h
---- irssi-0.8.4.orig/src/irc/dcc/dcc-rec.h Mon Feb 19 04:40:06 2001
-+++ irssi-0.8.4/src/irc/dcc/dcc-rec.h Thu Mar 14 02:20:25 2002
-@@ -20,6 +20,12 @@
- time_t starttime; /* transfer start time */
- unsigned long transfd; /* bytes transferred */
-
-+int timeout_tag;
-+
-+unsigned long skip_bytes;
-+unsigned long limit_starttime;
-+unsigned long max_speed;
-+
- unsigned int destroyed:1; /* We're about to destroy this DCC recond */
-
- GHashTable *module_data;
-diff -ur irssi-0.8.4.orig/src/irc/dcc/dcc-send.c irssi-0.8.4/src/irc/dcc/dcc-send.c
---- irssi-0.8.4.orig/src/irc/dcc/dcc-send.c Sun Jan 20 04:10:27 2002
-+++ irssi-0.8.4/src/irc/dcc/dcc-send.c Thu Mar 14 02:21:22 2002
-@@ -50,14 +50,84 @@
- {
- if (!IS_DCC_SEND(dcc)) return;
-
-+ if (dcc->timeout_tag != -1)
-+ g_source_remove(dcc->timeout_tag);
-+
- if (dcc->fhandle != -1) close(dcc->fhandle);
- }
-
-+static int sent_too_much(SEND_DCC_REC *dcc)
-+{
-+ GTimeVal gtv;
-+ gulong timediff, curtime;
-+ gulong transfd, speed;
-+
-+ /* 0 == unlimited speed */
-+ if (dcc->max_speed == 0) return 0;
-+
-+ /* get time difference in milliseconds */
-+ g_get_current_time(>v);
-+ curtime = (gtv.tv_sec * 1000) + (gtv.tv_usec / 1000);
-+
-+ transfd = (dcc->transfd - dcc->skip_bytes);
-+ timediff = curtime - dcc->limit_starttime + 1;
-+ speed = ((transfd * 1000) / timediff);
-+
-+ /* reset speed counter every 30 seconds */
-+ if (timediff >= 30000) {
-+ dcc->limit_starttime = curtime;
-+ dcc->skip_bytes = dcc->transfd;
-+ }
-+
-+ return (speed > (dcc->max_speed * 1024));
-+}
-+
-+static void dcc_send_data(SEND_DCC_REC *dcc);
-+
-+static void reset_dcc_send(SEND_DCC_REC *dcc)
-+{
-+ if (g_slist_find(dcc_conns, dcc) == NULL) {
-+ /* the DCC was closed during the wait */
-+ return;
-+ }
-+
-+ if (dcc->timeout_tag != -1)
-+ g_source_remove(dcc->timeout_tag);
-+ dcc->timeout_tag = -1;
-+
-+ dcc->tagwrite = g_input_add(dcc->handle, G_INPUT_WRITE,
-+ (GInputFunction) dcc_send_data, dcc);
-+
-+ return;
-+}
-+
- /* input function: DCC SEND - we're ready to send more data */
- static void dcc_send_data(SEND_DCC_REC *dcc)
- {
- char buffer[512];
-- int ret;
-+ int ret, max_speed;
-+ GTimeVal gtv;
-+
-+ max_speed = settings_get_int("dcc_send_top_speed");
-+ if (max_speed != dcc->max_speed) {
-+ /* speed setting has changed, calculate speed from current position
-+ instead of from the start to eliminate speed boosts/slowdowns */
-+
-+ dcc->max_speed = max_speed;
-+ dcc->skip_bytes = dcc->transfd;
-+
-+ g_get_current_time(>v);
-+ dcc->limit_starttime = (gtv.tv_sec * 1000) + (gtv.tv_usec / 1000);
-+ }
-+
-+ if (sent_too_much(dcc)) {
-+ /* disable calling this function for 1/10th of a second. */
-+ g_source_remove(dcc->tagwrite);
-+ dcc->tagwrite = -1;
-+ dcc->timeout_tag = g_timeout_add(100, (GSourceFunc)
-+ reset_dcc_send, dcc);
-+ return;
-+ }
-
- ret = read(dcc->fhandle, buffer, sizeof(buffer));
- if (ret <= 0) {
-@@ -118,6 +188,7 @@
- GIOChannel *handle;
- IPADDR addr;
- int port;
-+ GTimeVal gtv;
-
- /* accept connection */
- handle = net_accept(dcc->handle, &addr, &port);
-@@ -132,6 +203,13 @@
- g_source_remove(dcc->tagconn);
- dcc->tagconn = -1;
-
-+ dcc->skip_bytes = 0;
-+ dcc->max_speed = settings_get_int("dcc_send_top_speed");
-+
-+ /* get starttime in milliseconds */
-+ g_get_current_time(>v);
-+ dcc->limit_starttime = (gtv.tv_sec * 1000) + (gtv.tv_usec / 1000);
-+
- dcc->starttime = time(NULL);
- dcc->handle = handle;
- memcpy(&dcc->addr, &addr, sizeof(IPADDR));
-@@ -235,6 +313,7 @@
- dcc->size = fsize;
- dcc->fhandle = hfile;
- dcc->file_quoted = strchr(fname, ' ') != NULL;
-+ dcc->timeout_tag = -1;
- dcc->tagconn = g_input_add(handle, G_INPUT_READ,
- (GInputFunction) dcc_send_connected, dcc);
-
-@@ -256,6 +335,7 @@
- {
- dcc_register_type("SEND");
- settings_add_str("dcc", "dcc_upload_path", "~");
-+ settings_add_int("dcc", "dcc_send_top_speed", 0);
-
- signal_add("dcc destroyed", (SIGNAL_FUNC) sig_dcc_destroyed);
- command_bind("dcc send", NULL, (SIGNAL_FUNC) cmd_dcc_send);
+++ /dev/null
---- irssi-0.8.5/curses.m4~ Sun Jul 29 01:10:02 2001
-+++ irssi-0.8.5/curses.m4 Sat Nov 23 04:31:32 2002
-@@ -131,7 +131,7 @@
- if test x$withval = xno ; then
- search_ncurses=false
- elif test x$withval != xyes ; then
-- AC_NCURSES($withval/include, ncurses.h, -L$withval/lib -lncurses, -I$withval/include, "ncurses on $withval/include")
-+ AC_NCURSES($withval/include, ncurses.h, -L$withval/lib -lncurses -ltinfo, -I$withval/include, "ncurses on $withval/include")
- fi
- )
-
---- irssi-0.8.5/curses.m4~ Sat Nov 23 04:32:37 2002
-+++ irssi-0.8.5/curses.m4 Sat Nov 23 04:35:46 2002
-@@ -232,16 +232,16 @@
- AC_DEFUN(AC_SEARCH_NCURSES, [
- AC_CHECKING("location of ncurses.h file")
-
-- AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include")
-- AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
-- AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include, "ncurses on /usr/local")
-- AC_NCURSES(/usr/pkg/include, ncurses.h, -L/usr/pkg/lib -lncurses, -I/usr/pkg/include, "ncurses on /usr/pkg")
-- AC_NCURSES(/usr/contrib/include, ncurses.h, -L/usr/contrib/lib -lncurses, -I/usr/contrib/include, "ncurses on /usr/contrib")
-- AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses -lncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
-+ AC_NCURSES(/usr/include, ncurses.h, -lncurses -ltinfo,, "ncurses on /usr/include")
-+ AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses -ltinfo, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
-+ AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses -ltinfo, -I/usr/local/include, "ncurses on /usr/local")
-+ AC_NCURSES(/usr/pkg/include, ncurses.h, -L/usr/pkg/lib -lncurses -ltinfo, -I/usr/pkg/include, "ncurses on /usr/pkg")
-+ AC_NCURSES(/usr/contrib/include, ncurses.h, -L/usr/contrib/lib -lncurses -ltinfo, -I/usr/contrib/include, "ncurses on /usr/contrib")
-+ AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses -lncurses -ltinfo, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
-
-- AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
-+ AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses -ltinfo, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
-
-- AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
-+ AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses -ltinfo, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
-
- dnl
- dnl We couldn't find ncurses, try SysV curses
+++ /dev/null
---- irssi-0.8.6/irssi.conf.orig Thu Sep 12 01:00:08 2002
-+++ irssi-0.8.6/irssi.conf Tue Nov 19 14:47:41 2002
-@@ -22,6 +22,7 @@
- },
- { address = "irc.ptnet.org"; chatnet = "PTnet"; port = "6667"; },
- { address = "irc.azzurra.org"; chatnet = "AzzurraNET"; port = "6667"; },
-+ { address = "irc.pld.org.pl"; chatnet = "PLDNet"; port = "6667"; },
- { address = "silc.pspt.fi"; chatnet = "SILC"; port = "706"; }
- );
-
-@@ -104,11 +105,20 @@
- max_msgs = "3";
- };
- SILC = { type = "SILC"; };
-+ PLDNet = {
-+ type = "IRC";
-+ max_kicks = "4";
-+ max_modes = "4";
-+ max_msgs = "5";
-+ max_whois = "4";
-+ max_query_chans = "5";
-+ };
- };
-
- channels = (
- { name = "#irssi"; chatnet = "ircnet"; autojoin = "No"; },
- { name = "#irssi"; chatnet = "freenode"; autojoin = "No"; },
-+ { name = "#pldhelp"; chatnet = "PLDNet"; autojoin = "No"; },
- { name = "#silc"; chatnet = "silc"; autojoin = "No"; }
- );
-
+++ /dev/null
-[Desktop Entry]
-Name=Irssi
-Comment=Irssi is a IRC client
-Comment[fr]=Irssi est un client IRC
-Comment[pl]=Irssi - klient IRC
-Exec=irssi
-Icon=irssi.png
-Terminal=1
-Type=Application
projects / packages / irssi.git / commitdiff
