# HG changeset patch
# User masneyb
# Date 1097029961 0
# Node ID 2366865be140bcfe2553615b5eea12f2c8d815d5
# Parent  7937ade77c22bcec11bedb5c0a62464b9f26af40
2004-10-5 Brian Masney <masneyb@gftp.org>

        * src/gtk/menu-items.c (dosavelog, viewlog) - make sure the entire
        log is written out when multibyte characters are used

        * src/gtk/view_dialog.c - small improvements to the way text is
        inserted in the gtk+ 2.x port

diff -r 7937ade77c22 -r 2366865be140 ChangeLog
--- a/ChangeLog	Wed Oct 06 02:07:58 2004 +0000
+++ b/ChangeLog	Wed Oct 06 02:32:41 2004 +0000
@@ -1,4 +1,10 @@
 2004-10-5 Brian Masney <masneyb@gftp.org>
+	* src/gtk/menu-items.c (dosavelog, viewlog) - make sure the entire
+	log is written out when multibyte characters are used
+
+	* src/gtk/view_dialog.c - small improvements to the way text is
+	inserted in the gtk+ 2.x port
+
 	* src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/misc-gtk.c - disable the
 	upload/download buttons whenever the user is not connected to the
 	server (closes #153374)
@@ -2939,7 +2945,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.343 2004/10/06 02:07:58 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.344 2004/10/06 02:32:41 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 7937ade77c22 -r 2366865be140 src/gtk/menu-items.c
--- a/src/gtk/menu-items.c	Wed Oct 06 02:07:58 2004 +0000
+++ b/src/gtk/menu-items.c	Wed Oct 06 02:32:41 2004 +0000
@@ -326,6 +326,10 @@
   gtk_text_buffer_get_iter_at_offset (textbuf, &iter, 0);
   gtk_text_buffer_get_iter_at_offset (textbuf, &iter2, textlen);
   txt = gtk_text_buffer_get_text (textbuf, &iter, &iter2, 0);
+
+  /* gtk_text_buffer_get_char_count() returns the number of characters,
+     not bytes. So get the number of bytes that need to be written out */
+  textlen = strlen (txt);
 #endif
   pos = txt;
 
@@ -384,6 +388,10 @@
   gtk_text_buffer_get_iter_at_offset (textbuf, &iter, 0);
   gtk_text_buffer_get_iter_at_offset (textbuf, &iter2, textlen);
   txt = gtk_text_buffer_get_text (textbuf, &iter, &iter2, 0);
+
+  /* gtk_text_buffer_get_char_count() returns the number of characters,
+     not bytes. So get the number of bytes that need to be written out */
+  textlen = strlen (txt);
 #endif
 
   ok = 1;
diff -r 7937ade77c22 -r 2366865be140 src/gtk/view_dialog.c
--- a/src/gtk/view_dialog.c	Wed Oct 06 02:07:58 2004 +0000
+++ b/src/gtk/view_dialog.c	Wed Oct 06 02:32:41 2004 +0000
@@ -255,7 +255,6 @@
 #if GTK_MAJOR_VERSION > 1
   GtkTextBuffer * textbuf;
   GtkTextIter iter;
-  guint len;
 #endif
 
   doclose = 1;
@@ -423,9 +422,8 @@
       gtk_text_insert (GTK_TEXT (view), NULL, NULL, NULL, buf, -1);
 #else
       textbuf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-      len = gtk_text_buffer_get_char_count (textbuf);
-      gtk_text_buffer_get_iter_at_offset (textbuf, &iter, len);
-      gtk_text_buffer_insert (textbuf, &iter, buf, n);
+      gtk_text_buffer_get_iter_at_offset (textbuf, &iter, -1);
+      gtk_text_buffer_insert (textbuf, &iter, buf, -1);
 #endif
     }