# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 956773648 0
# Node ID f5c3e340c5e4433a5430f34dd408b13be22a3df6
# Parent  fb9edc06ae2fda6a036970af45492ae2f7d444ff
[gaim-migrate @ 197]
A few more segfault patches by our fool named Sumner :)

committer: Tailor Script <tailor@pidgin.im>

diff -r fb9edc06ae2f -r f5c3e340c5e4 AUTHORS
--- a/AUTHORS	Wed Apr 26 17:57:09 2000 +0000
+++ b/AUTHORS	Wed Apr 26 18:27:28 2000 +0000
@@ -4,5 +4,6 @@
 Rob Flynn <rob@linuxpimps.com> - Main developer (send patches here)
 Eric Warmenhoven <warmenhoven@yahoo.com> - GNOME Applet Guy
 Syd Logan - Hacker and Designated Driver
+G. Sumner Hayes <IM: SumnerFool> - Security Fixes/Misc Bugs/and Sumnah Foo! 
 Jim Duchek <jimduchek@ou.edu> - Former Maintainer 
 Mark Spencer <markster@marko.net> - El Queso Grande
diff -r fb9edc06ae2f -r f5c3e340c5e4 doc/CREDITS
--- a/doc/CREDITS	Wed Apr 26 17:57:09 2000 +0000
+++ b/doc/CREDITS	Wed Apr 26 18:27:28 2000 +0000
@@ -6,7 +6,7 @@
 
 Rob Flynn    	  <IM: RobFlynn>		rob@linuxpimps.com
 Eric Warmenhoven  <IM: EWarmenhoven>		warmenhoven@yahoo.com
-Syd Loga
+Syd Logan
 Jim Duchek        <IM: zilding>			jimduchek@ou.edu
 Mark Spencer      <IM: markster97>		markster@marko.net
 
@@ -33,4 +33,5 @@
 David <IM: CrazyDavy>
 	The neato-bigger text box
 
+G. Sumner Hayes <IM: SumnerFool> Security Patches
 Brian Ryner for a little make file patch :)
diff -r fb9edc06ae2f -r f5c3e340c5e4 src/conversation.c
--- a/src/conversation.c	Wed Apr 26 17:57:09 2000 +0000
+++ b/src/conversation.c	Wed Apr 26 18:27:28 2000 +0000
@@ -554,7 +554,7 @@
 	if (s2)
 		pos = s2 - s + strlen(post);
 	else
-		pos=-1;
+		pos=strlen(s);
 	sprintf(debug_buff,"Setting position to %d\n",pos);
 	debug_print(debug_buff);
 	gtk_editable_set_position(GTK_EDITABLE(entry), pos);
diff -r fb9edc06ae2f -r f5c3e340c5e4 src/dialogs.c
--- a/src/dialogs.c	Wed Apr 26 17:57:09 2000 +0000
+++ b/src/dialogs.c	Wed Apr 26 18:27:28 2000 +0000
@@ -1910,6 +1910,11 @@
 
 		colordialog = gtk_color_selection_dialog_new("Select Text Color");
                 colorsel = GTK_COLOR_SELECTION_DIALOG(colordialog)->colorsel;
+		
+		/* XXX: Modality is evil, but we need it until we have
+		 * per-conversation color dialogs */
+
+		gtk_window_set_modal(GTK_WINDOW(colordialog), TRUE);
 
                 gtk_object_set_user_data(GTK_OBJECT(colorsel), entry);