2005-09-02 [paul] 1.9.13cvs79

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index fef63274a3adc161b6fe6d876fff19e0b8b83c96..51d50ed2a6933aaa89d88861dda693a3574ac15b 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -239,7 +239,7 @@ static void compose_attach_append           (Compose        *compose,
 static void compose_attach_parts               (Compose        *compose,
                                                 MsgInfo        *msginfo);
 
-static void compose_wrap_paragraph             (Compose        *compose,
+static void compose_beautify_paragraph         (Compose        *compose,
                                                 GtkTextIter    *par_iter,
                                                 gboolean        force);
 static void compose_wrap_all                   (Compose        *compose);
@@ -1710,15 +1710,8 @@ void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
                                        (prefs_common.color_new, &bold_color);
                                bold_style = gtk_style_copy(gtk_widget_get_style
                                        (GTK_WIDGET(entry)));
-                               if (BOLD_FONT)
-                                       font_desc = pango_font_description_from_string
-                                                       (BOLD_FONT);
-                               if (font_desc) {
-                                       if (bold_style->font_desc)
-                                               pango_font_description_free
-                                                       (bold_style->font_desc);
-                                       bold_style->font_desc = font_desc;
-                               }
+                               pango_font_description_set_weight
+                                       (bold_style->font_desc, PANGO_WEIGHT_BOLD);
                                bold_style->fg[GTK_STATE_NORMAL] = bold_color;
                        }
                        gtk_widget_set_style(GTK_WIDGET(entry), bold_style);
@@ -1756,7 +1749,7 @@ void compose_toolbar_cb(gint action, gpointer data)
                compose_ext_editor_cb(compose, 0, NULL);
                break;
        case A_LINEWRAP_CURRENT:
-               compose_wrap_paragraph(compose, NULL, TRUE);
+               compose_beautify_paragraph(compose, NULL, TRUE);
                break;
        case A_LINEWRAP_ALL:
                compose_wrap_all_full(compose, TRUE);
@@ -3019,7 +3012,7 @@ static gboolean compose_join_next_line(Compose *compose,
                g_warning("alloc error scanning URIs\n"); \
        }
 
-static void compose_wrap_paragraph(Compose *compose, GtkTextIter *par_iter, gboolean force)
+static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter, gboolean force)
 {
        GtkTextView *text = GTK_TEXT_VIEW(compose->text);
        GtkTextBuffer *buffer;
@@ -3108,7 +3101,7 @@ static void compose_wrap_paragraph(Compose *compose, GtkTextIter *par_iter, gboo
                                }
                                goto colorize;
                        }
-                       debug_print("compose_wrap_paragraph(): quote_str = '%s'\n", quote_str);
+                       debug_print("compose_beautify_paragraph(): quote_str = '%s'\n", quote_str);
                        startq_offset = gtk_text_iter_get_offset(&iter);
                } else {
                        if (startq_offset == -1)
@@ -3264,7 +3257,7 @@ static void compose_wrap_all_full(Compose *compose, gboolean force)
 
        gtk_text_buffer_get_start_iter(buffer, &iter);
        while (!gtk_text_iter_is_end(&iter))
-               compose_wrap_paragraph(compose, &iter, force);
+               compose_beautify_paragraph(compose, &iter, force);
 
        undo_unblock(compose->undostruct);
 }
@@ -7255,7 +7248,7 @@ static void compose_wrap_cb(gpointer data, guint action, GtkWidget *widget)
        if (action == 1)
                compose_wrap_all_full(compose, TRUE);
        else
-               compose_wrap_paragraph(compose, NULL, TRUE);
+               compose_beautify_paragraph(compose, NULL, TRUE);
 }
 
 static void compose_toggle_autowrap_cb(gpointer data, guint action,
@@ -7535,8 +7528,7 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
 
        mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
        
-/*     compose_wrap_all_full(compose, FALSE); */
-       compose_wrap_paragraph(compose, iter, FALSE);
+       compose_beautify_paragraph(compose, iter, FALSE);
 
        gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
        gtk_text_buffer_delete_mark(buffer, mark);