From: Paul Mangan Date: Tue, 31 May 2005 07:04:59 +0000 (+0000) Subject: 2005-05-31 [paul] 1.9.11cvs26 X-Git-Tag: rel_1_9_12~82 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d6acee9b2159647d1272a4109160587fa88e4eec 2005-05-31 [paul] 1.9.11cvs26 * src/account.c * src/addr_compl.c * src/compose.c * src/foldersel.c * src/prefs_actions.c * src/prefs_common.c * src/prefs_common.h * src/prefs_customheader.c * src/prefs_display_header.c * src/prefs_filtering.c * src/prefs_filtering_action.c * src/prefs_matcher.c * src/prefs_summaries.c * src/prefs_summary_column.c * src/prefs_template.c * src/prefs_toolbar.c * src/ssl_manager.c * src/gtk/pluginwindow.c * src/gtk/prefswindow.c * src/gtk/progressdialog.c add hidden prefs 'enable_rules_hint' for gtk_tree_view_set_rules_hint() (sync with main) --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 5e38938e3..7dd3cda91 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,30 @@ +2005-05-31 [paul] 1.9.11cvs26 + + * src/account.c + * src/addr_compl.c + * src/compose.c + * src/foldersel.c + * src/prefs_actions.c + * src/prefs_common.c + * src/prefs_common.h + * src/prefs_customheader.c + * src/prefs_display_header.c + * src/prefs_filtering.c + * src/prefs_filtering_action.c + * src/prefs_matcher.c + * src/prefs_summaries.c + * src/prefs_summary_column.c + * src/prefs_template.c + * src/prefs_toolbar.c + * src/ssl_manager.c + * src/gtk/pluginwindow.c + * src/gtk/prefswindow.c + * src/gtk/progressdialog.c + add hidden prefs 'enable_rules_hint' + for gtk_tree_view_set_rules_hint() + (sync with main) + + 2005-05-31 [colin] 1.9.11cvs25 * src/Makefile.am diff --git a/PATCHSETS b/PATCHSETS index 9ad36904e..00d5f60cb 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -514,3 +514,4 @@ ( cvs diff -u -r 1.155.2.22 -r 1.155.2.23 src/Makefile.am; cvs diff -u -r 1.115.2.34 -r 1.115.2.35 src/main.c; cvs diff -u -r 1.204.2.39 -r 1.204.2.40 src/prefs_common.c; diff -u /dev/null src/prefs_compose_writing.c; diff -u /dev/null src/prefs_compose_writing.h; ) > 1.9.11cvs23.patchset ( cvs diff -u -r 1.155.2.23 -r 1.155.2.24 src/Makefile.am; cvs diff -u -r 1.115.2.35 -r 1.115.2.36 src/main.c; cvs diff -u -r 1.204.2.40 -r 1.204.2.41 src/prefs_common.c; cvs diff -u -r 1.103.2.17 -r 1.103.2.18 src/prefs_common.h; diff -u /dev/null src/prefs_quote.c; diff -u /dev/null src/prefs_quote.h; cvs diff -u -r 1.12.2.17 -r 1.12.2.18 src/gtk/prefswindow.c; ) > 1.9.11cvs24.patchset ( cvs diff -u -r 1.155.2.24 -r 1.155.2.25 src/Makefile.am; cvs diff -u -r 1.115.2.36 -r 1.115.2.37 src/main.c; cvs diff -u -r 1.204.2.41 -r 1.204.2.42 src/prefs_common.c; diff -u /dev/null src/prefs_summaries.c; diff -u /dev/null src/prefs_summaries.h; ) > 1.9.11cvs25.patchset +( cvs diff -u -r 1.61.2.24 -r 1.61.2.25 src/account.c; cvs diff -u -r 1.27.2.9 -r 1.27.2.10 src/addr_compl.c; cvs diff -u -r 1.382.2.123 -r 1.382.2.124 src/compose.c; cvs diff -u -r 1.26.2.15 -r 1.26.2.16 src/foldersel.c; cvs diff -u -r 1.60.2.14 -r 1.60.2.15 src/prefs_actions.c; cvs diff -u -r 1.204.2.42 -r 1.204.2.43 src/prefs_common.c; cvs diff -u -r 1.103.2.18 -r 1.103.2.19 src/prefs_common.h; cvs diff -u -r 1.16.2.8 -r 1.16.2.9 src/prefs_customheader.c; cvs diff -u -r 1.16.2.8 -r 1.16.2.9 src/prefs_display_header.c; cvs diff -u -r 1.59.2.17 -r 1.59.2.18 src/prefs_filtering.c; cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/prefs_filtering_action.c; cvs diff -u -r 1.43.2.18 -r 1.43.2.19 src/prefs_matcher.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_summaries.c; cvs diff -u -r 1.10.2.6 -r 1.10.2.7 src/prefs_summary_column.c; cvs diff -u -r 1.12.2.9 -r 1.12.2.10 src/prefs_template.c; cvs diff -u -r 1.30.2.12 -r 1.30.2.13 src/prefs_toolbar.c; cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/ssl_manager.c; cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/gtk/pluginwindow.c; cvs diff -u -r 1.12.2.18 -r 1.12.2.19 src/gtk/prefswindow.c; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/progressdialog.c; ) > 1.9.11cvs26.patchset diff --git a/configure.ac b/configure.ac index bd39c58ed..ac9269d52 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=11 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=25 +EXTRA_VERSION=26 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/account.c b/src/account.c index 14af45385..7fac482da 100644 --- a/src/account.c +++ b/src/account.c @@ -37,6 +37,7 @@ #include "account.h" #include "prefs_gtk.h" #include "prefs_account.h" +#include "prefs_common.h" #include "folder_item_prefs.h" #include "compose.h" #include "manage_window.h" @@ -1314,7 +1315,7 @@ static GtkWidget *account_list_view_create(void) list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL(store))); g_object_unref(G_OBJECT(store)); - gtk_tree_view_set_rules_hint(list_view, TRUE); + gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint); selector = gtk_tree_view_get_selection(list_view); gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE); diff --git a/src/addr_compl.c b/src/addr_compl.c index b277c9ff8..e33dde0f1 100644 --- a/src/addr_compl.c +++ b/src/addr_compl.c @@ -45,6 +45,7 @@ #include "addrindex.h" #include "addr_compl.h" #include "utils.h" +#include "prefs_common.h" #include /*! @@ -1491,7 +1492,7 @@ static GtkWidget *addr_compl_list_view_create(CompletionWindow *window) list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model)); g_object_unref(model); - gtk_tree_view_set_rules_hint(list_view, TRUE); + gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint); gtk_tree_view_set_headers_visible(list_view, FALSE); selector = gtk_tree_view_get_selection(list_view); diff --git a/src/compose.c b/src/compose.c index a44ad5347..11829589e 100644 --- a/src/compose.c +++ b/src/compose.c @@ -4505,7 +4505,8 @@ GtkWidget *compose_create_attach(Compose *compose) COL_NAME, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(attach_clist), column); - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(attach_clist), TRUE); + gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(attach_clist), + prefs_common.enable_rules_hint); selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(attach_clist)); gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE); diff --git a/src/foldersel.c b/src/foldersel.c index a9706bb1a..ced132ee4 100644 --- a/src/foldersel.c +++ b/src/foldersel.c @@ -50,6 +50,7 @@ #include "folderview.h" #include "inputdialog.h" #include "folder.h" +#include "prefs_common.h" enum { FOLDERSEL_FOLDERNAME, @@ -252,7 +253,8 @@ static void foldersel_create(void) treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(tree_store)); g_object_unref(G_OBJECT(tree_store)); gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE); - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), TRUE); + gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), + prefs_common.enable_rules_hint); gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview), FOLDERSEL_FOLDERNAME); diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c index 3b3fa9153..a45566617 100644 --- a/src/gtk/pluginwindow.c +++ b/src/gtk/pluginwindow.c @@ -32,6 +32,7 @@ #include "filesel.h" #include "alertpanel.h" +#include "prefs_common.h" #include "../inc.h" enum { @@ -332,7 +333,7 @@ static GtkWidget *pluginwindow_list_view_create(PluginWindow *pluginwindow) list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model)); g_object_unref(model); - gtk_tree_view_set_rules_hint(list_view, TRUE); + gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint); selector = gtk_tree_view_get_selection(list_view); gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE); diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c index 69c9adbbf..c899a5880 100644 --- a/src/gtk/prefswindow.c +++ b/src/gtk/prefswindow.c @@ -31,6 +31,7 @@ #include "utils.h" #include "prefswindow.h" #include "gtkutils.h" +#include "prefs_common.h" enum { PREFS_PAGE_TITLE, /* page title */ @@ -447,7 +448,7 @@ static GtkWidget *prefswindow_tree_view_create(PrefsWindow *prefswindow) model = GTK_TREE_MODEL(prefswindow_create_data_store()); tree_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model)); g_object_unref(model); - gtk_tree_view_set_rules_hint(tree_view, TRUE); + gtk_tree_view_set_rules_hint(tree_view, prefs_common.enable_rules_hint); selector = gtk_tree_view_get_selection(tree_view); gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE); diff --git a/src/gtk/progressdialog.c b/src/gtk/progressdialog.c index 626e9171b..d922bfd6a 100644 --- a/src/gtk/progressdialog.c +++ b/src/gtk/progressdialog.c @@ -35,6 +35,7 @@ #include "progressdialog.h" #include "gtkutils.h" #include "utils.h" +#include "prefs_common.h" enum { PROGRESS_IMAGE, @@ -295,7 +296,7 @@ static GtkWidget *progress_dialog_list_view_create(void) list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model)); g_object_unref(model); - gtk_tree_view_set_rules_hint(list_view, TRUE); + gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint); /* create the columns */ progress_dialog_create_list_view_columns(list_view); diff --git a/src/prefs_actions.c b/src/prefs_actions.c index 45a429438..84fcc3131 100644 --- a/src/prefs_actions.c +++ b/src/prefs_actions.c @@ -832,7 +832,7 @@ static GtkWidget *prefs_actions_list_view_create(void) list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model)); g_object_unref(model); - gtk_tree_view_set_rules_hint(list_view, TRUE); + gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint); selector = gtk_tree_view_get_selection(list_view); gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE); diff --git a/src/prefs_common.c b/src/prefs_common.c index c5f4942b5..9f77ab5b6 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -373,6 +373,8 @@ static PrefParam param[] = { {"date_format", "%y/%m/%d(%a) %H:%M", &prefs_common.date_format, P_STRING, NULL, NULL, NULL}, + {"enable_rules_hint", "TRUE", &prefs_common.enable_rules_hint, P_BOOL, + NULL, NULL, NULL}, {"enable_hscrollbar", "TRUE", &prefs_common.enable_hscrollbar, P_BOOL, NULL, NULL, NULL}, {"bold_unread", "TRUE", &prefs_common.bold_unread, P_BOOL, diff --git a/src/prefs_common.h b/src/prefs_common.h index 1ebd7cd73..524cf2fbc 100644 --- a/src/prefs_common.h +++ b/src/prefs_common.h @@ -151,6 +151,7 @@ struct _PrefsCommon gboolean use_addr_book; gchar *date_format; + gboolean enable_rules_hint; gboolean enable_hscrollbar; gboolean bold_unread; gboolean enable_thread; diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c index cdf9b6b50..ffec85711 100644 --- a/src/prefs_customheader.c +++ b/src/prefs_customheader.c @@ -693,7 +693,7 @@ static GtkWidget *prefs_custom_header_list_view_create(void) list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model)); g_object_unref(model); - gtk_tree_view_set_rules_hint(list_view, TRUE); + gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint); selector = gtk_tree_view_get_selection(list_view); gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE); diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c index 3110a29fa..7dbcef2b6 100644 --- a/src/prefs_display_header.c +++ b/src/prefs_display_header.c @@ -732,7 +732,8 @@ static GtkWidget *prefs_display_header_list_view_create(const gchar *name) list_view = gtk_tree_view_new_with_model(model); g_object_unref(G_OBJECT(model)); - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list_view), TRUE); + gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list_view), + prefs_common.enable_rules_hint); selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(list_view)); gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE); diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c index b2584bf72..8a8b34fa4 100644 --- a/src/prefs_filtering.c +++ b/src/prefs_filtering.c @@ -1144,7 +1144,7 @@ static GtkWidget *prefs_filtering_list_view_create(void) list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL (prefs_filtering_create_data_store()))); - gtk_tree_view_set_rules_hint(list_view, TRUE); + gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint); selector = gtk_tree_view_get_selection(list_view); gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE); diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c index fd704db86..d90dd261a 100644 --- a/src/prefs_filtering_action.c +++ b/src/prefs_filtering_action.c @@ -1342,7 +1342,7 @@ static GtkWidget *prefs_filtering_action_list_view_create(void) list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model)); g_object_unref(model); - gtk_tree_view_set_rules_hint(list_view, TRUE); + gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint); selector = gtk_tree_view_get_selection(list_view); gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE); diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c index 2276b75d2..241b6ba0c 100644 --- a/src/prefs_matcher.c +++ b/src/prefs_matcher.c @@ -1725,7 +1725,7 @@ static GtkWidget *prefs_matcher_list_view_create(void) list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model)); g_object_unref(model); - gtk_tree_view_set_rules_hint(list_view, TRUE); + gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint); selector = gtk_tree_view_get_selection(list_view); gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE); diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c index 2323adad1..9fd8ea9d8 100644 --- a/src/prefs_summaries.c +++ b/src/prefs_summaries.c @@ -186,7 +186,8 @@ static GtkWidget *date_format_create(GtkButton *button, void *data) datefmt_list_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); g_object_unref(G_OBJECT(store)); - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(datefmt_list_view), TRUE); + gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(datefmt_list_view), + prefs_common.enable_rules_hint); gtk_widget_show(datefmt_list_view); gtk_container_add(GTK_CONTAINER(scrolledwindow1), datefmt_list_view); diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c index 82c091398..61d6801ae 100644 --- a/src/prefs_summary_column.c +++ b/src/prefs_summary_column.c @@ -728,7 +728,8 @@ static GtkWidget *prefs_summary_column_list_view_create(const gchar *name) list_view = gtk_tree_view_new_with_model(model); g_object_unref(G_OBJECT(model)); - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list_view), TRUE); + gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list_view), + prefs_common.enable_rules_hint); selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(list_view)); gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE); diff --git a/src/prefs_template.c b/src/prefs_template.c index 0f3d55c6d..298312218 100644 --- a/src/prefs_template.c +++ b/src/prefs_template.c @@ -38,6 +38,7 @@ #include "compose.h" #include "addr_compl.h" #include "quote_fmt.h" +#include "prefs_common.h" enum { TEMPL_TEXT, @@ -627,7 +628,7 @@ static GtkWidget *prefs_template_list_view_create(void) list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model)); g_object_unref(model); - gtk_tree_view_set_rules_hint(list_view, TRUE); + gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint); selector = gtk_tree_view_get_selection(list_view); gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE); diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c index f3d6ec90e..76292450b 100644 --- a/src/prefs_toolbar.c +++ b/src/prefs_toolbar.c @@ -997,7 +997,7 @@ static GtkWidget *create_icon_list_view(ToolbarPage *prefs_toolbar) gtk_tree_view_append_column(list_view, column); /* various other tree view attributes */ - gtk_tree_view_set_rules_hint(list_view, TRUE); + gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint); gtk_tree_view_set_headers_visible(list_view, FALSE); selector = gtk_tree_view_get_selection(list_view); @@ -1080,7 +1080,7 @@ static GtkWidget *create_set_list_view(ToolbarPage *prefs_toolbar) gtk_tree_view_append_column(list_view, column); /* various other tree view attributes */ - gtk_tree_view_set_rules_hint(list_view, TRUE); + gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint); selector = gtk_tree_view_get_selection(list_view); gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE); diff --git a/src/ssl_manager.c b/src/ssl_manager.c index efabcf1ab..90240809d 100644 --- a/src/ssl_manager.c +++ b/src/ssl_manager.c @@ -35,6 +35,7 @@ #include "gtksctree.h" #include "alertpanel.h" #include "sslcertwindow.h" +#include "prefs_common.h" enum { SSL_MANAGER_HOST, @@ -119,7 +120,7 @@ static GtkWidget *ssl_manager_list_view_create (void) list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model)); g_object_unref(model); - gtk_tree_view_set_rules_hint(list_view, TRUE); + gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint); selector = gtk_tree_view_get_selection(list_view); gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);