2004-09-27 [colin] 0.9.12cvs105.1

	* src/folderview.c
		Sync with HEAD (right-align new and unread column)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 327ed45b1d62a540049b968f800784b35e2679e1..badf27e153eb2be24664487ba3187642d4ce0be6 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-09-27 [colin]     0.9.12cvs105.1
+
+       * src/folderview.c
+               Sync with HEAD (right-align new and unread column)
+
 2004-09-27 [colin]     0.9.12cvs104.1
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index 3271c252db367190fdb9a0c710c23d07f5c62dd1..a6dd6511884c5f43d8dab048ce98afb5d551f681 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -176,3 +176,4 @@
 ( cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/spamassassin/libspamc.c; cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/spamassassin/libspamc.h; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/plugins/spamassassin/utils.c; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/plugins/spamassassin/utils.h; ) > 0.9.12cvs103.1.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/wizard.c; ) > 0.9.12cvs103.2.patchset
 ( cvs diff -u -r 1.115.2.18 -r 1.115.2.19 src/main.c; ) > 0.9.12cvs104.1.patchset
+( cvs diff -u -r 1.207.2.14 -r 1.207.2.15 src/folderview.c; ) > 0.9.12cvs105.1.patchset

diff --git a/configure.ac b/configure.ac
index b77abb7e41572876aefa98354da70cf31129b1cf..d89f7cb971073b15231d5497f7825b8a3f637548 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=104
+EXTRA_VERSION=105
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/folderview.c b/src/folderview.c
index ef8161e82291f4c28ca24bc6a7b302b69060465d..3a1301a9744c40a64d5ece74cfaac6d59bc6693a 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -328,12 +328,10 @@ FolderView *folderview_create(void)
        
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
-#ifndef CLAWS /* text instead of pixmaps */
        gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_NEW,
                                           GTK_JUSTIFY_RIGHT);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_UNREAD,
                                           GTK_JUSTIFY_RIGHT);
-#endif                                    
        gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_TOTAL,
                                           GTK_JUSTIFY_RIGHT);
        gtk_clist_set_column_width(GTK_CLIST(ctree), COL_FOLDER,
@@ -467,8 +465,10 @@ void folderview_init(FolderView *folderview)
        hbox_unread = gtk_hbox_new(FALSE, 4);
 
        /* left justified */
-       gtk_box_pack_start(GTK_BOX(hbox_new),label_new,FALSE,FALSE,0);
-       gtk_box_pack_start(GTK_BOX(hbox_unread),label_unread,FALSE,FALSE,0);
+       gtk_box_pack_start(GTK_BOX(hbox_new), label_new, TRUE, TRUE, 0);
+       gtk_misc_set_alignment (GTK_MISC (label_new), 1, 0.5);
+       gtk_box_pack_start(GTK_BOX(hbox_unread), label_unread, TRUE, TRUE, 0);
+       gtk_misc_set_alignment (GTK_MISC (label_unread), 1, 0.5);
 
        gtk_widget_show_all(hbox_new);
        gtk_widget_show_all(hbox_unread);