[Commits] summaryview.c 1.395.2.463 1.395.2.464

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv15386/src

Modified Files:
      Tag: gtk2
	summaryview.c 
Log Message:
2013-03-13 [colin]	3.9.0cvs118

	* src/summaryview.c
		Fix w32 build where apparently 'small' is a reserved
		word
	* src/plugins/perl/tools/Makefile.am
		Fix out-of-tree build

Index: summaryview.c
===================================================================
RCS file: /home/claws-mail/claws/src/summaryview.c,v
retrieving revision 1.395.2.463
retrieving revision 1.395.2.464
diff -u -d -r1.395.2.463 -r1.395.2.464
--- summaryview.c	9 Mar 2013 01:20:47 -0000	1.395.2.463
+++ summaryview.c	13 Mar 2013 11:26:39 -0000	1.395.2.464
@@ -3050,8 +3050,8 @@
 	gint *col_pos = summaryview->col_pos;
 	const gchar *msgid = msginfo->msgid;
 	GHashTable *msgid_table = summaryview->msgid_table;
-	gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-	gboolean small = (prefs_common.layout_mode == SMALL_LAYOUT);
+	gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+	gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
 
 	summary_set_header(summaryview, text, msginfo);
 
@@ -3077,7 +3077,7 @@
 	if (summaryview->col_state[summaryview->col_pos[S_COL_TAGS]].visible)
 		SET_TEXT(S_COL_TAGS);
 
-	if ((vert || small) && prefs_common.two_line_vert)
+	if ((vert_layout || small_layout) && prefs_common.two_line_vert)
 		g_free(text[summaryview->col_pos[S_COL_SUBJECT]]);
 
 #undef SET_TEXT
@@ -3100,8 +3100,8 @@
 	GHashTable *msgid_table;
 	GHashTable *subject_table = NULL;
 	GSList * cur;
-	gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-	gboolean small = (prefs_common.layout_mode == SMALL_LAYOUT);
+	gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+	gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
 	START_TIMING("");
 	
 	if (!mlist) return;
@@ -3161,7 +3161,7 @@
 				(ctree, NULL, node, text, 2,
 				 NULL, NULL,
 				 FALSE, FALSE);
-			if ((vert || small) && prefs_common.two_line_vert)
+			if ((vert_layout || small_layout) && prefs_common.two_line_vert)
 				g_free(text[summaryview->col_pos[S_COL_SUBJECT]]);
 
 			GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
@@ -3259,8 +3259,8 @@
 	gint *col_pos = summaryview->col_pos;
 	gchar *from_text = NULL, *to_text = NULL, *tags_text = NULL;
 	gboolean should_swap = FALSE;
-	gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-	gboolean small = (prefs_common.layout_mode == SMALL_LAYOUT);
+	gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+	gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
 	static const gchar *color_dim_rgb = NULL;
 	if (!color_dim_rgb)
 		color_dim_rgb = gdk_color_to_string(&summaryview->color_dim);
@@ -3304,7 +3304,7 @@
 
 	/* slow! */
 	if (summaryview->col_state[summaryview->col_pos[S_COL_DATE]].visible || 
-	    ((vert || small) && prefs_common.two_line_vert)) {
+	    ((vert_layout || small_layout) && prefs_common.two_line_vert)) {
 		if (msginfo->date_t && msginfo->date_t > 0) {
 			procheader_date_get_localtime(date_modified,
 						      sizeof(date_modified),
@@ -3397,7 +3397,7 @@
 #endif
 		text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
 			_("(No Subject)");
-	if ((vert || small) && prefs_common.two_line_vert) {
+	if ((vert_layout || small_layout) && prefs_common.two_line_vert) {
 		if (!FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) {
 			gchar *tmp = g_markup_printf_escaped(_("%s\n<span color='%s' style='italic'>From: %s, on %s</span>"),
 					text[col_pos[S_COL_SUBJECT]],
@@ -6343,8 +6343,8 @@
 	gchar *formatted = NULL;
 	MsgInfo *info = NULL;
 	GdkRectangle rect;
-	gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-	gboolean small = (prefs_common.layout_mode == SMALL_LAYOUT);
+	gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+	gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
 	if (!prefs_common.show_tooltips)
 		return FALSE;
 
@@ -6382,7 +6382,7 @@
 	formatted = g_strdup(text);
 	g_strstrip(formatted);
 
-	if ((vert || small) && prefs_common.two_line_vert)
+	if ((vert_layout || small_layout) && prefs_common.two_line_vert)
 		gtk_tooltip_set_markup (tooltip, formatted);
 	else 
 	                gtk_tooltip_set_text (tooltip, formatted);
@@ -6405,8 +6405,8 @@
 	gchar *titles[N_SUMMARY_COLS];
 	SummaryColumnType type;
 	gint pos;
-	gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-	gboolean small = (prefs_common.layout_mode == SMALL_LAYOUT);
+	gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+	gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
 	memset(titles, 0, sizeof(titles));
 
 	col_state = prefs_summary_column_get_config();
@@ -6482,7 +6482,7 @@
 				       FALSE);
 		if (((pos == summaryview->col_pos[S_COL_FROM] && !FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
 		     (pos == summaryview->col_pos[S_COL_TO] && FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
-		     pos == summaryview->col_pos[S_COL_DATE]) && (vert || small) &&
+		     pos == summaryview->col_pos[S_COL_DATE]) && (vert_layout || small_layout) &&
 			    prefs_common.two_line_vert)
 			gtk_cmclist_set_column_visibility
 				(GTK_CMCLIST(ctree), pos, FALSE);
@@ -6491,7 +6491,7 @@
 				(GTK_CMCLIST(ctree), pos, col_state[pos].visible);
 	}
 	if (prefs_common.two_line_vert)
-		gtk_sctree_set_use_markup(GTK_SCTREE(ctree), summaryview->col_pos[S_COL_SUBJECT], vert||small);
+		gtk_sctree_set_use_markup(GTK_SCTREE(ctree), summaryview->col_pos[S_COL_SUBJECT], vert_layout||small_layout);
 
 	/* connect signal to the buttons for sorting */
 #define CLIST_BUTTON_SIGNAL_CONNECT(col, func) \