changeset 8123:0dc9fffb1e28

[gaim-migrate @ 8827] Fixen mes compil warnigsen committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Fri, 16 Jan 2004 13:36:45 +0000
parents 36674144c510
children 7ce787f82203
files src/gtkconv.c src/gtkimhtml.c src/util.c
diffstat 3 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkconv.c	Fri Jan 16 10:27:49 2004 +0000
+++ b/src/gtkconv.c	Fri Jan 16 13:36:45 2004 +0000
@@ -3704,7 +3704,11 @@
 	gtk_box_pack_start(GTK_BOX(vbox), gtkconv->toolbar.toolbar,
 					   FALSE, FALSE, 0);
 
-	/* Setup the entry widget. */
+	/* Setup the entry widget.
+	 * We never show the horizontal scrollbar because it was causing weird
+	 * lockups when typing text just as you type the character that would 
+	 * cause both scrollbars to appear.  Definitely seems like a gtk bug.
+	 */
 	sw = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
 								   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
@@ -3804,7 +3808,11 @@
 	gtk_box_pack_start(GTK_BOX(vbox2), gtkconv->toolbar.toolbar,
 					   FALSE, FALSE, 0);
 
-	/* Setup the entry widget. */
+	/* Setup the entry widget.
+	 * We never show the horizontal scrollbar because it was causing weird
+	 * lockups when typing text just as you type the character that would 
+	 * cause both scrollbars to appear.  Definitely seems like a gtk bug.
+	 */
 	sw = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
 								   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
--- a/src/gtkimhtml.c	Fri Jan 16 10:27:49 2004 +0000
+++ b/src/gtkimhtml.c	Fri Jan 16 13:36:45 2004 +0000
@@ -433,7 +433,7 @@
 	guint16 c;
 	GtkIMHtml *imhtml = data;
 
-	if (!gtk_text_view_get_editable(imhtml))
+	if (!gtk_text_view_get_editable(GTK_TEXT_VIEW(imhtml)))
 		return;
 
 	if (selection_data->length < 0) {
--- a/src/util.c	Fri Jan 16 10:27:49 2004 +0000
+++ b/src/util.c	Fri Jan 16 13:36:45 2004 +0000
@@ -254,7 +254,7 @@
 	int i;
 
 	n = new = g_malloc(strlen (str) + 1);
-	end = str + strlen(str);
+	end = (char *)str + strlen(str);
 
 	for (p = (char *)str; p < end; p++, n++) {
 		if (*p == '=') {