From: Colin Leroy <colin@colino.net>
Date: Mon, 19 Jul 2004 19:54:29 +0000 (+0000)
Subject: action output fix
X-Git-Tag: gtk2_win32_last_merge~308
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=5759e1f0463e1edfc7cae2674e622aed6e8031b2

action output fix
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 8f48e23bd..eaa1abe3d 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-07-19 [colin]	0.9.12cvs33.5
+
+	* src/action.c
+		Action output fix
+		Patch by Alfons
+
 2004-07-19 [colin]	0.9.12cvs33.4
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
index 77628e864..5acb915b1 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -58,3 +58,4 @@
 ( cvs diff -u -r 1.94.2.21 -r 1.94.2.22 src/messageview.c; cvs diff -u -r 1.96.2.13 -r 1.96.2.14 src/textview.c; ) > 0.9.12cvs33.2.patchset
 ( cvs diff -u -r 1.5 -r 1.6 src/statusbar.c; ) > 0.9.12cvs33.3.patchset
 ( cvs diff -u -r 1.382.2.28 -r 1.382.2.29 src/compose.c; cvs diff -u -r 1.65.2.7 -r 1.65.2.8 src/codeconv.c; ) > 0.9.12cvs33.4.patchset
+( cvs diff -u -r 1.12.2.7 -r 1.12.2.8 src/action.c; ) > 0.9.12cvs33.5.patchset
diff --git a/configure.ac b/configure.ac
index 02468f0da..f2d1fad44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=33
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.4
+EXTRA_GTK2_VERSION=.5
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
diff --git a/src/action.c b/src/action.c
index dc1090559..2a00e1832 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1072,14 +1072,13 @@ static void update_io_dialog(Children *children)
 		ChildInfo *child_info;
 		GtkTextBuffer *textbuf;
 		GtkTextIter iter, start_iter, end_iter;
-		GdkFont *font;
 
-		font = g_object_get_data(G_OBJECT(children->dialog), 
-					 "s_txtfont");
 		gtk_widget_show(children->scrolledwin);
-		textbuf = gtk_text_view_get_buffer (GTK_TEXT_VIEW(text));
-		gtk_text_buffer_get_start_iter (textbuf, &start_iter);
-		gtk_text_buffer_get_end_iter (textbuf, &end_iter);
+		textbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+		gtk_text_buffer_get_start_iter(textbuf, &start_iter);
+		gtk_text_buffer_get_end_iter(textbuf, &end_iter);
+		gtk_text_buffer_delete(textbuf, &start_iter, &end_iter);
+		gtk_text_buffer_get_start_iter(textbuf, &start_iter);
 		iter = start_iter;
 		for (cur = children->list; cur; cur = cur->next) {
 			child_info = (ChildInfo *)cur->data;
@@ -1116,7 +1115,7 @@ static void create_io_dialog(Children *children)
 	GtkWidget *progress_bar = NULL;
 	GtkWidget *abort_button;
 	GtkWidget *close_button;
-	GdkFont   *output_font;
+	PangoFontDescription *text_font;
 
 	debug_print("Creating action IO dialog\n");
 
@@ -1150,6 +1149,13 @@ static void create_io_dialog(Children *children)
 	gtk_widget_hide(scrolledwin);
 
 	text = gtk_text_view_new();
+	if (prefs_common.textfont) {
+		if (NULL != (text_font = pango_font_description_from_string
+				(prefs_common.textfont))) {
+			gtk_widget_modify_font(text, text_font);
+			pango_font_description_free(text_font);
+		}			
+	}			
 	gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
 	gtk_container_add(GTK_CONTAINER(scrolledwin), text);
 	gtk_widget_show(text);