action output fix
authorColin Leroy <colin@colino.net>
Mon, 19 Jul 2004 19:54:29 +0000 (19:54 +0000)
committerColin Leroy <colin@colino.net>
Mon, 19 Jul 2004 19:54:29 +0000 (19:54 +0000)
ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/action.c

index 8f48e23bd389cb5dcc7fa0323c8e488f66ecebe8..eaa1abe3da7f2be6b24c1ec0f4580c5cbc15ead0 100644 (file)
@@ -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
index 77628e86430e14b3284fbaa1afb417c0e70a53cc..5acb915b1e71fa7a64d65c18edb63d13280469b4 100644 (file)
--- 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
index 02468f0da48fb925caaf52da13fb6cc388c7fef8..f2d1fad442520f2877b8249e91924099751d757b 100644 (file)
@@ -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}
index dc1090559bc71816c98d0f253c913690fd679245..2a00e183293869334ec82a3217853b29ab2a1b3f 100644 (file)
@@ -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);