X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fsummaryview.c;h=8cb9ab359d0659b1b2b0d26ee34149069caaae13;hp=2259fff03e20a24e838863925199954a118538b6;hb=d8f0d3297e33121276d8c5cc3d5e721039c9970e;hpb=df96298605b2b880fc68ed5f77f364994ed8cd63

diff --git a/src/summaryview.c b/src/summaryview.c
index 2259fff03..8cb9ab359 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1768,14 +1768,16 @@ static void summary_set_column_titles(SummaryView *summaryview)
 		SORT_BY_FROM,
 		SORT_BY_DATE,
 		SORT_BY_SIZE,
-		SORT_BY_NUMBER
+		SORT_BY_NUMBER,
+		SORT_BY_SCORE,
+		SORT_BY_LOCKED
 	};
 
 	for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
 		type = summaryview->col_state[pos].type;
 
-		single_char = (type == S_COL_MIME ||
-			       type == S_COL_MARK || type == S_COL_UNREAD);
+		/* CLAWS: mime and unread are single char headers */
+		single_char = (type == S_COL_MIME || type == S_COL_UNREAD);
 		justify = (type == S_COL_NUMBER || type == S_COL_SIZE)
 			? GTK_JUSTIFY_RIGHT : GTK_JUSTIFY_LEFT;
 
@@ -1789,6 +1791,11 @@ static void summary_set_column_titles(SummaryView *summaryview)
 			else
 				title = col_label[type];
 			break;
+		/* CLAWS: dummies for mark and locked headers */	
+		case S_COL_MARK:	
+		case S_COL_LOCKED:
+			title = "";
+			break;
 		default:
 			title = gettext(col_label[type]);
 		}
@@ -1804,8 +1811,17 @@ static void summary_set_column_titles(SummaryView *summaryview)
 			continue;
 		}
 
-		hbox = gtk_hbox_new(FALSE, 4);
-		label = gtk_label_new(title);
+		/* CLAWS: changed so that locked and mark headers
+		 * show a pixmap instead of single character */
+		hbox  = gtk_hbox_new(FALSE, 4);
+		
+		if (type == S_COL_LOCKED)
+			label = gtk_pixmap_new(lockedxpm, lockedxpmmask);
+		else if (type == S_COL_MARK) 
+			label = gtk_pixmap_new(markxpm, markxpmmask);
+		else 
+			label = gtk_label_new(title);
+		
 		if (justify == GTK_JUSTIFY_RIGHT)
 			gtk_box_pack_end(GTK_BOX(hbox), label,
 					 FALSE, FALSE, 0);