r25465 - in /packages/unstable/xchat-gnome/debian: ./ patches/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun Oct 31 10:09:34 UTC 2010 

Author: joss
Date: Sun Oct 31 10:09:26 2010
New Revision: 25465

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25465
Log:
* Pick some patches from upstream git.
  + 01_reduce_wakeups.patch: trivial change to limit the number of 
    wakeups.
  + 02_auto_back.patch: use /back instead of /away to mark the user as 
    back.
  + 03_topic_return.patch: replaces 11_topic_return.patch.
  + 04_crasher_autojoin.patch: fix crasher when the autojoin list is 
    empty. Closes: #524410.
  + 05_nick_suffix.patch: replace 10_obey_nick_suffix.patch.
  + 06_freenode_servers.patch, 06_oz.org_servers.patch: replace
    50_serverlist_update.patch.
  + 07_crasher_null.patch: fix null pointer dereference.
    - 07_crasher_null_fix.patch: fix regression introduced by this 
      patch.
  + 08_dcc_transfers.patch: get DCC transfers to work on fresh 
    installs.

Added:
    packages/unstable/xchat-gnome/debian/patches/01_reduce_wakeups.patch
    packages/unstable/xchat-gnome/debian/patches/02_auto_back.patch
    packages/unstable/xchat-gnome/debian/patches/03_topic_return.patch
    packages/unstable/xchat-gnome/debian/patches/04_crasher_autojoin.patch
    packages/unstable/xchat-gnome/debian/patches/05_nick_suffix.patch
    packages/unstable/xchat-gnome/debian/patches/06_freenode_servers.patch
    packages/unstable/xchat-gnome/debian/patches/06_oz.org_servers.patch
    packages/unstable/xchat-gnome/debian/patches/07_crasher_null.patch
    packages/unstable/xchat-gnome/debian/patches/07_crasher_null_fix.patch
    packages/unstable/xchat-gnome/debian/patches/08_dcc_transfers.patch
Removed:
    packages/unstable/xchat-gnome/debian/patches/10_obey_nick_suffix.patch
    packages/unstable/xchat-gnome/debian/patches/11_topic_return.patch
    packages/unstable/xchat-gnome/debian/patches/50_serverlist_update.patch
Modified:
    packages/unstable/xchat-gnome/debian/changelog

Modified: packages/unstable/xchat-gnome/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/changelog?rev=25465&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/changelog [utf-8] (original)
+++ packages/unstable/xchat-gnome/debian/changelog [utf-8] Sun Oct 31 10:09:26 2010
@@ -1,8 +1,24 @@
-xchat-gnome (1:0.26.1-3) UNRELEASED; urgency=low
+xchat-gnome (1:0.26.1-3) unstable; urgency=low
 
   * Update description, based on an Ubuntu patch. Closes: #590238.
-
- -- Josselin Mouette <joss at debian.org>  Mon, 26 Jul 2010 09:11:48 +0200
+  * Pick some patches from upstream git.
+    + 01_reduce_wakeups.patch: trivial change to limit the number of 
+      wakeups.
+    + 02_auto_back.patch: use /back instead of /away to mark the user as 
+      back.
+    + 03_topic_return.patch: replaces 11_topic_return.patch.
+    + 04_crasher_autojoin.patch: fix crasher when the autojoin list is 
+      empty. Closes: #524410.
+    + 05_nick_suffix.patch: replace 10_obey_nick_suffix.patch.
+    + 06_freenode_servers.patch, 06_oz.org_servers.patch: replace
+      50_serverlist_update.patch.
+    + 07_crasher_null.patch: fix null pointer dereference.
+      - 07_crasher_null_fix.patch: fix regression introduced by this 
+        patch.
+    + 08_dcc_transfers.patch: get DCC transfers to work on fresh 
+      installs.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 31 Oct 2010 11:08:23 +0100
 
 xchat-gnome (1:0.26.1-2) unstable; urgency=low
 

Added: packages/unstable/xchat-gnome/debian/patches/01_reduce_wakeups.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/01_reduce_wakeups.patch?rev=25465&op=file
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/01_reduce_wakeups.patch (added)
+++ packages/unstable/xchat-gnome/debian/patches/01_reduce_wakeups.patch [utf-8] Sun Oct 31 10:09:26 2010
@@ -1,0 +1,22 @@
+From 40b931b84791786cf7780370b7bc09509b3c60db Mon Sep 17 00:00:00 2001
+From: Javier Jardón <javierjc1982 at gmail.com>
+Date: Sun, 03 May 2009 18:09:50 +0000
+Subject: Use g_timeout_add_seconds to reduce wakeups
+
+closes GNOME bug #581094
+---
+diff --git a/src/fe-gnome/channel-list-window.c b/src/fe-gnome/channel-list-window.c
+index 9f9ca68..e7e7c31 100644
+--- a/src/fe-gnome/channel-list-window.c
++++ b/src/fe-gnome/channel-list-window.c
+@@ -157,7 +157,7 @@ channel_list_window_refresh (ChannelListWindow *win)
+ 	 * click-happy kids
+ 	 */
+ 	win->refresh_calls = 0;
+-	win->refresh_timeout = g_timeout_add (2000, (GSourceFunc) channel_list_window_resensitize, (gpointer) win);
++	win->refresh_timeout = g_timeout_add_seconds (2, (GSourceFunc) channel_list_window_resensitize, (gpointer) win);
+ }
+ 
+ static gboolean
+--
+cgit v0.8.3.1

Added: packages/unstable/xchat-gnome/debian/patches/02_auto_back.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/02_auto_back.patch?rev=25465&op=file
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/02_auto_back.patch (added)
+++ packages/unstable/xchat-gnome/debian/patches/02_auto_back.patch [utf-8] Sun Oct 31 10:09:26 2010
@@ -1,0 +1,22 @@
+From 83355213aaf2738414d5b1a7d4fb861aa41365ec Mon Sep 17 00:00:00 2001
+From: Tobias Mueller <tobiasmue at gnome.org>
+Date: Thu, 28 May 2009 12:26:43 +0000
+Subject: Use "/back", instead of "/away" to toggle away status
+
+Fixes bug 582017.
+---
+diff --git a/plugins/autoaway/autoaway.c b/plugins/autoaway/autoaway.c
+index 7d6752d..a5c9376 100644
+--- a/plugins/autoaway/autoaway.c
++++ b/plugins/autoaway/autoaway.c
+@@ -141,7 +141,7 @@ come_back (void)
+ 			node = g_list_next (node);
+ 			continue;
+ 		}
+-		xchat_command (ph, "AWAY");
++		xchat_command (ph, "BACK");
+ 
+ 		node = g_list_next (node);
+ 	}
+--
+cgit v0.8.3.1

Added: packages/unstable/xchat-gnome/debian/patches/03_topic_return.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/03_topic_return.patch?rev=25465&op=file
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/03_topic_return.patch (added)
+++ packages/unstable/xchat-gnome/debian/patches/03_topic_return.patch [utf-8] Sun Oct 31 10:09:26 2010
@@ -1,0 +1,20 @@
+From 6d1a939a14de918de4a79c010d82796f8035bcfa Mon Sep 17 00:00:00 2001
+From: Josselin Mouette <^Css at malsain.org>
+Date: Thu, 18 Jun 2009 09:41:33 +0000
+Subject: Bug 536916 – Pressing "Enter" in the middle of editing channel topic truncates it.
+
+---
+diff --git a/src/fe-gnome/topic-label.c b/src/fe-gnome/topic-label.c
+index a7d1883..977d29c 100644
+--- a/src/fe-gnome/topic-label.c
++++ b/src/fe-gnome/topic-label.c
+@@ -315,6 +315,7 @@ static void
+ topic_entry_activate (GtkTextBuffer *textbuffer, GtkTextIter *arg1, gchar *text, gint len, GtkDialog *dialog)
+ {
+ 	if (strncmp (text, "\n", len) == 0) {
++		g_signal_stop_emission_by_name (G_OBJECT (textbuffer), "insert-text");
+ 		gtk_dialog_response (dialog, GTK_RESPONSE_OK);
+ 	}
+ }
+--
+cgit v0.8.3.1

Added: packages/unstable/xchat-gnome/debian/patches/04_crasher_autojoin.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/04_crasher_autojoin.patch?rev=25465&op=file
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/04_crasher_autojoin.patch (added)
+++ packages/unstable/xchat-gnome/debian/patches/04_crasher_autojoin.patch [utf-8] Sun Oct 31 10:09:26 2010
@@ -1,0 +1,22 @@
+From 189fe5e30f510ebcdddf399a265380e59729710c Mon Sep 17 00:00:00 2001
+From: Ritesh Khadgaray <khadgaray at gmail.com>
+Date: Fri, 11 Sep 2009 17:37:20 +0000
+Subject: Bug 594770 -  Crash when autojoin list is the empty string
+
+Thanks to cascardo for locating this
+---
+diff --git a/src/fe-gnome/navigation-tree.c b/src/fe-gnome/navigation-tree.c
+index 9e0a413..645885b 100644
+--- a/src/fe-gnome/navigation-tree.c
++++ b/src/fe-gnome/navigation-tree.c
+@@ -706,7 +706,7 @@ channel_is_autojoin (session *sess)
+ {
+ 	ircnet *network = (ircnet *) sess->server->network;
+ 
+-	if (network == NULL || network->autojoin == NULL) {
++	if (network == NULL || network->autojoin == NULL || g_utf8_strlen ( network->autojoin , 0) == 0) {
+ 		return FALSE;
+ 	}
+ 
+--
+cgit v0.8.3.1

Added: packages/unstable/xchat-gnome/debian/patches/05_nick_suffix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/05_nick_suffix.patch?rev=25465&op=file
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/05_nick_suffix.patch (added)
+++ packages/unstable/xchat-gnome/debian/patches/05_nick_suffix.patch [utf-8] Sun Oct 31 10:09:26 2010
@@ -1,0 +1,32 @@
+From fe6f65460b15f7ebb79e0650bb0badbc924d8ccf Mon Sep 17 00:00:00 2001
+From: Ritesh Khadgaray <khadgaray at gmail.com>
+Date: Fri, 23 Oct 2009 18:29:27 +0000
+Subject: Bug 579045 -  tab completion hard-codes ":", ignores completion_suffix
+
+xchat-gnome has hard coded ":" in tab_complete_nickname(), instead of using the
+completion_suffix setting in xchat.conf. Which happens to default to ","
+---
+diff --git a/src/fe-gnome/text-entry.c b/src/fe-gnome/text-entry.c
+index ecabb55..b7994df 100644
+--- a/src/fe-gnome/text-entry.c
++++ b/src/fe-gnome/text-entry.c
+@@ -563,7 +563,7 @@ tab_complete_nickname (GtkEntry *entry, gint start)
+ 				g_free (p);
+ 				pos = g_utf8_strlen ((char *) options->data, -1) + start;
+ 			} else {
+-				npt = g_strdup_printf ("%s: ", (char *) options->data);
++				npt = g_strdup_printf ("%s%s ", (char *) options->data, prefs.nick_suffix);
+ 				pos = g_utf8_strlen ((char *) options->data, -1) + 2;
+ 			}
+ 		} else {
+@@ -577,7 +577,7 @@ tab_complete_nickname (GtkEntry *entry, gint start)
+ 				g_free (p);
+ 				pos = g_utf8_strlen ((char *) options->data, -1) + start;
+ 			} else {
+-				npt = g_strdup_printf ("%s: %s", (char *) options->data, at_cursor);
++				npt = g_strdup_printf ("%s%s %s", (char *) options->data, prefs.nick_suffix, at_cursor);
+ 				pos = g_utf8_strlen ((char *) options->data, -1) + 2;
+ 			}
+ 		}
+--
+cgit v0.8.3.1

Added: packages/unstable/xchat-gnome/debian/patches/06_freenode_servers.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/06_freenode_servers.patch?rev=25465&op=file
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/06_freenode_servers.patch (added)
+++ packages/unstable/xchat-gnome/debian/patches/06_freenode_servers.patch [utf-8] Sun Oct 31 10:09:26 2010
@@ -1,0 +1,33 @@
+From 2df62be43c67ae0087be001816f710a8a8b86dd4 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir at src.gnome.org>
+Date: Wed, 24 Mar 2010 12:43:58 +0000
+Subject: Bug 608515 - Freenode's network configuration does not mention port numbers
+
+Since no port number is mentioned for Freenode it is impossible to use SSL
+connections without modifying the configuration. This is because the default
+SSL port is 9999 which does not work with Freenode.
+---
+diff --git a/src/common/servlist.c b/src/common/servlist.c
+index c6839e0..3082966 100644
+--- a/src/common/servlist.c
++++ b/src/common/servlist.c
+@@ -207,7 +207,16 @@ static const struct defaultserver def[] =
+ 	{0,			"irc.vendetta.com"},
+ 
+ 	{"FreeNode",	0},
+-	{0,				"irc.freenode.net"},
++	{0,				"irc.freenode.net/6665"},
++	{0,				"irc.freenode.net/6666"},
++	{0,				"irc.freenode.net/6667"},
++	{0,				"irc.freenode.net/8000"},
++	{0,				"irc.freenode.net/8001"},
++	{0,				"irc.freenode.net/8002"},
++#ifdef USE_OPENSSL
++	{0,				"irc.freenode.net/+7000"},
++	{0,				"irc.freenode.net/+7070"},
++#endif
+ 
+ /*	{"Freeworld",	0},
+ 	{0,			"kabel.freeworld.nu"},
+--
+cgit v0.8.3.1

Added: packages/unstable/xchat-gnome/debian/patches/06_oz.org_servers.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/06_oz.org_servers.patch?rev=25465&op=file
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/06_oz.org_servers.patch (added)
+++ packages/unstable/xchat-gnome/debian/patches/06_oz.org_servers.patch [utf-8] Sun Oct 31 10:09:26 2010
@@ -1,0 +1,30 @@
+From 63253dc5077073c20a9f8c116714414586fcfb87 Mon Sep 17 00:00:00 2001
+From: Luca Bruno <lethalman88 at gmail.com>
+Date: Fri, 20 Nov 2009 14:24:55 +0000
+Subject: Bug 482727 -  xchat-gnome has the wrong servers for Oz.org under OzNet
+
+---
+diff --git a/src/common/servlist.c b/src/common/servlist.c
+index 133e8c4..c6839e0 100644
+--- a/src/common/servlist.c
++++ b/src/common/servlist.c
+@@ -337,8 +337,15 @@ static const struct defaultserver def[] =
+ 	{"OtherNet",	0},
+ 	{0,			"irc.othernet.org"},
+ 
+-	{"OzNet",	0},
+-	{0,			"irc.oz.org"},
++	{"Oz.org",	0},
++ 	{0,			"irc.oz.org"},
++	{0,			"germany.oz.org"},
++	{0,			"sandiego.oz.org"},
++	{0,			"us.oz.org"},
++	{0,			"au.oz.org"},
++	{0,			"rockhampton.oz.org"},
++	{0,			"wollongong.oz.org"},
++	{0,			"waix.oz.org"},	
+ 
+ 	{"PTlink",	0},
+ 	{0,			"irc.PTlink.net"},
+--
+cgit v0.8.3.1

Added: packages/unstable/xchat-gnome/debian/patches/07_crasher_null.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/07_crasher_null.patch?rev=25465&op=file
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/07_crasher_null.patch (added)
+++ packages/unstable/xchat-gnome/debian/patches/07_crasher_null.patch [utf-8] Sun Oct 31 10:09:26 2010
@@ -1,0 +1,103 @@
+From 1418579a815af27190b56ac3595ec8bae5b71647 Mon Sep 17 00:00:00 2001
+From: Ritesh Khadgaray <khadgaray at gmail.com>
+Date: Wed, 13 Jan 2010 17:26:02 +0000
+Subject: Bug 592491 -  xchat-gnome crashed with SIGSEGV in handle_command(
+
+Probable fix. This should also fix
+rh bug 550662 -  [abrt] crash detected in xchat-gnome-0.26.1-5.fc12
+---
+diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
+index f1ab1a8..a47f710 100644
+--- a/src/common/proto-irc.c
++++ b/src/common/proto-irc.c
+@@ -44,7 +44,7 @@
+ static void
+ irc_login (server *serv, char *user, char *realname)
+ {
+-	if (serv->password[0])
++	if (serv->password)
+ 		tcp_sendf (serv, "PASS %s\r\n", serv->password);
+ 
+ 	tcp_sendf (serv,
+@@ -87,7 +87,7 @@ irc_ns_ghost (server *serv, char *usname, char *pass)
+ static void
+ irc_join (server *serv, char *channel, char *key)
+ {
+-	if (key[0])
++	if (key)
+ 		tcp_sendf (serv, "JOIN %s %s\r\n", channel, key);
+ 	else
+ 		tcp_sendf (serv, "JOIN %s\r\n", channel);
+@@ -96,7 +96,7 @@ irc_join (server *serv, char *channel, char *key)
+ static void
+ irc_part (server *serv, char *channel, char *reason)
+ {
+-	if (reason[0])
++	if (reason)
+ 		tcp_sendf (serv, "PART %s :%s\r\n", channel, reason);
+ 	else
+ 		tcp_sendf (serv, "PART %s\r\n", channel);
+@@ -105,7 +105,7 @@ irc_part (server *serv, char *channel, char *reason)
+ static void
+ irc_quit (server *serv, char *reason)
+ {
+-	if (reason[0])
++	if (reason)
+ 		tcp_sendf (serv, "QUIT :%s\r\n", reason);
+ 	else
+ 		tcp_send_len (serv, "QUIT\r\n", 6);
+@@ -114,15 +114,16 @@ irc_quit (server *serv, char *reason)
+ static void
+ irc_set_back (server *serv)
+ {
+-	tcp_send_len (serv, "AWAY\r\n", 6);
++	tcp_send_len (serv, "BACK\r\n", 6);
+ }
+ 
+ static void
+ irc_set_away (server *serv, char *reason)
+ {
+-	if (!reason[0])
+-		reason = " ";
+-	tcp_sendf (serv, "AWAY :%s\r\n", reason);
++	if (reason)
++		tcp_sendf (serv, "AWAY :%s\r\n", reason);
++	else
++	        tcp_send_len (serv, "AWAY", 6);
+ }
+ 
+ static void
+@@ -146,7 +147,7 @@ irc_cycle (server *serv, char *channel, char *key)
+ static void
+ irc_kick (server *serv, char *channel, char *nick, char *reason)
+ {
+-	if (reason[0])
++	if (reason)
+ 		tcp_sendf (serv, "KICK %s %s :%s\r\n", channel, nick, reason);
+ 	else
+ 		tcp_sendf (serv, "KICK %s %s\r\n", channel, nick);
+@@ -235,18 +236,16 @@ irc_notice (server *serv, char *channel, char *text)
+ static void
+ irc_topic (server *serv, char *channel, char *topic)
+ {
+-	if (!topic)
+-		tcp_sendf (serv, "TOPIC %s :\r\n", channel);
+-	else if (topic[0])
+-		tcp_sendf (serv, "TOPIC %s :%s\r\n", channel, topic);
++	if (topic)
++                tcp_sendf (serv, "TOPIC %s :%s\r\n", channel, topic);
+ 	else
+-		tcp_sendf (serv, "TOPIC %s\r\n", channel);
++		tcp_sendf (serv, "TOPIC %s :\r\n", channel);
+ }
+ 
+ static void
+ irc_list_channels (server *serv, char *arg, int min_users)
+ {
+-	if (arg[0])
++	if (arg)
+ 	{
+ 		tcp_sendf (serv, "LIST %s\r\n", arg);
+ 		return;
+--
+cgit v0.8.3.1

Added: packages/unstable/xchat-gnome/debian/patches/07_crasher_null_fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/07_crasher_null_fix.patch?rev=25465&op=file
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/07_crasher_null_fix.patch (added)
+++ packages/unstable/xchat-gnome/debian/patches/07_crasher_null_fix.patch [utf-8] Sun Oct 31 10:09:26 2010
@@ -1,0 +1,22 @@
+From ac131cab5e5429525aed592b504bae9d6ee92069 Mon Sep 17 00:00:00 2001
+From: Ritesh Khadgaray <khadgaray at gmail.com>
+Date: Fri, 15 Jan 2010 07:37:40 +0000
+Subject: Bug 592491 -  xchat-gnome crashed with SIGSEGV in handle_command(
+
+fixed a regression. Was unable to set status "back".
+---
+diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
+index a47f710..cc13892 100644
+--- a/src/common/proto-irc.c
++++ b/src/common/proto-irc.c
+@@ -114,7 +114,7 @@ irc_quit (server *serv, char *reason)
+ static void
+ irc_set_back (server *serv)
+ {
+-	tcp_send_len (serv, "BACK\r\n", 6);
++	tcp_send_len (serv, "AWAY\r\n", 6);
+ }
+ 
+ static void
+--
+cgit v0.8.3.1

Added: packages/unstable/xchat-gnome/debian/patches/08_dcc_transfers.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/08_dcc_transfers.patch?rev=25465&op=file
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/08_dcc_transfers.patch (added)
+++ packages/unstable/xchat-gnome/debian/patches/08_dcc_transfers.patch [utf-8] Sun Oct 31 10:09:26 2010
@@ -1,0 +1,46 @@
+From 3982672d0bfda9a6f8ad6b2109ddf03a3dd92688 Mon Sep 17 00:00:00 2001
+From: Adam Buchbinder <adam.buchbinder at gmail.com>
+Date: Thu, 14 Jan 2010 12:54:07 +0000
+Subject: Bug 599781 -  DCC transfers always time out by default.
+
+On a fresh install of xchat-gnome (no ~/.xchat2 directory), requesting a file
+via XDCC fails. This is because xchat-gnome sets the preference dcc_auto_send
+to 2 by default; when the setting is set manually, it's set to 1.
+("dcc_auto_send" is a misnomer; it should be called "dcc_auto_receive".)
+However, when autoreceive is disabled, it's set to 0, not 2. To sum up:
+
+dcc_auto_send = 0 -> ("No") File is added to the receive window in "waiting"
+state. (Can hit a button to start it.)
+dcc_auto_send = 1 -> ("Yes") File is added to the receive window in "active"
+state, starts downloading.
+dcc_auto_send = 2 -> ("Browse for save folder every time") File is added to the
+receive window in "waiting" state, save-as dialog pops up.
+---
+diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
+index bca068f..6c70727 100644
+--- a/src/common/cfgfiles.c
++++ b/src/common/cfgfiles.c
+@@ -679,7 +679,7 @@ load_config (void)
+ 	prefs.bantype = 2;
+ 	prefs.input_flash_priv = prefs.input_flash_hilight = 1;
+ 	prefs.input_tray_priv = prefs.input_tray_hilight = 1;
+-	prefs.autodccsend = 2;	/* browse mode */
++	prefs.autodccsend = 0;	/* disable auto send */
+ #ifdef WIN32
+ 	prefs.identd = 1;
+ #endif
+diff --git a/src/fe-gnome/dcc-window.c b/src/fe-gnome/dcc-window.c
+index 463a974..92f2026 100644
+--- a/src/fe-gnome/dcc-window.c
++++ b/src/fe-gnome/dcc-window.c
+@@ -207,7 +207,7 @@ dcc_window_add (DccWindow *window, struct DCC *dcc)
+ 
+ 	/* If this is a recieve and auto-accept isn't turned on, pop up a
+ 	 * confirmation dialog */
+-	if ((dcc->type == TYPE_RECV) && (dcc->dccstat == STAT_QUEUED) && (prefs.autodccsend == FALSE)) {
++	if ((dcc->type == TYPE_RECV) && (dcc->dccstat == STAT_QUEUED) && (prefs.autodccsend != 1)) {
+ 		GtkWidget *dialog;
+ 		gint response;
+ 
+--
+cgit v0.8.3.1

More information about the pkg-gnome-commits mailing list