* src/summaryview.c
Little optimisations + bugfix
* src/toolbar.c
Remove default useless items - useless being defined
by the default relevant prefs
* src/wizard.c
include config.h to make gettext work
* src/prefs_themes.c
Fix selection of current theme in prefs
+2005-10-06 [colin] 1.9.15cvs17
+
+ * src/summaryview.c
+ Little optimisations + bugfix
+ * src/toolbar.c
+ Remove default useless items - useless being defined
+ by the default relevant prefs
+ * src/wizard.c
+ include config.h to make gettext work
+ * src/prefs_themes.c
+ Fix selection of current theme in prefs
+
2005-10-06 [colin] 1.9.15cvs16
* src/prefs_common.c
2005-10-06 [colin] 1.9.15cvs16
* src/prefs_common.c
( cvs diff -u -r 1.213.2.61 -r 1.213.2.62 src/folder.c; cvs diff -u -r 1.87.2.20 -r 1.87.2.21 src/folder.h; cvs diff -u -r 1.207.2.67 -r 1.207.2.68 src/folderview.c; cvs diff -u -r 1.20.2.8 -r 1.20.2.9 src/folderview.h; cvs diff -u -r 1.179.2.75 -r 1.179.2.76 src/imap.c; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/imap_gtk.c; cvs diff -u -r 1.274.2.69 -r 1.274.2.70 src/mainwindow.c; cvs diff -u -r 1.2.2.12 -r 1.2.2.13 src/mh_gtk.c; cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/setup.c; cvs diff -u -r 1.395.2.130 -r 1.395.2.131 src/summaryview.c; ) > 1.9.15cvs14.patchset
( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 po/nb.po; cvs diff -u -r 1.50.2.11 -r 1.50.2.12 po/pt_BR.po; ) > 1.9.15cvs15.patchset
( cvs diff -u -r 1.204.2.59 -r 1.204.2.60 src/prefs_common.c; cvs diff -u -r 1.103.2.30 -r 1.103.2.31 src/prefs_common.h; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_summaries.c; cvs diff -u -r 1.207.2.68 -r 1.207.2.69 src/folderview.c; ) > 1.9.15cvs16.patchset
( cvs diff -u -r 1.213.2.61 -r 1.213.2.62 src/folder.c; cvs diff -u -r 1.87.2.20 -r 1.87.2.21 src/folder.h; cvs diff -u -r 1.207.2.67 -r 1.207.2.68 src/folderview.c; cvs diff -u -r 1.20.2.8 -r 1.20.2.9 src/folderview.h; cvs diff -u -r 1.179.2.75 -r 1.179.2.76 src/imap.c; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/imap_gtk.c; cvs diff -u -r 1.274.2.69 -r 1.274.2.70 src/mainwindow.c; cvs diff -u -r 1.2.2.12 -r 1.2.2.13 src/mh_gtk.c; cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/setup.c; cvs diff -u -r 1.395.2.130 -r 1.395.2.131 src/summaryview.c; ) > 1.9.15cvs14.patchset
( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 po/nb.po; cvs diff -u -r 1.50.2.11 -r 1.50.2.12 po/pt_BR.po; ) > 1.9.15cvs15.patchset
( cvs diff -u -r 1.204.2.59 -r 1.204.2.60 src/prefs_common.c; cvs diff -u -r 1.103.2.30 -r 1.103.2.31 src/prefs_common.h; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_summaries.c; cvs diff -u -r 1.207.2.68 -r 1.207.2.69 src/folderview.c; ) > 1.9.15cvs16.patchset
+( cvs diff -u -r 1.395.2.131 -r 1.395.2.132 src/summaryview.c; cvs diff -u -r 1.43.2.28 -r 1.43.2.29 src/toolbar.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/wizard.c; cvs diff -u -r 1.3.2.28 -r 1.3.2.29 src/prefs_themes.c; ) > 1.9.15cvs17.patchset
MICRO_VERSION=15
INTERFACE_AGE=0
BINARY_AGE=0
MICRO_VERSION=15
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
name->item = tpaths;
tdata->names = g_list_append(tdata->names, name);
name->item = tpaths;
tdata->names = g_list_append(tdata->names, name);
+ if (!strcmp2(tpaths->data, prefs_common.pixmap_theme_path)) {
+ tdata->displayed = (gchar *)tpaths->data;
+ }
tpaths = g_list_next(tpaths);
g_free(sname);
}
tpaths = g_list_next(tpaths);
g_free(sname);
}
tdata->page = page;
tpaths = g_list_first(tdata->themes);
tdata->page = page;
tpaths = g_list_first(tdata->themes);
- tdata->displayed = (gchar *)(tpaths->data);
+ if (tdata->displayed == NULL)
+ tdata->displayed = (gchar *)(tpaths->data);
}
static void prefs_themes_free_names(ThemesData *tdata)
}
static void prefs_themes_free_names(ThemesData *tdata)
gtk_clist_freeze(GTK_CLIST(ctree));
summary_clear_list(summaryview);
gtk_clist_freeze(GTK_CLIST(ctree));
summary_clear_list(summaryview);
- summary_set_column_titles(summaryview);
buf = NULL;
if (!item || !item->path || !folder_item_parent(item) || item->no_select) {
buf = NULL;
if (!item || !item->path || !folder_item_parent(item) || item->no_select) {
summary_lock(summaryview);
}
summary_lock(summaryview);
}
- summary_set_column_titles(summaryview);
summary_status_show(summaryview);
summary_set_menu_sensitive(summaryview);
toolbar_main_set_sensitive(summaryview->mainwin);
summary_status_show(summaryview);
summary_set_menu_sensitive(summaryview);
toolbar_main_set_sensitive(summaryview->mainwin);
msginfo->folder->folder->klass->type == F_NEWS)
news_flag_crosspost(msginfo);
msginfo->folder->folder->klass->type == F_NEWS)
news_flag_crosspost(msginfo);
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
- && procmsg_msg_has_marked_parent(msginfo))
- summaryview->unreadmarked++;
-
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted++;
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted++;
node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
- && procmsg_msg_has_marked_parent(msginfo))
- summaryview->unreadmarked++;
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted++;
if (MSG_IS_MOVE(msginfo->flags))
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted++;
if (MSG_IS_MOVE(msginfo->flags))
gtk_widget_show(label);
gtk_clist_set_column_widget(clist, pos, label);
continue;
gtk_widget_show(label);
gtk_clist_set_column_widget(clist, pos, label);
continue;
+ } else if (single_char) {
gtk_clist_set_column_title(clist, pos, title);
continue;
}
gtk_clist_set_column_title(clist, pos, title);
continue;
}
SET_TEXT(S_COL_DATE);
SET_TEXT(S_COL_FROM);
SET_TEXT(S_COL_TO);
SET_TEXT(S_COL_DATE);
SET_TEXT(S_COL_FROM);
SET_TEXT(S_COL_TO);
- SET_TEXT(S_COL_SUBJECT);
+ /* SET_TEXT(S_COL_SUBJECT); already set by node info */
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
- while (prefs_common.bold_unread && node) {
- GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
- if (GTK_CTREE_ROW(node)->children)
- summary_set_row_marks(summaryview, node);
- node = next;
+ if (prefs_common.bold_unread) {
+ while (node) {
+ GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
+ if (GTK_CTREE_ROW(node)->children)
+ summary_set_row_marks(summaryview, node);
+ node = next;
+ }
}
g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
}
g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
static gchar col_score[11];
static gchar buf[BUFFSIZE];
gint *col_pos = summaryview->col_pos;
static gchar col_score[11];
static gchar buf[BUFFSIZE];
gint *col_pos = summaryview->col_pos;
- FolderType ftype = F_UNKNOWN;
gchar *from_text = NULL, *to_text = NULL;
gboolean should_swap = FALSE;
gchar *from_text = NULL, *to_text = NULL;
gboolean should_swap = FALSE;
- text[col_pos[S_COL_MARK]] = NULL;
- text[col_pos[S_COL_STATUS]] = NULL;
- text[col_pos[S_COL_MIME]] = NULL;
- text[col_pos[S_COL_LOCKED]] = NULL;
+ text[col_pos[S_COL_FROM]] = "";
+ text[col_pos[S_COL_TO]] = "";
+ text[col_pos[S_COL_SUBJECT]]= "";
+ text[col_pos[S_COL_MARK]] = "";
+ text[col_pos[S_COL_STATUS]] = "";
+ text[col_pos[S_COL_MIME]] = "";
+ text[col_pos[S_COL_LOCKED]] = "";
+ text[col_pos[S_COL_DATE]] = "";
text[col_pos[S_COL_NUMBER]] = itos(msginfo->msgnum);
text[col_pos[S_COL_SIZE]] = to_human_readable(msginfo->size);
text[col_pos[S_COL_SCORE]] = itos_buf(col_score, msginfo->score);
text[col_pos[S_COL_NUMBER]] = itos(msginfo->msgnum);
text[col_pos[S_COL_SIZE]] = to_human_readable(msginfo->size);
text[col_pos[S_COL_SCORE]] = itos_buf(col_score, msginfo->score);
else
text[col_pos[S_COL_DATE]] = _("(No Date)");
else
text[col_pos[S_COL_DATE]] = _("(No Date)");
- if (ftype != F_NEWS && prefs_common.swap_from && msginfo->from && msginfo->to) {
+ if (prefs_common.swap_from && msginfo->from && msginfo->to) {
gchar *addr = NULL;
addr = g_strdup(msginfo->from);
gchar *addr = NULL;
addr = g_strdup(msginfo->from);
text[col_pos[S_COL_TO]] = tmp;
}
text[col_pos[S_COL_TO]] = tmp;
}
- if (msginfo->folder && msginfo->folder->folder)
- ftype = msginfo->folder->folder->klass->type;
-
if (summaryview->simplify_subject_preg != NULL)
text[col_pos[S_COL_SUBJECT]] = msginfo->subject ?
string_remove_match(buf, BUFFSIZE, msginfo->subject,
if (summaryview->simplify_subject_preg != NULL)
text[col_pos[S_COL_SUBJECT]] = msginfo->subject ?
string_remove_match(buf, BUFFSIZE, msginfo->subject,
g_return_if_fail(msginfo != NULL);
g_return_if_fail(row != NULL);
g_return_if_fail(msginfo != NULL);
g_return_if_fail(row != NULL);
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
- && procmsg_msg_has_marked_parent(msginfo))
- summaryview->unreadmarked--;
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
procmsg_msginfo_unset_flags
(msginfo, MSG_NEW | MSG_UNREAD, 0);
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
procmsg_msginfo_unset_flags
(msginfo, MSG_NEW | MSG_UNREAD, 0);
forwardedxpm, forwardedxpmmask);
} else {
gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_STATUS],
forwardedxpm, forwardedxpmmask);
} else {
gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_STATUS],
}
if (prefs_common.bold_unread &&
}
if (prefs_common.bold_unread &&
&summaryview->color_important);
#endif
} else {
&summaryview->color_important);
#endif
} else {
- gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], NULL);
+ gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "");
}
if (MSG_IS_LOCKED(flags)) {
}
if (MSG_IS_LOCKED(flags)) {
lockedxpm, lockedxpmmask);
}
else {
lockedxpm, lockedxpmmask);
}
else {
- gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], NULL);
+ gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], "");
}
if (MSG_IS_WITH_ATTACHMENT(flags) && MSG_IS_SIGNED(flags)) {
}
if (MSG_IS_WITH_ATTACHMENT(flags) && MSG_IS_SIGNED(flags)) {
gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
clipxpm, clipxpmmask);
} else {
gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
clipxpm, clipxpmmask);
} else {
- gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MIME], NULL);
+ gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MIME], "");
}
if (!style)
style = small_style;
}
if (!style)
style = small_style;
summary_set_colorlabel_color(ctree, row, MSG_GET_COLORLABEL_VALUE(flags));
}
summary_set_colorlabel_color(ctree, row, MSG_GET_COLORLABEL_VALUE(flags));
}
-void summary_set_marks_selected(SummaryView *summaryview)
-{
- GList *cur;
- summary_lock(summaryview);
- for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL && cur->data != NULL;
- cur = cur->next)
- summary_set_row_marks(summaryview, GTK_CTREE_NODE(cur->data));
- summary_unlock(summaryview);
-}
-
static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
if(!(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
return;
if(!(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
return;
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
- && procmsg_msg_has_marked_parent(msginfo))
- summaryview->unreadmarked--;
-
procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
summary_set_row_marks(summaryview, row);
debug_print("Message %d is marked as read\n",
procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
summary_set_row_marks(summaryview, row);
debug_print("Message %d is marked as read\n",
summaryview->deleted--;
}
summaryview->deleted--;
}
- if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
- && procmsg_msg_has_marked_parent(msginfo))
- summaryview->unreadmarked++;
-
procmsg_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
debug_print("Message %d is marked as unread\n",
msginfo->msgnum);
procmsg_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
debug_print("Message %d is marked as unread\n",
msginfo->msgnum);
summaryview->col_state[pos] = col_state[pos];
type = col_state[pos].type;
col_pos[type] = pos;
summaryview->col_state[pos] = col_state[pos];
type = col_state[pos].type;
col_pos[type] = pos;
}
col_state = summaryview->col_state;
}
col_state = summaryview->col_state;
SummaryView *summaryview)
{
summary_set_row_marks(summaryview, node);
SummaryView *summaryview)
{
summary_set_row_marks(summaryview, node);
- while (prefs_common.bold_unread && node) {
- GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
- if (GTK_CTREE_ROW(node)->children)
- summary_set_row_marks(summaryview, node);
- node = next;
+ if (prefs_common.bold_unread) {
+ while (node) {
+ GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
+ if (GTK_CTREE_ROW(node)->children)
+ summary_set_row_marks(summaryview, node);
+ node = next;
+ }
node = GTK_CTREE_NODE(GTK_CLIST(summaryview->ctree)->row_list);
node = GTK_CTREE_NODE(GTK_CLIST(summaryview->ctree)->row_list);
- while (prefs_common.bold_unread && node) {
- GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
- if (GTK_CTREE_ROW(node)->children)
- summary_set_row_marks(summaryview, node);
- node = next;
+ if (prefs_common.bold_unread) {
+ while (node) {
+ GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
+ if (GTK_CTREE_ROW(node)->children)
+ summary_set_row_marks(summaryview, node);
+ node = next;
+ }
msginfo = gtk_ctree_node_get_row_data(ctree, row);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
- summaryview->unreadmarked--;
-
procmsg_msginfo_change_flags(msginfo, MSG_IGNORE_THREAD, 0, MSG_NEW | MSG_UNREAD, 0);
summary_set_row_marks(summaryview, row);
procmsg_msginfo_change_flags(msginfo, MSG_IGNORE_THREAD, 0, MSG_NEW | MSG_UNREAD, 0);
summary_set_row_marks(summaryview, row);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
- summaryview->unreadmarked++;
-
procmsg_msginfo_unset_flags(msginfo, MSG_IGNORE_THREAD, 0);
summary_set_row_marks(summaryview, row);
procmsg_msginfo_unset_flags(msginfo, MSG_IGNORE_THREAD, 0);
summary_set_row_marks(summaryview, row);
void summary_toggle_show_read_messages(SummaryView *summaryview)
{
void summary_toggle_show_read_messages(SummaryView *summaryview)
{
- if (summaryview->folder_item->hide_read_msgs)
+ FolderItemUpdateData source;
+ if (summaryview->folder_item->hide_read_msgs)
summaryview->folder_item->hide_read_msgs = 0;
else
summaryview->folder_item->hide_read_msgs = 1;
summaryview->folder_item->hide_read_msgs = 0;
else
summaryview->folder_item->hide_read_msgs = 1;
+
+ source.item = summaryview->folder_item;
+ source.update_flags = F_ITEM_UPDATE_NAME;
+ hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
summary_show(summaryview, summaryview->folder_item);
}
summary_show(summaryview, summaryview->folder_item);
}
{ A_FORWARD, STOCK_PIXMAP_MAIL_FORWARD, _("Forward") },
{ A_SEPARATOR, 0, ("") },
{ A_TRASH, STOCK_PIXMAP_TRASH, _("Trash") },
{ A_FORWARD, STOCK_PIXMAP_MAIL_FORWARD, _("Forward") },
{ A_SEPARATOR, 0, ("") },
{ A_TRASH, STOCK_PIXMAP_TRASH, _("Trash") },
- { A_EXECUTE, STOCK_PIXMAP_EXEC, _("Execute") },
+ { A_SEPARATOR, 0, ("") },
{ A_GOTO_PREV, STOCK_PIXMAP_UP_ARROW, _("Previous")},
{ A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
};
{ A_GOTO_PREV, STOCK_PIXMAP_UP_ARROW, _("Previous")},
{ A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
};
{ A_SEPARATOR, 0, ("") },
{ A_INSERT, STOCK_PIXMAP_INSERT_FILE, _("Insert") },
{ A_ATTACH, STOCK_PIXMAP_MAIL_ATTACH, _("Attach") },
{ A_SEPARATOR, 0, ("") },
{ A_INSERT, STOCK_PIXMAP_INSERT_FILE, _("Insert") },
{ A_ATTACH, STOCK_PIXMAP_MAIL_ATTACH, _("Attach") },
- { A_SIG, STOCK_PIXMAP_MAIL_SIGN, _("Signature") },
- { A_SEPARATOR, 0, ("") },
- { A_EXTEDITOR, STOCK_PIXMAP_EDIT_EXTERN, _("Editor") },
- { A_LINEWRAP_CURRENT, STOCK_PIXMAP_LINEWRAP_CURRENT, _("Wrap paragraph") },
- { A_LINEWRAP_ALL, STOCK_PIXMAP_LINEWRAP_ALL, _("Wrap all") },
{ A_SEPARATOR, 0, ("") },
{ A_ADDRBOOK, STOCK_PIXMAP_ADDRESS_BOOK, _("Address") }
};
{ A_SEPARATOR, 0, ("") },
{ A_ADDRBOOK, STOCK_PIXMAP_ADDRESS_BOOK, _("Address") }
};
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include "defs.h"
#include <glib.h>
#include "defs.h"
#include <glib.h>