commit 9b045e6ffedb91981956d698e95edaa7868448d6
parent 582f953c893becc531188bde506d2b4c33890270
Author: Colin Leroy <colin@colino.net>
Date: Wed, 13 Mar 2013 11:26:39 +0000
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
Diffstat:
5 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+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
+
2013-03-13 [mones] 3.9.0cvs117
* INSTALL
diff --git a/PATCHSETS b/PATCHSETS
@@ -4615,3 +4615,4 @@
( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/fancy/fancy_prefs.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/fancy/fancy_prefs.h; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/fancy/fancy_viewer.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/fancy/fancy_viewer.h; ) > 3.9.0cvs115.patchset
( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/fancy/Makefile.am; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/fancy/fancy_viewer.c; ) > 3.9.0cvs116.patchset
( cvs diff -u -r 1.29.2.15 -r 1.29.2.16 INSTALL; cvs diff -u -r 1.8.2.69 -r 1.8.2.70 README; ) > 3.9.0cvs117.patchset
+( cvs diff -u -r 1.395.2.463 -r 1.395.2.464 src/summaryview.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/perl/tools/Makefile.am; ) > 3.9.0cvs118.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=117
+EXTRA_VERSION=118
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/plugins/perl/tools/Makefile.am b/src/plugins/perl/tools/Makefile.am
@@ -7,4 +7,21 @@ EXTRA_DIST = \
MAKE_EXE = chmod u+x $(EXTRA_TOOLS)
all-local:
- $(MAKE_EXE)
-\ No newline at end of file
+ for file in $(EXTRA_TOOLS); do \
+ if [ ! -e ${top_builddir}/src/plugins/perl/tools/$$file ]; then \
+ todir=${top_builddir}/src/plugins/perl/tools; \
+ dir=$$(dirname $$file); \
+ if [ ! $$dir = . ]; then \
+ todir=$$todir/$$dir; \
+ fi; \
+ cp ${top_srcdir}/src/plugins/perl/tools/$$file $$todir; \
+ fi; \
+ done;
+ $(MAKE_EXE)
+
+distclean-local:
+ if [ ! ${top_builddir} = ${top_srcdir} ]; then \
+ for file in $(EXTRA_TOOLS); do \
+ rm -f $$file; \
+ done; \
+ fi
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -3050,8 +3050,8 @@ static gboolean summary_insert_gnode_func(GtkCMCTree *ctree, guint depth, GNode
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 @@ static gboolean summary_insert_gnode_func(GtkCMCTree *ctree, guint depth, GNode
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 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
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 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
(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 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
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 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
/* 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 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
#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 @@ static gboolean tooltip_cb (GtkWidget *widget,
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 @@ static gboolean tooltip_cb (GtkWidget *widget,
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 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
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 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
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 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
(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) \
