[patch] sylpheed-claws-1.9.11-no_new_messages_count_in_folder_view.patch

sylpheed-claws-1.9.11-no_new_messages_count_in_folder_view.patch (text/plain), 4.58 KB, created by Anthony Gorecki on 2005-05-26 19:04:31 UTC

--- src/folderview.c	2005-05-14 22:46:33.000000000 -0700
+++ src/folderview_new.c	2005-05-26 18:15:35.000000000 -0700
@@ -67,12 +67,11 @@
 typedef enum
 {
 	COL_FOLDER	= 0,
-	COL_NEW		= 1,
-	COL_UNREAD	= 2,
-	COL_TOTAL	= 3
+	COL_UNREAD	= 1,
+	COL_TOTAL	= 2
 } FolderColumnPos;
 
-#define N_FOLDER_COLS		4
+#define N_FOLDER_COLS		3
 #define COL_FOLDER_WIDTH	150
 #define COL_NUM_WIDTH		32
 
@@ -124,8 +123,6 @@
 static GdkBitmap *queueopenxpmmask;
 static GdkPixmap *queueopenhrmxpm;
 static GdkBitmap *queueopenhrmxpmmask;
-static GdkPixmap *newxpm;
-static GdkBitmap *newxpmmask;
 static GdkPixmap *unreadxpm;
 static GdkBitmap *unreadxpmmask;
 static GdkPixmap *readxpm;
@@ -324,7 +321,6 @@
 	folderview = g_new0(FolderView, 1);
 
 	titles[COL_FOLDER] = _("Folder");
-	titles[COL_NEW]    = _("New");
 	titles[COL_UNREAD] = _("Unread");
 	titles[COL_TOTAL]  = _("#");
 
@@ -341,16 +337,12 @@
 	
 	gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
 	gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
-	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);
 	gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_TOTAL,
 					   GTK_JUSTIFY_RIGHT);
 	gtk_clist_set_column_width(GTK_CLIST(ctree), COL_FOLDER,
 				   prefs_common.folder_col_folder);
-	gtk_clist_set_column_width(GTK_CLIST(ctree), COL_NEW,
-				   prefs_common.folder_col_new);
 	gtk_clist_set_column_width(GTK_CLIST(ctree), COL_UNREAD,	
 				   prefs_common.folder_col_unread);
 	gtk_clist_set_column_width(GTK_CLIST(ctree), COL_TOTAL,
@@ -435,10 +427,8 @@
 void folderview_init(FolderView *folderview)
 {
 	GtkWidget *ctree = folderview->ctree;
-	GtkWidget *label_new;
 	GtkWidget *label_unread;
 	GtkWidget *label_total;
-	GtkWidget *hbox_new;
 	GtkWidget *hbox_unread;
 	GtkWidget *hbox_total;
 		
@@ -468,34 +458,26 @@
 
 	/* CLAWS: titles for "New" and "Unread" show new & unread pixmaps
 	 * instead text (text overflows making them unreadable and ugly) */
-        stock_pixmap_gdk(ctree, STOCK_PIXMAP_NEW,
-			 &newxpm, &newxpmmask);
 	stock_pixmap_gdk(ctree, STOCK_PIXMAP_UNREAD,
 			 &unreadxpm, &unreadxpmmask);
 	stock_pixmap_gdk(ctree, STOCK_PIXMAP_READ,
 			 &readxpm, &readxpmmask);
 		
-	label_new = gtk_pixmap_new(newxpm, newxpmmask);
 	label_unread = gtk_pixmap_new(unreadxpm, unreadxpmmask);
 	label_total = gtk_pixmap_new(readxpm, readxpmmask);
 
-	hbox_new = gtk_hbox_new(FALSE, 4);
 	hbox_unread = gtk_hbox_new(FALSE, 4);
 	hbox_total = gtk_hbox_new(FALSE, 4);
 
 	/* left justified */
-	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_box_pack_start(GTK_BOX(hbox_total), label_total, TRUE, TRUE, 0);
 	gtk_misc_set_alignment (GTK_MISC (label_total), 1, 0.5);
 
-	gtk_widget_show_all(hbox_new);
 	gtk_widget_show_all(hbox_unread);
 	gtk_widget_show_all(hbox_total);
 
-	gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_NEW,hbox_new);
 	gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_UNREAD,hbox_unread);
 	gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_TOTAL,hbox_total);
 			
@@ -673,18 +655,16 @@
 	GtkCTree *ctree = GTK_CTREE(folderview->ctree);
 	static GtkCTreeNode *prev_row = NULL;
 	FolderItem *item;
-	gint new, unread, total;
-	gchar *new_str, *unread_str, *total_str;
+	gint unread, total;
+	gchar *unread_str, *total_str;
 
 	if (!row) return;
 
 	item = gtk_ctree_node_get_row_data(ctree, row);
 	if (!item) return;
 
-	gtk_ctree_node_get_text(ctree, row, COL_NEW, &new_str);
 	gtk_ctree_node_get_text(ctree, row, COL_UNREAD, &unread_str);
 	gtk_ctree_node_get_text(ctree, row, COL_TOTAL, &total_str);
-	new = atoi(new_str);
 	unread = atoi(unread_str);
 	total = atoi(total_str);
 
@@ -1150,11 +1130,9 @@
 	g_free(name);
 
 	if (!folder_item_parent(item)) {
-		gtk_ctree_node_set_text(ctree, node, COL_NEW,    "-");
 		gtk_ctree_node_set_text(ctree, node, COL_UNREAD, "-");
 		gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  "-");
 	} else {
-		gtk_ctree_node_set_text(ctree, node, COL_NEW,    itos(item->new_msgs));
 		gtk_ctree_node_set_text(ctree, node, COL_UNREAD, itos(item->unread_msgs));
 		gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  itos(item->total_msgs));
 	}
@@ -1690,9 +1668,6 @@
 	case COL_FOLDER:
 		prefs_common.folder_col_folder = width;
 		break;
-	case COL_NEW:
-		prefs_common.folder_col_new = width;
-		break;
 	case COL_UNREAD:
 		prefs_common.folder_col_unread = width;
 		break;