2005-11-18 [paul] 1.9.100cvs19
authorPaul Mangan <paul@claws-mail.org>
Fri, 18 Nov 2005 11:22:23 +0000 (11:22 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 18 Nov 2005 11:22:23 +0000 (11:22 +0000)
* src/compose.c
cosmetic improvements
* src/textview.c
also list text/* attachments

ChangeLog
PATCHSETS
configure.ac
src/compose.c
src/textview.c

index 710c111..fafb165 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-18 [paul]      1.9.100cvs19
+
+       * src/compose.c
+               cosmetic improvements
+       * src/textview.c
+               also list text/* attachments
+
 2005-11-18 [cleroy]    1.9.100cvs18
 
        * src/summaryview.c
index 41ccf16..e0a66f0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( ) > 1.9.100cvs16.patchset
 ( cvs diff -u -r 1.2.2.12 -r 1.2.2.13 src/gtk/inputdialog.c;  ) > 1.9.100cvs17.patchset
 ( cvs diff -u -r 1.395.2.148 -r 1.395.2.149 src/summaryview.c;  ) > 1.9.100cvs18.patchset
+( cvs diff -u -r 1.382.2.193 -r 1.382.2.194 src/compose.c;  cvs diff -u -r 1.96.2.84 -r 1.96.2.85 src/textview.c;  ) > 1.9.100cvs19.patchset
index bab839d..ad58b25 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=18
+EXTRA_VERSION=19
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index ecb03c0..7af4bb1 100644 (file)
@@ -3473,11 +3473,8 @@ static void compose_set_title(Compose *compose)
        if (subject && strlen(subject))
                str = g_strdup_printf(_("%s - Compose message%s"),
                                      subject, edited); 
-       else if (compose->account && compose->account->address)
-               str = g_strdup_printf(_("%s - Compose message%s"),
-                                     compose->account->address, edited);
        else
-               str = g_strdup_printf(_("Compose message%s"), edited);
+               str = g_strdup_printf(_("[no subject] - Compose message%s"), edited);
        gtk_window_set_title(GTK_WINDOW(compose->window), str);
        g_free(str);
        g_free(subject);
@@ -5336,7 +5333,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 
        vbox2 = gtk_vbox_new(FALSE, 2);
        gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
-       gtk_container_set_border_width(GTK_CONTAINER(vbox2), BORDER_WIDTH);
+       gtk_container_set_border_width(GTK_CONTAINER(vbox2), 0);
        
        /* Notebook */
        notebook = gtk_notebook_new();
@@ -5355,20 +5352,20 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        gtk_widget_show(subject_hbox);
 
        subject_frame = gtk_frame_new(NULL);
-       gtk_frame_set_shadow_type(GTK_FRAME(subject_frame), GTK_SHADOW_OUT);
-       gtk_box_pack_start(GTK_BOX(subject_hbox), subject_frame, TRUE, TRUE, BORDER_WIDTH+1);
+       gtk_frame_set_shadow_type(GTK_FRAME(subject_frame), GTK_SHADOW_NONE);
+       gtk_box_pack_start(GTK_BOX(subject_hbox), subject_frame, TRUE, TRUE, 0);
        gtk_widget_show(subject_frame);
 
        subject = gtk_hbox_new(FALSE, 0);
-       gtk_container_set_border_width(GTK_CONTAINER(subject), BORDER_WIDTH);
+       gtk_container_set_border_width(GTK_CONTAINER(subject), 0);
        gtk_widget_show(subject);
 
        label = gtk_label_new(_("Subject:"));
-       gtk_box_pack_start(GTK_BOX(subject), label, FALSE, FALSE, 4);
+       gtk_box_pack_start(GTK_BOX(subject), label, FALSE, FALSE, 0);
        gtk_widget_show(label);
 
        subject_entry = gtk_entry_new();
-       gtk_box_pack_start(GTK_BOX(subject), subject_entry, TRUE, TRUE, 2);
+       gtk_box_pack_start(GTK_BOX(subject), subject_entry, TRUE, TRUE, 0);
        g_signal_connect_after(G_OBJECT(subject_entry), "grab_focus",
                         G_CALLBACK(compose_grab_focus_cb), compose);
        gtk_widget_show(subject_entry);
index a19a1f3..3597cbe 100644 (file)
@@ -567,7 +567,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 
        g_free(content_type);                      
 
-       if (mimeinfo->type != MIMETYPE_TEXT) {
+       if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT) {
                gtk_text_buffer_insert(buffer, &iter, buf, -1);
                if (mimeinfo->type == MIMETYPE_IMAGE  &&
                    prefs_common.inline_img ) {