[Commits] Makefile.am 1.155.2.103 1.155.2.104 action.c 1.12.2.77 1.12.2.78 addr_compl.c 1.27.2.65 1.27.2.66 addressbook.c 1.60.2.152 1.60.2.153 addrgather.c 1.5.10.39 1.5.10.40 compose.c 1.382.2.617 1.382.2.618 editaddress.c 1.14.2.65 1.14.2.66 editgroup.c 1.11.2.30 1.11.2.31 main.c 1.115.2.260 1.115.2.261 mainwindow.c 1.274.2.354 1.274.2.355 message_search.c 1.3.12.43 1.3.12.44 prefs_display_header.c 1.16.2.46 1.16.2.47 prefs_filtering_action.c 1.1.4.79 1.1.4.80 prefs_matcher.c 1.43.2.96 1.43.2.97 prefs_other.c 1.1.2.48 1.1.2.49 prefs_toolbar.c 1.30.2.75 1.30.2.76 printing.c 1.1.2.40 1.1.2.41 stock_pixmap.c 1.25.2.76 1.25.2.77 summary_search.c 1.15.2.74 1.15.2.75 summaryview.c 1.395.2.456 1.395.2.457 textview.c 1.96.2.254 1.96.2.255
colin at claws-mail.org
colin at claws-mail.org
Thu Nov 15 14:41:08 CET 2012
Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv26188/src
Modified Files:
Tag: gtk2
Makefile.am action.c addr_compl.c addressbook.c addrgather.c
compose.c editaddress.c editgroup.c main.c mainwindow.c
message_search.c prefs_display_header.c
prefs_filtering_action.c prefs_matcher.c prefs_other.c
prefs_toolbar.c printing.c stock_pixmap.c summary_search.c
summaryview.c textview.c
Log Message:
2012-11-15 [colin] 3.9.0cvs4
* src/Makefile.am
* src/action.c
* src/addr_compl.c
* src/addressbook.c
* src/addrgather.c
* src/compose.c
* src/editaddress.c
* src/editgroup.c
* src/main.c
* src/mainwindow.c
* src/message_search.c
* src/prefs_display_header.c
* src/prefs_filtering_action.c
* src/prefs_matcher.c
* src/prefs_other.c
* src/prefs_toolbar.c
* src/printing.c
* src/stock_pixmap.c
* src/summary_search.c
* src/summaryview.c
* src/textview.c
* src/gtk/Makefile.am
* src/gtk/colorlabel.c
* src/gtk/combobox.c
* src/gtk/combobox.h
* src/gtk/gtkcmclist.c
* src/gtk/gtkcmclist.h
* src/gtk/gtkcmctree.c
* src/gtk/gtksctree.c
* src/gtk/gtkshruler.c
* src/gtk/gtkutils.c
* src/gtk/gtkutils.h
* src/gtk/inputdialog.c
* src/gtk/quicksearch.c
* src/plugins/pgpcore/Makefile.am
* src/plugins/pgpinline/Makefile.am
* src/plugins/pgpmime/Makefile.am
* src/plugins/smime/Makefile.am
Big GTK+3 patch from Hanno Meyer-Thurow
Index: editaddress.c
===================================================================
RCS file: /home/claws-mail/claws/src/editaddress.c,v
retrieving revision 1.14.2.65
retrieving revision 1.14.2.66
diff -u -d -r1.14.2.65 -r1.14.2.66
--- editaddress.c 19 Sep 2012 15:13:59 -0000 1.14.2.65
+++ editaddress.c 15 Nov 2012 13:41:05 -0000 1.14.2.66
@@ -1328,7 +1328,11 @@
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+#if !GTK_CHECK_VERSION(2, 24, 0)
entry_name = gtk_combo_box_entry_new_text ();
+#else
+ entry_name = gtk_combo_box_text_new_with_entry ();
+#endif
gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
/* Next row */
@@ -1344,7 +1348,11 @@
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+#if !GTK_CHECK_VERSION(2, 24, 0)
entry_name = gtk_combo_box_entry_new_text ();
+#else
+ entry_name = gtk_combo_box_text_new_with_entry ();
+#endif
gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, 0, 1, GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
/* Next row */
Index: prefs_other.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_other.c,v
retrieving revision 1.1.2.48
retrieving revision 1.1.2.49
diff -u -d -r1.1.2.48 -r1.1.2.49
--- prefs_other.c 19 Sep 2012 14:48:46 -0000 1.1.2.48
+++ prefs_other.c 15 Nov 2012 13:41:05 -0000 1.1.2.49
@@ -399,7 +399,11 @@
{"<Actions>/Menu/Edit/Advanced/DelForwWord", "<alt>D"}, /* - */
};
+#if !GTK_CHECK_VERSION(2, 24, 0)
text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(keybind.combo));
+#else
+ text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(keybind.combo));
+#endif
if (!strcmp(text, _("Default"))) {
menurc = default_menurc;
Index: addressbook.c
===================================================================
RCS file: /home/claws-mail/claws/src/addressbook.c,v
retrieving revision 1.60.2.152
retrieving revision 1.60.2.153
diff -u -d -r1.60.2.152 -r1.60.2.153
--- addressbook.c 19 Sep 2012 15:39:04 -0000 1.60.2.152
+++ addressbook.c 15 Nov 2012 13:41:04 -0000 1.60.2.153
@@ -1068,7 +1068,7 @@
/* Address list */
clist = gtk_sctree_new_with_titles(N_LIST_COLS, 0, list_titles);
gtk_container_add(GTK_CONTAINER(clist_swin), clist);
- gtk_cmclist_set_selection_mode(GTK_CMCLIST(clist), GTK_SELECTION_EXTENDED);
+ gtk_cmclist_set_selection_mode(GTK_CMCLIST(clist), GTK_SELECTION_MULTIPLE);
gtk_cmctree_set_line_style(GTK_CMCTREE(clist), GTK_CMCTREE_LINES_NONE);
gtk_cmctree_set_expander_style(GTK_CMCTREE(clist),
GTK_CMCTREE_EXPANDER_TRIANGLE);
Index: editgroup.c
===================================================================
RCS file: /home/claws-mail/claws/src/editgroup.c,v
retrieving revision 1.11.2.30
retrieving revision 1.11.2.31
diff -u -d -r1.11.2.30 -r1.11.2.31
--- editgroup.c 7 Jul 2012 07:09:27 -0000 1.11.2.30
+++ editgroup.c 15 Nov 2012 13:41:05 -0000 1.11.2.31
@@ -356,7 +356,7 @@
gtk_cmctree_set_expander_style(GTK_CMCTREE(clist_group),
GTK_CMCTREE_EXPANDER_TRIANGLE);
gtk_sctree_set_stripes(GTK_SCTREE(clist_group), prefs_common.use_stripes_in_summaries);
- gtk_cmclist_set_selection_mode( GTK_CMCLIST(clist_group), GTK_SELECTION_EXTENDED );
+ gtk_cmclist_set_selection_mode( GTK_CMCLIST(clist_group), GTK_SELECTION_MULTIPLE );
gtk_cmclist_set_column_width( GTK_CMCLIST(clist_group), GROUP_COL_NAME, GROUP_COL_WIDTH_NAME );
gtk_cmclist_set_column_width( GTK_CMCLIST(clist_group), GROUP_COL_EMAIL, GROUP_COL_WIDTH_EMAIL );
gtk_cmclist_set_compare_func( GTK_CMCLIST(clist_group), edit_group_list_compare_func );
@@ -388,7 +388,7 @@
gtk_cmctree_set_line_style(GTK_CMCTREE(clist_avail), GTK_CMCTREE_LINES_NONE);
gtk_cmctree_set_expander_style(GTK_CMCTREE(clist_avail),
GTK_CMCTREE_EXPANDER_TRIANGLE);
- gtk_cmclist_set_selection_mode( GTK_CMCLIST(clist_avail), GTK_SELECTION_EXTENDED );
+ gtk_cmclist_set_selection_mode( GTK_CMCLIST(clist_avail), GTK_SELECTION_MULTIPLE );
gtk_cmclist_set_column_width( GTK_CMCLIST(clist_avail), GROUP_COL_NAME, GROUP_COL_WIDTH_NAME );
gtk_cmclist_set_column_width( GTK_CMCLIST(clist_avail), GROUP_COL_EMAIL, GROUP_COL_WIDTH_EMAIL );
gtk_cmclist_set_compare_func( GTK_CMCLIST(clist_avail), edit_group_list_compare_func );
Index: summary_search.c
===================================================================
RCS file: /home/claws-mail/claws/src/summary_search.c,v
retrieving revision 1.15.2.74
retrieving revision 1.15.2.75
diff -u -d -r1.15.2.74 -r1.15.2.75
--- summary_search.c 26 Sep 2012 13:15:47 -0000 1.15.2.74
+++ summary_search.c 15 Nov 2012 13:41:06 -0000 1.15.2.75
@@ -171,7 +171,11 @@
{
gchar *result;
+#if !GTK_CHECK_VERSION(2, 24, 0)
result = gtk_combo_box_get_active_text(GTK_COMBO_BOX(from));
+#else
+ result = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(from));
+#endif
if (!result)
result = gtk_editable_get_chars(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(from))), 0, -1);
@@ -300,7 +304,11 @@
gtk_table_set_row_spacings (GTK_TABLE (table1), 8);
gtk_table_set_col_spacings (GTK_TABLE (table1), 8);
+#if !GTK_CHECK_VERSION(2, 24, 0)
from_entry = gtk_combo_box_entry_new_text ();
+#else
+ from_entry = gtk_combo_box_text_new_with_entry ();
+#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(from_entry), -1);
if (prefs_common.summary_search_from_history)
combobox_set_popdown_strings(GTK_COMBO_BOX(from_entry),
@@ -315,7 +323,11 @@
g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((from_entry)))),
"focus_out_event", G_CALLBACK(from_entry_focus_evt_out), NULL);
+#if !GTK_CHECK_VERSION(2, 24, 0)
to_entry = gtk_combo_box_entry_new_text ();
+#else
+ to_entry = gtk_combo_box_text_new_with_entry ();
+#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(to_entry), -1);
if (prefs_common.summary_search_to_history)
combobox_set_popdown_strings(GTK_COMBO_BOX(to_entry),
@@ -330,7 +342,11 @@
g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((to_entry)))),
"focus_out_event", G_CALLBACK(to_entry_focus_evt_out), NULL);
+#if !GTK_CHECK_VERSION(2, 24, 0)
subject_entry = gtk_combo_box_entry_new_text ();
+#else
+ subject_entry = gtk_combo_box_text_new_with_entry ();
+#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(subject_entry), -1);
if (prefs_common.summary_search_subject_history)
combobox_set_popdown_strings(GTK_COMBO_BOX(subject_entry),
@@ -345,7 +361,11 @@
g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((subject_entry)))),
"focus_out_event", G_CALLBACK(subject_entry_focus_evt_out), NULL);
+#if !GTK_CHECK_VERSION(2, 24, 0)
body_entry = gtk_combo_box_entry_new_text ();
+#else
+ body_entry = gtk_combo_box_text_new_with_entry ();
+#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(body_entry), -1);
if (prefs_common.summary_search_body_history)
combobox_set_popdown_strings(GTK_COMBO_BOX(body_entry),
@@ -360,7 +380,11 @@
g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((body_entry)))),
"focus_out_event", G_CALLBACK(body_entry_focus_evt_out), NULL);
+#if !GTK_CHECK_VERSION(2, 24, 0)
adv_condition_entry = gtk_combo_box_entry_new_text ();
+#else
+ adv_condition_entry = gtk_combo_box_text_new_with_entry ();
+#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(adv_condition_entry), -1);
if (prefs_common.summary_search_adv_condition_history)
combobox_set_popdown_strings(GTK_COMBO_BOX(adv_condition_entry),
@@ -874,7 +898,11 @@
/* re-use the current search value if it's a condition expression,
otherwise ignore it silently */
+#if !GTK_CHECK_VERSION(2, 24, 0)
cond_str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(search_window.adv_condition_entry));
+#else
+ cond_str = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(search_window.adv_condition_entry));
+#endif
if (cond_str && *cond_str != '\0') {
matchers = matcher_parser_get_cond((gchar*)cond_str, NULL);
}
Index: compose.c
===================================================================
RCS file: /home/claws-mail/claws/src/compose.c,v
retrieving revision 1.382.2.617
retrieving revision 1.382.2.618
diff -u -d -r1.382.2.617 -r1.382.2.618
--- compose.c 12 Oct 2012 15:13:14 -0000 1.382.2.617
+++ compose.c 15 Nov 2012 13:41:05 -0000 1.382.2.618
@@ -4758,8 +4758,11 @@
static void compose_select_account(Compose *compose, PrefsAccount *account,
gboolean init)
{
- gchar *from = NULL, *header;
+ gchar *from = NULL, *header = NULL;
ComposeHeaderEntry *header_entry;
+#if GTK_CHECK_VERSION(2, 24, 0)
+ GtkTreeIter iter;
+#endif
cm_return_if_fail(account != NULL);
@@ -4798,7 +4801,13 @@
}
header_entry = (ComposeHeaderEntry *) compose->header_list->data;
+#if !GTK_CHECK_VERSION(2, 24, 0)
header = gtk_combo_box_get_active_text(GTK_COMBO_BOX(header_entry->combo));
+#else
+ if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(header_entry->combo), &iter))
+ gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(
+ header_entry->combo)), &iter, COMBOBOX_TEXT, &header, -1);
+#endif
if (header && !strlen(gtk_entry_get_text(GTK_ENTRY(header_entry->entry)))) {
if (account->protocol == A_NNTP) {
@@ -6661,9 +6670,11 @@
headerentry = g_new0(ComposeHeaderEntry, 1);
- /* Combo box */
+ /* Combo box model */
model = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+#if !GTK_CHECK_VERSION(2, 24, 0)
combo = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(model), 0);
+#endif
COMBOBOX_ADD(model, prefs_common_translated_header_name("To:"),
COMPOSE_TO);
COMBOBOX_ADD(model, prefs_common_translated_header_name("Cc:"),
@@ -6678,6 +6689,14 @@
COMPOSE_FOLLOWUPTO);
compose_add_extra_header_entries(model);
+ /* Combo box */
+#if GTK_CHECK_VERSION(2, 24, 0)
+ combo = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(model));
+ GtkCellRenderer *cell = gtk_cell_renderer_text_new();
+ gtk_cell_renderer_set_alignment(cell, 0.0, 0.5);
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), cell, TRUE);
+ gtk_combo_box_set_entry_text_column(combo, 0);
+#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN(combo))), "grab_focus",
G_CALLBACK(compose_grab_focus_cb), compose);
@@ -7034,7 +7053,11 @@
g_signal_connect(G_OBJECT(savemsg_checkbtn), "toggled",
G_CALLBACK(compose_savemsg_checkbtn_cb), compose);
+#if !GTK_CHECK_VERSION(2, 24, 0)
savemsg_combo = gtk_combo_box_entry_new_text();
+#else
+ savemsg_combo = gtk_combo_box_text_new_with_entry();
+#endif
compose->savemsg_checkbtn = savemsg_checkbtn;
compose->savemsg_combo = savemsg_combo;
gtk_widget_show(savemsg_combo);
@@ -8878,7 +8901,11 @@
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, (0 + 1),
GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+#if !GTK_CHECK_VERSION(2, 24, 0)
mimetype_entry = gtk_combo_box_entry_new_text();
+#else
+ mimetype_entry = gtk_combo_box_text_new_with_entry();
+#endif
gtk_table_attach(GTK_TABLE(table), mimetype_entry, 1, 2, 0, (0 + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
@@ -8900,7 +8927,11 @@
for (mime_type_list = strlist; mime_type_list != NULL;
mime_type_list = mime_type_list->next) {
+#if !GTK_CHECK_VERSION(2, 24, 0)
gtk_combo_box_append_text(GTK_COMBO_BOX(mimetype_entry), mime_type_list->data);
+#else
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(mimetype_entry), mime_type_list->data);
+#endif
g_free(mime_type_list->data);
}
g_list_free(strlist);
@@ -9344,8 +9375,12 @@
GSList *list, *saved_list = NULL;
HeaderEntryState *state;
GtkRcStyle *style = NULL;
+#if !GTK_CHECK_VERSION(3, 0, 0)
static GdkColor yellow;
static gboolean color_set = FALSE;
+#else
+ static GdkColor yellow = { (guint32)0, (guint32)0xf5, (guint32)0xf6, (guint32)0xbe };
+#endif
/* Get ID of active account in the combo box */
menu = gtk_combo_box_get_model(optmenu);
@@ -9373,12 +9408,14 @@
GTK_EDITABLE(hentry->entry), 0, -1);
state->type = hentry->type;
+#if !GTK_CHECK_VERSION(3, 0, 0)
if (!color_set) {
gdk_color_parse("#f5f6be", &yellow);
color_set = gdk_colormap_alloc_color(
gdk_colormap_get_system(),
&yellow, FALSE, TRUE);
}
+#endif
style = gtk_widget_get_modifier_style(hentry->entry);
state->entry_marked = gdk_color_equal(&yellow,
Index: summaryview.c
===================================================================
RCS file: /home/claws-mail/claws/src/summaryview.c,v
retrieving revision 1.395.2.456
retrieving revision 1.395.2.457
diff -u -d -r1.395.2.456 -r1.395.2.457
--- summaryview.c 26 Sep 2012 08:54:05 -0000 1.395.2.456
+++ summaryview.c 15 Nov 2012 13:41:06 -0000 1.395.2.457
@@ -6001,7 +6001,11 @@
accel_path = g_strdup_printf("<ClawsColorLabels>/None");
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
g_free(accel_path);
+#if !GTK_CHECK_VERSION(2, 24, 0)
gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_0, GDK_CONTROL_MASK);
+#else
+ gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_KEY_0, GDK_CONTROL_MASK);
+#endif
item = gtk_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
@@ -6021,7 +6025,11 @@
accel_path = g_strdup_printf("<ClawsColorLabels>/%d", i+1);
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
if (i < 9)
+#if !GTK_CHECK_VERSION(2, 24, 0)
gtk_accel_map_add_entry(accel_path, GDK_1+i, GDK_CONTROL_MASK);
+#else
+ gtk_accel_map_add_entry(accel_path, GDK_KEY_1+i, GDK_CONTROL_MASK);
+#endif
g_free(accel_path);
g_signal_connect (gtk_ui_manager_get_accel_group(mainwindow_get_mainwindow()->ui_manager),
"accel-changed", G_CALLBACK (mainwin_accel_changed_cb), item);
@@ -6415,7 +6423,7 @@
if (prefs_common.show_col_headers == FALSE)
gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
- gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_EXTENDED);
+ gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_MULTIPLE);
gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), col_pos[S_COL_MARK],
GTK_JUSTIFY_CENTER);
gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), col_pos[S_COL_STATUS],
Index: prefs_display_header.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_display_header.c,v
retrieving revision 1.16.2.46
retrieving revision 1.16.2.47
diff -u -d -r1.16.2.46 -r1.16.2.47
--- prefs_display_header.c 7 Jul 2012 07:09:29 -0000 1.16.2.46
+++ prefs_display_header.c 15 Nov 2012 13:41:05 -0000 1.16.2.47
@@ -275,9 +275,17 @@
gtk_widget_show (hdr_label);
gtk_box_pack_start (GTK_BOX (hbox1), hdr_label, FALSE, FALSE, 0);
+#if !GTK_CHECK_VERSION(2, 24, 0)
hdr_combo = gtk_combo_box_entry_new_text();
+#else
+ hdr_combo = gtk_combo_box_text_new_with_entry();
+#endif
for(i=0; i < 9 ; i++)
+#if !GTK_CHECK_VERSION(2, 24, 0)
gtk_combo_box_append_text(GTK_COMBO_BOX (hdr_combo),
+#else
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT (hdr_combo),
+#endif
(*defaults[i] == '-') ? defaults[i]+1 : defaults[i]);
gtk_combo_box_set_active(GTK_COMBO_BOX(hdr_combo), 0);
gtk_widget_show (hdr_combo);
@@ -579,7 +587,11 @@
gchar *entry_text;
GtkTreeModel *model;
+#if !GTK_CHECK_VERSION(2, 24, 0)
entry_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(dispheader.hdr_combo));
+#else
+ entry_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(dispheader.hdr_combo));
+#endif
if (!entry_text)
entry_text = gtk_editable_get_chars(
GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(dispheader.hdr_combo))),0,-1);
Index: textview.c
===================================================================
RCS file: /home/claws-mail/claws/src/textview.c,v
retrieving revision 1.96.2.254
retrieving revision 1.96.2.255
diff -u -d -r1.96.2.254 -r1.96.2.255
--- textview.c 29 Oct 2012 13:31:55 -0000 1.96.2.254
+++ textview.c 15 Nov 2012 13:41:06 -0000 1.96.2.255
@@ -2128,6 +2128,7 @@
GError *error = NULL;
GdkPixbuf *picture = NULL;
gint w, h;
+ GtkAllocation allocation;
if (prefs_common.display_header_pane
|| !prefs_common.display_xface)
@@ -2172,7 +2173,8 @@
gtk_widget_show(textview->image);
- x = textview->text->allocation.width - WIDTH -5;
+ gtk_widget_get_allocation(textview->text, &allocation);
+ x = allocation.width - WIDTH -5;
gtk_text_view_add_child_in_window(text, textview->image,
GTK_TEXT_WINDOW_TEXT, x, 5);
Index: mainwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/mainwindow.c,v
retrieving revision 1.274.2.354
retrieving revision 1.274.2.355
diff -u -d -r1.274.2.354 -r1.274.2.355
--- mainwindow.c 6 Oct 2012 20:15:30 -0000 1.274.2.354
+++ mainwindow.c 15 Nov 2012 13:41:05 -0000 1.274.2.355
@@ -1177,7 +1177,7 @@
accel_path = g_strdup_printf("<ClawsColorLabels>/None");
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
g_free(accel_path);
- gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_0, GDK_CONTROL_MASK);
+ gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_KEY_0, GDK_CONTROL_MASK);
item = gtk_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
@@ -1197,7 +1197,7 @@
accel_path = g_strdup_printf("<ClawsColorLabels>/%d", i+1);
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
if (i < 9)
- gtk_accel_map_add_entry(accel_path, GDK_1+i, GDK_CONTROL_MASK);
+ gtk_accel_map_add_entry(accel_path, GDK_KEY_1+i, GDK_CONTROL_MASK);
g_free(accel_path);
g_signal_connect (gtk_ui_manager_get_accel_group(mainwin->ui_manager),
"accel-changed", G_CALLBACK (mainwin_accel_changed_cb), item);
@@ -1302,7 +1302,7 @@
accel_path = g_strdup_printf("<ClawsTags>/ApplyTags");
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
g_free(accel_path);
- gtk_accel_map_add_entry("<ClawsTags>/ApplyTags", GDK_T, GDK_CONTROL_MASK|GDK_SHIFT_MASK);
+ gtk_accel_map_add_entry("<ClawsTags>/ApplyTags", GDK_KEY_T, GDK_CONTROL_MASK|GDK_SHIFT_MASK);
g_slist_free(orig);
gtk_widget_show(menu);
Index: stock_pixmap.c
===================================================================
RCS file: /home/claws-mail/claws/src/stock_pixmap.c,v
retrieving revision 1.25.2.76
retrieving revision 1.25.2.77
diff -u -d -r1.25.2.76 -r1.25.2.77
--- stock_pixmap.c 13 Sep 2012 18:49:42 -0000 1.25.2.76
+++ stock_pixmap.c 15 Nov 2012 13:41:06 -0000 1.25.2.77
@@ -770,9 +770,11 @@
stock_wid = stock_pixmap_widget(window, icon);
gtk_widget_get_requisition(stock_wid, &requisition);
+#if !GTK_CHECK_VERSION(3, 0, 0)
if (gtk_image_get_storage_type(GTK_IMAGE(stock_wid)) == GTK_IMAGE_PIXMAP)
data->is_pixmap = TRUE;
else
+#endif
data->is_pixmap = FALSE;
if (data->is_pixmap) {
Index: Makefile.am
===================================================================
RCS file: /home/claws-mail/claws/src/Makefile.am,v
retrieving revision 1.155.2.103
retrieving revision 1.155.2.104
diff -u -d -r1.155.2.103 -r1.155.2.104
--- Makefile.am 21 Sep 2012 10:19:42 -0000 1.155.2.103
+++ Makefile.am 15 Nov 2012 13:41:04 -0000 1.155.2.104
@@ -15,7 +15,7 @@
@ln -s claws-mail $(DESTDIR)$(bindir)/sylpheed-claws
if PLATFORM_WIN32
-LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
+LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
`echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
Index: prefs_toolbar.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_toolbar.c,v
retrieving revision 1.30.2.75
retrieving revision 1.30.2.76
diff -u -d -r1.30.2.75 -r1.30.2.76
--- prefs_toolbar.c 16 Sep 2012 21:56:21 -0000 1.30.2.75
+++ prefs_toolbar.c 15 Nov 2012 13:41:05 -0000 1.30.2.76
@@ -368,7 +368,11 @@
static void add_item_to_plugin_combo(gpointer key, gpointer data, gpointer combo_box)
{
+#if !GTK_CHECK_VERSION(2, 24, 0)
gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), (const gchar*)key);
+#else
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), (const gchar*)key);
+#endif
}
static void prefs_toolbar_populate(ToolbarPage *prefs_toolbar)
@@ -387,8 +391,13 @@
act = (gchar *)cur->data;
get_action_name(act, &act_name);
+#if !GTK_CHECK_VERSION(2, 24, 0)
gtk_combo_box_append_text(
GTK_COMBO_BOX(prefs_toolbar->item_action_combo),
+#else
+ gtk_combo_box_text_append_text(
+ GTK_COMBO_BOX_TEXT(prefs_toolbar->item_action_combo),
+#endif
act_name);
g_free(act_name);
@@ -510,7 +519,11 @@
}
if (item_type == ITEM_FUNCTION) {
+#if !GTK_CHECK_VERSION(2, 24, 0)
event = gtk_combo_box_get_active_text(GTK_COMBO_BOX(
+#else
+ event = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(
+#endif
prefs_toolbar->item_func_combo));
if (is_duplicate(prefs_toolbar, event)) {
@@ -596,7 +609,11 @@
-1);
if (item_type == ITEM_FUNCTION) {
+#if !GTK_CHECK_VERSION(2, 24, 0)
icon_event = gtk_combo_box_get_active_text(GTK_COMBO_BOX(
+#else
+ icon_event = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(
+#endif
prefs_toolbar->item_func_combo));
if (is_duplicate(prefs_toolbar, icon_event)
@@ -790,7 +807,11 @@
static void action_selection_changed(GtkComboBox *action_combo,
ToolbarPage *prefs_toolbar)
{
+#if !GTK_CHECK_VERSION(2, 24, 0)
gchar *text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(
+#else
+ gchar *text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(
+#endif
prefs_toolbar->item_action_combo));
if(text != NULL) { /* action */
@@ -802,7 +823,11 @@
static void plugin_selection_changed(GtkComboBox *action_combo,
ToolbarPage *prefs_toolbar)
{
+#if !GTK_CHECK_VERSION(2, 24, 0)
gchar *text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(prefs_toolbar->item_plugin_combo));
+#else
+ gchar *text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(prefs_toolbar->item_plugin_combo));
+#endif
if (text != NULL) { /* action */
gtk_entry_set_text(GTK_ENTRY(prefs_toolbar->item_text_entry), text);
@@ -813,7 +838,11 @@
static void func_selection_changed(GtkComboBox *action_combo,
ToolbarPage *prefs_toolbar)
{
+#if !GTK_CHECK_VERSION(2, 24, 0)
gchar *text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(
+#else
+ gchar *text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(
+#endif
prefs_toolbar->item_func_combo));
if(text != NULL) { /* action */
@@ -921,21 +950,33 @@
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
+#if !GTK_CHECK_VERSION(2, 24, 0)
item_action_combo = gtk_combo_box_new_text();
+#else
+ item_action_combo = gtk_combo_box_text_new();
+#endif
gtk_widget_set_size_request(item_action_combo, 200, -1);
gtk_table_attach (GTK_TABLE (table), item_action_combo, 1, 3, 1, 2,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
/* available internal functions */
+#if !GTK_CHECK_VERSION(2, 24, 0)
item_func_combo = gtk_combo_box_new_text();
+#else
+ item_func_combo = gtk_combo_box_text_new();
+#endif
gtk_widget_set_size_request(item_func_combo, 200, -1);
gtk_table_attach (GTK_TABLE (table), item_func_combo, 1, 3, 1, 2,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
/* plugin-registered items */
+#if !GTK_CHECK_VERSION(2, 24, 0)
item_plugin_combo = gtk_combo_box_new_text();
+#else
+ item_plugin_combo = gtk_combo_box_text_new();
+#endif
gtk_widget_set_size_request(item_plugin_combo, 200, -1);
gtk_table_attach(GTK_TABLE(table), item_plugin_combo, 1, 3, 1, 2,
(GtkAttachOptions) (GTK_FILL),
Index: addrgather.c
===================================================================
RCS file: /home/claws-mail/claws/src/addrgather.c,v
retrieving revision 1.5.10.39
retrieving revision 1.5.10.40
diff -u -d -r1.5.10.39 -r1.5.10.40
--- addrgather.c 7 Jul 2012 07:09:26 -0000 1.5.10.39
+++ addrgather.c 15 Nov 2012 13:41:05 -0000 1.5.10.40
@@ -324,7 +324,7 @@
#ifndef USE_NEW_ADDRBOOK
GtkWidget *hboxs;
GtkWidget *spinbtnFolder;
- GtkObject *adjFolder;
+ GtkWidget *adjFolder;
#endif
GtkWidget *checkRecurse;
gint top;
Index: action.c
===================================================================
RCS file: /home/claws-mail/claws/src/action.c,v
retrieving revision 1.12.2.77
retrieving revision 1.12.2.78
diff -u -d -r1.12.2.77 -r1.12.2.78
--- action.c 14 Nov 2012 12:33:32 -0000 1.12.2.77
+++ action.c 15 Nov 2012 13:41:04 -0000 1.12.2.78
@@ -1432,7 +1432,7 @@
gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(progress_bar),
GTK_PROGRESS_LEFT_TO_RIGHT);
#else
- gtk_orientable_set_orientation(GTK_PROGRESS_BAR(progress_bar),
+ gtk_orientable_set_orientation(GTK_ORIENTABLE(progress_bar),
GTK_ORIENTATION_HORIZONTAL);
gtk_progress_bar_set_inverted(GTK_PROGRESS_BAR(progress_bar),
FALSE);
Index: printing.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/printing.c,v
retrieving revision 1.1.2.40
retrieving revision 1.1.2.41
diff -u -d -r1.1.2.40 -r1.1.2.41
--- printing.c 16 Sep 2012 21:56:21 -0000 1.1.2.40
+++ printing.c 15 Nov 2012 13:41:05 -0000 1.1.2.41
@@ -658,7 +658,7 @@
static gboolean cb_preview_expose(GtkWidget *widget, GdkEventExpose *event,
gpointer data)
#else
-static gboolean cb_preview_expose(GtkWidget *widget, cairo_t *event,
+static gboolean cb_preview_expose(GtkWidget *widget, cairo_t *cr,
gpointer data)
#endif
{
@@ -677,8 +677,6 @@
cairo_set_source_rgb(cr, 0.5, 0.5, 0.5);
#if !GTK_CHECK_VERSION(3, 0, 0)
cairo_rectangle(cr, event->area.x, event->area.y, event->area.width, event->area.height);
-#else
- cairo_rectangle(cr, 0, 0, event->area.width, event->area.height);
#endif
cairo_fill(cr);
Index: prefs_matcher.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_matcher.c,v
retrieving revision 1.43.2.96
retrieving revision 1.43.2.97
diff -u -d -r1.43.2.96 -r1.43.2.97
--- prefs_matcher.c 8 Sep 2012 20:23:11 -0000 1.43.2.96
+++ prefs_matcher.c 15 Nov 2012 13:41:05 -0000 1.43.2.97
@@ -534,7 +534,9 @@
GtkWidget *test_btn;
GtkWidget *addressbook_select_btn;
+#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget *color_optmenu;
+#endif
static GdkGeometry geometry;
GtkSizeGroup *size_group;
@@ -641,7 +643,11 @@
gtk_box_pack_start(GTK_BOX(upper_hbox), criteria_label2, FALSE, FALSE, 0);
/* headers combo box entry */
+#if !GTK_CHECK_VERSION(2, 24, 0)
headers_combo = gtk_combo_box_entry_new_with_model(matcher.model_headers, 0);
+#else
+ headers_combo = gtk_combo_box_new_with_model_and_entry(matcher.model_headers);
+#endif
gtk_widget_set_size_request(headers_combo, 100, -1);
gtk_box_pack_start(GTK_BOX(upper_hbox), headers_combo, TRUE, TRUE, 0);
header_entry = gtk_bin_get_child(GTK_BIN((headers_combo)));
@@ -842,7 +848,9 @@
#ifndef USE_NEW_ADDRBOOK
matcher.addressbook_select_btn = addressbook_select_btn;
#endif
+#if !GTK_CHECK_VERSION(3, 0, 0)
matcher.color_optmenu = color_optmenu;
+#endif
matcher.match_label = match_label;
matcher.criteria_label2 = criteria_label2;
matcher.headers_combo = headers_combo;
Index: main.c
===================================================================
RCS file: /home/claws-mail/claws/src/main.c,v
retrieving revision 1.115.2.260
retrieving revision 1.115.2.261
diff -u -d -r1.115.2.260 -r1.115.2.261
--- main.c 15 Nov 2012 08:18:19 -0000 1.115.2.260
+++ main.c 15 Nov 2012 13:41:05 -0000 1.115.2.261
@@ -1116,7 +1116,9 @@
#ifdef CRASH_DIALOG
if (cmd.crash) {
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_set_locale();
+#endif
gtk_init(&argc, &argv);
crash_main(cmd.crash_params);
#ifdef G_OS_WIN32
@@ -1145,7 +1147,9 @@
reset_statistics();
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_set_locale();
+#endif
gtk_init(&argc, &argv);
#ifdef G_OS_WIN32
@@ -1200,9 +1204,11 @@
hildon_program = HILDON_PROGRAM(hildon_program_get_instance());
static_osso_context = osso_context;
#endif
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_set_default_colormap(
gdk_screen_get_system_colormap(
gdk_screen_get_default()));
+#endif
gtkut_create_ui_manager();
Index: message_search.c
===================================================================
RCS file: /home/claws-mail/claws/src/message_search.c,v
retrieving revision 1.3.12.43
retrieving revision 1.3.12.44
diff -u -d -r1.3.12.43 -r1.3.12.44
--- message_search.c 7 Jul 2012 07:09:28 -0000 1.3.12.43
+++ message_search.c 15 Nov 2012 13:41:05 -0000 1.3.12.44
@@ -186,7 +186,11 @@
gtk_widget_show (body_label);
gtk_box_pack_start (GTK_BOX (hbox1), body_label, FALSE, FALSE, 0);
+#if !GTK_CHECK_VERSION(2, 24, 0)
body_entry = gtk_combo_box_entry_new_text ();
+#else
+ body_entry = gtk_combo_box_text_new_with_entry ();
+#endif
gtk_combo_box_set_active(GTK_COMBO_BOX(body_entry), -1);
if (prefs_common.message_search_history)
combobox_set_popdown_strings(GTK_COMBO_BOX(body_entry),
@@ -275,7 +279,11 @@
gboolean all_searched = FALSE;
gchar *body_str;
+#if !GTK_CHECK_VERSION(2, 24, 0)
body_str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(search_window.body_entry));
+#else
+ body_str = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(search_window.body_entry));
+#endif
if (!body_str)
body_str = gtk_editable_get_chars(
GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(search_window.body_entry))),0,-1);
Index: addr_compl.c
===================================================================
RCS file: /home/claws-mail/claws/src/addr_compl.c,v
retrieving revision 1.27.2.65
retrieving revision 1.27.2.66
diff -u -d -r1.27.2.65 -r1.27.2.66
--- addr_compl.c 16 Sep 2012 21:56:20 -0000 1.27.2.65
+++ addr_compl.c 15 Nov 2012 13:41:04 -0000 1.27.2.66
@@ -859,11 +859,20 @@
gint x, y, width, height, depth;
/* Get current geometry of window */
+#if !GTK_CHECK_VERSION(3, 0, 0)
gdk_window_get_geometry( gtk_widget_get_window( cw->window ), &x, &y, &width, &height, &depth );
+#else
+ gdk_window_get_geometry( gtk_widget_get_window( cw->window ), &x, &y, &width, &height );
+#endif
/* simple _hide breaks size requisition !? */
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_hide_all( cw->window );
gtk_widget_show_all( cw->window );
+#else
+ gtk_widget_hide( cw->window );
+ gtk_widget_show( cw->window );
+#endif
gtk_widget_size_request( cw->list_view, &r );
/* Adjust window height to available screen space */
@@ -1369,7 +1378,11 @@
GTK_SHADOW_OUT);
/* Use entry widget to create initial window */
gdkwin = gtk_widget_get_window(entry),
+#if !GTK_CHECK_VERSION(3, 0, 0)
gdk_window_get_geometry(gdkwin, &x, &y, &width, &height, &depth);
+#else
+ gdk_window_get_geometry(gdkwin, &x, &y, &width, &height);
+#endif
gdk_window_get_origin (gdkwin, &x, &y);
y += height;
gtk_window_move(GTK_WINDOW(window), x, y);
Index: prefs_filtering_action.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_filtering_action.c,v
retrieving revision 1.1.4.79
retrieving revision 1.1.4.80
diff -u -d -r1.1.4.79 -r1.1.4.80
--- prefs_filtering_action.c 12 Sep 2012 09:23:12 -0000 1.1.4.79
+++ prefs_filtering_action.c 15 Nov 2012 13:41:05 -0000 1.1.4.80
@@ -488,14 +488,22 @@
gtk_table_attach(GTK_TABLE(table), hbox1, 1, 2, 1, 2,
GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
+#if !GTK_CHECK_VERSION(2, 24, 0)
account_combo = gtk_combo_box_new_text ();
+#else
+ account_combo = gtk_combo_box_text_new ();
+#endif
gtk_size_group_add_widget(size_action, account_combo);
for (accounts = account_get_list() ; accounts != NULL;
accounts = accounts->next) {
PrefsAccount *ac = (PrefsAccount *)accounts->data;
gchar *name = g_strdup(ac->account_name);
+#if !GTK_CHECK_VERSION(2, 24, 0)
gtk_combo_box_append_text(GTK_COMBO_BOX(account_combo), (gpointer) name);
+#else
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(account_combo), (gpointer) name);
+#endif
g_free(name);
}
@@ -533,14 +541,22 @@
gtk_box_pack_start(GTK_BOX(hbox1), color_optmenu, FALSE, FALSE, 0);
#endif
+#if !GTK_CHECK_VERSION(2, 24, 0)
tags_combo = gtk_combo_box_new_text ();
+#else
+ tags_combo = gtk_combo_box_text_new ();
+#endif
gtk_size_group_add_widget(size_action, tags_combo);
for (tmp = tags = tags_get_list() ; tmp != NULL;
tmp = tmp->next) {
gchar *name = g_strdup(tags_get_tag(GPOINTER_TO_INT(tmp->data)));
+#if !GTK_CHECK_VERSION(2, 24, 0)
gtk_combo_box_append_text(GTK_COMBO_BOX(tags_combo), (gpointer) name);
+#else
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(tags_combo), (gpointer) name);
+#endif
g_free(name);
}
g_slist_free(tags);
@@ -966,7 +982,11 @@
break;
case ACTION_SET_TAG:
case ACTION_UNSET_TAG:
+#if !GTK_CHECK_VERSION(2, 24, 0)
destination = gtk_combo_box_get_active_text(GTK_COMBO_BOX(filtering_action.tags_combo));
+#else
+ destination = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(filtering_action.tags_combo));
+#endif
if (!destination || *destination == '\0') {
if (alert)
alertpanel_error(_("Tag name is empty."));
@@ -1308,10 +1328,12 @@
gtk_combo_box_set_active(GTK_COMBO_BOX(widget), 0);
else if(GTK_IS_SPIN_BUTTON(widget))
gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), 0);
- else if(GTK_IS_ENTRY(widget)) {
+ else if(GTK_IS_ENTRY(widget))
gtk_entry_set_text(GTK_ENTRY(widget), "");
- } else if(GTK_IS_CMOPTION_MENU(widget))
+#if !GTK_CHECK_VERSION(3, 0, 0)
+ else if(GTK_IS_CMOPTION_MENU(widget))
gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(widget), 0);
+#endif
gtk_widget_set_sensitive(widget, TRUE);
gtk_widget_show(widget);
More information about the Commits
mailing list