[Commits] action.c 1.12.2.68 1.12.2.69 addr_compl.c 1.27.2.55 1.27.2.56 addrgather.c 1.5.10.34 1.5.10.35 compose.c 1.382.2.582 1.382.2.583 compose.h 1.50.2.62 1.50.2.63 editldap.c 1.8.2.41 1.8.2.42 mainwindow.c 1.274.2.330 1.274.2.331 message_search.c 1.3.12.40 1.3.12.41 mimeview.c 1.83.2.172 1.83.2.173 mimeview.h 1.20.2.32 1.20.2.33 prefs_account.c 1.105.2.168 1.105.2.169 prefs_compose_writing.c 1.1.2.30 1.1.2.31 prefs_filtering_action.c 1.1.4.71 1.1.4.72 prefs_folder_item.c 1.52.2.83 1.52.2.84 prefs_logging.c 1.1.2.19 1.1.2.20 prefs_matcher.c 1.43.2.90 1.43.2.91 prefs_message.c 1.1.2.33 1.1.2.34 prefs_other.c 1.1.2.42 1.1.2.43 prefs_receive.c 1.1.2.28 1.1.2.29 prefs_summaries.c 1.1.2.67 1.1.2.68 prefs_wrapping.c 1.1.2.22 1.1.2.23 printing.c 1.1.2.33 1.1.2.34 ssl_manager.c 1.3.2.36 1.3.2.37 statusbar.c 1.5.2.29 1.5.2.30 stock_pixmap.c 1.25.2.69 1.25.2.70 summary_search.c 1.15.2.66 1.15.2.67 textview.c 1.96.2.234 1.96.2.235
colin at claws-mail.org
colin at claws-mail.org
Fri Oct 7 11:40:18 CEST 2011
Update of /home/claws-mail/claws/src
In directory claws-mail:/tmp/cvs-serv26650/src
Modified Files:
Tag: gtk2
action.c addr_compl.c addrgather.c compose.c compose.h
editldap.c mainwindow.c message_search.c mimeview.c mimeview.h
prefs_account.c prefs_compose_writing.c
prefs_filtering_action.c prefs_folder_item.c prefs_logging.c
prefs_matcher.c prefs_message.c prefs_other.c prefs_receive.c
prefs_summaries.c prefs_wrapping.c printing.c ssl_manager.c
statusbar.c stock_pixmap.c summary_search.c textview.c
Log Message:
2011-10-07 [colin] 3.7.10cvs21
* configure.ac
* src/action.c
* src/addr_compl.c
* src/addrgather.c
* src/compose.c
* src/compose.h
* src/editldap.c
* src/mainwindow.c
* src/message_search.c
* src/mimeview.c
* src/mimeview.h
* src/prefs_account.c
* src/prefs_compose_writing.c
* src/prefs_filtering_action.c
* src/prefs_folder_item.c
* src/prefs_logging.c
* src/prefs_matcher.c
* src/prefs_message.c
* src/prefs_other.c
* src/prefs_receive.c
* src/prefs_summaries.c
* src/prefs_wrapping.c
* src/printing.c
* src/ssl_manager.c
* src/statusbar.c
* src/stock_pixmap.c
* src/summary_search.c
* src/textview.c
* src/gtk/Makefile.am
* src/gtk/colorlabel.c
* src/gtk/gtkutils.c
* src/gtk/gtkutils.h
* src/gtk/logwindow.c
* src/gtk/menu.c
* src/gtk/menu.h
* src/gtk/quicksearch.c
* src/gtk/spell_entry.c
* src/plugins/bogofilter/bogofilter_gtk.c
* src/plugins/dillo_viewer/dillo_viewer.c
* src/plugins/pgpcore/prefs_gpg.c
* src/plugins/spamassassin/spamassassin_gtk.c
Bug #2371, "Port to GTK+ 3.0". Third patch from Hanno, starting
the real job. GtkCMOptionMenu and GTKHSRuler disabled, should be
ported (especially GtkCMOptionMenu)
Index: editldap.c
===================================================================
RCS file: /home/claws-mail/claws/src/editldap.c,v
retrieving revision 1.8.2.41
retrieving revision 1.8.2.42
diff -u -d -r1.8.2.41 -r1.8.2.42
--- editldap.c 7 Oct 2011 09:17:49 -0000 1.8.2.41
+++ editldap.c 7 Oct 2011 09:40:14 -0000 1.8.2.42
@@ -396,7 +396,7 @@
GtkWidget *entry_name;
GtkWidget *entry_server;
GtkWidget *hbox_spin;
- GtkObject *spinbtn_port_adj;
+ GtkAdjustment *spinbtn_port_adj;
GtkWidget *spinbtn_port;
#ifdef USE_LDAP_TLS
GtkWidget *enable_ssl_checkbtn, *enable_tls_checkbtn;
@@ -550,7 +550,7 @@
GtkWidget *label;
GtkWidget *entry_criteria;
GtkWidget *hbox_spin;
- GtkObject *spinbtn_queryage_adj;
+ GtkAdjustment *spinbtn_queryage_adj;
GtkWidget *spinbtn_queryage;
GtkWidget *check_dynsearch;
GtkWidget *check_matchoption;
@@ -675,9 +675,9 @@
GtkWidget *entry_bindDN;
GtkWidget *entry_bindPW;
GtkWidget *hbox_spin;
- GtkObject *spinbtn_timeout_adj;
+ GtkAdjustment *spinbtn_timeout_adj;
GtkWidget *spinbtn_timeout;
- GtkObject *spinbtn_maxentry_adj;
+ GtkAdjustment *spinbtn_maxentry_adj;
GtkWidget *spinbtn_maxentry;
CLAWS_TIP_DECL();
gint top;
Index: prefs_other.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_other.c,v
retrieving revision 1.1.2.42
retrieving revision 1.1.2.43
diff -u -d -r1.1.2.42 -r1.1.2.43
--- prefs_other.c 7 Oct 2011 09:17:49 -0000 1.1.2.42
+++ prefs_other.c 7 Oct 2011 09:40:15 -0000 1.1.2.43
@@ -446,7 +446,7 @@
GtkWidget *label_iotimeout;
GtkWidget *spinbtn_iotimeout;
- GtkObject *spinbtn_iotimeout_adj;
+ GtkAdjustment *spinbtn_iotimeout_adj;
GtkWidget *vbox2;
GtkWidget *checkbtn_askonclean;
Index: action.c
===================================================================
RCS file: /home/claws-mail/claws/src/action.c,v
retrieving revision 1.12.2.68
retrieving revision 1.12.2.69
diff -u -d -r1.12.2.68 -r1.12.2.69
--- action.c 7 Oct 2011 09:17:48 -0000 1.12.2.68
+++ action.c 7 Oct 2011 09:40:14 -0000 1.12.2.69
@@ -1421,8 +1421,15 @@
#endif
progress_bar = gtk_progress_bar_new();
+#if !GTK_CHECK_VERSION(3, 0, 0)
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_ORIENTATION_HORIZONTAL);
+ gtk_progress_bar_set_inverted(GTK_PROGRESS_BAR(progress_bar),
+ FALSE);
+#endif
text = g_strdup_printf(format, _("Completed"),
children->initial_nb);
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress_bar),
Index: addr_compl.c
===================================================================
RCS file: /home/claws-mail/claws/src/addr_compl.c,v
retrieving revision 1.27.2.55
retrieving revision 1.27.2.56
diff -u -d -r1.27.2.55 -r1.27.2.56
--- addr_compl.c 7 Oct 2011 09:17:48 -0000 1.27.2.55
+++ addr_compl.c 7 Oct 2011 09:40:14 -0000 1.27.2.56
@@ -1157,7 +1157,7 @@
*/
void address_completion_unregister_entry(GtkEntry *entry)
{
- GtkObject *entry_obj;
+ GObject *entry_obj;
cm_return_if_fail(entry != NULL);
cm_return_if_fail(GTK_IS_ENTRY(entry));
Index: prefs_folder_item.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_folder_item.c,v
retrieving revision 1.52.2.83
retrieving revision 1.52.2.84
diff -u -d -r1.52.2.83 -r1.52.2.84
--- prefs_folder_item.c 9 May 2011 18:59:13 -0000 1.52.2.83
+++ prefs_folder_item.c 7 Oct 2011 09:40:15 -0000 1.52.2.84
@@ -1665,8 +1665,12 @@
static void folder_regexp_test_cb(GtkWidget *widget, gpointer data)
{
+#if !GTK_CHECK_VERSION(3, 0, 0)
static GdkColor red;
static gboolean colors_initialised = FALSE;
+#else
+ static GdkColor red = { (guint32)0, (guint16)0xff, (guint16)0x70, (guint16)0x70 };
+#endif
static gchar buf[BUFFSIZE];
FolderItemGeneralPage *page = (FolderItemGeneralPage *)data;
gchar *test_string, *regexp;
@@ -1692,17 +1696,20 @@
return;
}
+#if !GTK_CHECK_VERSION(3, 0, 0)
if (!colors_initialised) {
gdk_color_parse("#ff7070", &red);
colors_initialised = gdk_colormap_alloc_color(
gdk_colormap_get_system(), &red, FALSE, TRUE);
}
+#endif
preg = summary_compile_simplify_regexp(regexp);
- if (colors_initialised) {
+#if !GTK_CHECK_VERSION(3, 0, 0)
+ if (colors_initialised)
gtk_widget_modify_base(page->entry_simplify_subject,
GTK_STATE_NORMAL, preg ? NULL : &red);
- }
+#endif
if (preg != NULL) {
string_remove_match(buf, BUFFSIZE, test_string, preg);
Index: prefs_logging.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_logging.c,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -d -r1.1.2.19 -r1.1.2.20
--- prefs_logging.c 16 Feb 2011 07:16:13 -0000 1.1.2.19
+++ prefs_logging.c 7 Oct 2011 09:40:15 -0000 1.1.2.20
@@ -97,14 +97,14 @@
GtkWidget *hbox_clip_network_log;
GtkWidget *checkbtn_clip_network_log;
GtkWidget *spinbtn_network_log_length;
- GtkObject *spinbtn_network_log_length_adj;
+ GtkAdjustment *spinbtn_network_log_length_adj;
GtkWidget *hbox_checkbtn;
#ifndef G_OS_WIN32
GtkWidget *vbox1_filtering_log;
GtkWidget *hbox_clip_filtering_log;
GtkWidget *checkbtn_clip_filtering_log;
GtkWidget *spinbtn_filtering_log_length;
- GtkObject *spinbtn_filtering_log_length_adj;
+ GtkAdjustment *spinbtn_filtering_log_length_adj;
GtkWidget *hbox_filtering_log;
GtkWidget *checkbtn_filtering_log;
GtkWidget *frame_filtering_log;
Index: compose.h
===================================================================
RCS file: /home/claws-mail/claws/src/compose.h,v
retrieving revision 1.50.2.62
retrieving revision 1.50.2.63
diff -u -d -r1.50.2.62 -r1.50.2.63
--- compose.h 16 Feb 2011 07:15:57 -0000 1.50.2.62
+++ compose.h 7 Oct 2011 09:40:14 -0000 1.50.2.63
@@ -133,8 +133,10 @@
/* Textedit */
GtkWidget *edit_vbox;
+#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget *ruler_hbox;
GtkWidget *ruler;
+#endif
GtkWidget *scrolledwin;
GtkWidget *text;
GtkWidget *from_name;
Index: prefs_matcher.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_matcher.c,v
retrieving revision 1.43.2.90
retrieving revision 1.43.2.91
diff -u -d -r1.43.2.90 -r1.43.2.91
--- prefs_matcher.c 7 Oct 2011 09:17:49 -0000 1.43.2.90
+++ prefs_matcher.c 7 Oct 2011 09:40:15 -0000 1.43.2.91
@@ -32,7 +32,9 @@
#include <string.h>
#include <errno.h>
+#if !GTK_CHECK_VERSION(3, 0, 0)
#include "gtkcmoptionmenu.h"
+#endif
#include "main.h"
#include "prefs_gtk.h"
#include "prefs_matcher.h"
@@ -93,7 +95,9 @@
#ifndef G_OS_WIN32
GtkWidget *regexp_checkbtn;
#endif
+#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget *color_optmenu;
+#endif
GtkWidget *test_btn;
GtkWidget *addressbook_select_btn;
@@ -429,9 +433,11 @@
prefs_matcher_models_create();
prefs_matcher_create();
} else {
+#if !GTK_CHECK_VERSION(3, 0, 0)
/* update color label menu */
gtk_cmoption_menu_set_menu(GTK_CMOPTION_MENU(matcher.color_optmenu),
colorlabel_create_color_menu());
+#endif
}
manage_window_set_transient(GTK_WINDOW(matcher.window));
@@ -523,7 +529,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;
@@ -665,11 +673,13 @@
match_combo = gtkut_sc_combobox_create(NULL, TRUE);
gtk_box_pack_start(GTK_BOX(match_hbox), match_combo, TRUE, TRUE, 0);
+#if !GTK_CHECK_VERSION(3, 0, 0)
/* color labels combo */
color_optmenu = gtk_cmoption_menu_new();
gtk_cmoption_menu_set_menu(GTK_CMOPTION_MENU(color_optmenu),
colorlabel_create_color_menu());
gtk_box_pack_start(GTK_BOX(match_hbox), color_optmenu, FALSE, FALSE, 0);
+#endif
/* address header name */
header_addr_combo = combobox_text_new(TRUE,
@@ -824,7 +834,9 @@
matcher.bool_op_combo = bool_op_combo;
matcher.test_btn = test_btn;
matcher.addressbook_select_btn = addressbook_select_btn;
+#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;
@@ -914,7 +926,9 @@
gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo), 0);
if (match_combo2_model_set())
gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo2), 0);
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(matcher.color_optmenu), 0);
+#endif
gtk_spin_button_set_value(GTK_SPIN_BUTTON(matcher.numeric_entry), 0);
gtk_entry_set_text(GTK_ENTRY(matcher.header_entry), "");
gtk_entry_set_text(GTK_ENTRY(matcher.header_addr_entry), "");
@@ -1055,9 +1069,11 @@
case MATCHCRITERIA_PARTIAL:
case MATCHCRITERIA_NOT_PARTIAL:
return CRITERIA_PARTIAL;
+#if !GTK_CHECK_VERSION(3, 0, 0)
case MATCHCRITERIA_COLORLABEL:
case MATCHCRITERIA_NOT_COLORLABEL:
return CRITERIA_COLORLABEL;
+#endif
case MATCHCRITERIA_IGNORE_THREAD:
case MATCHCRITERIA_NOT_IGNORE_THREAD:
return CRITERIA_IGNORE_THREAD;
@@ -1168,8 +1184,10 @@
return MATCHCRITERIA_SIGNED;
case CRITERIA_PARTIAL:
return MATCHCRITERIA_PARTIAL;
+#if !GTK_CHECK_VERSION(3, 0, 0)
case CRITERIA_COLORLABEL:
return MATCHCRITERIA_COLORLABEL;
+#endif
case CRITERIA_IGNORE_THREAD:
return MATCHCRITERIA_IGNORE_THREAD;
case CRITERIA_WATCH_THREAD:
@@ -1260,8 +1278,10 @@
return MATCHCRITERIA_NOT_SIGNED;
case MATCHCRITERIA_PARTIAL:
return MATCHCRITERIA_NOT_PARTIAL;
+#if !GTK_CHECK_VERSION(3, 0, 0)
case MATCHCRITERIA_COLORLABEL:
return MATCHCRITERIA_NOT_COLORLABEL;
+#endif
case MATCHCRITERIA_IGNORE_THREAD:
return MATCHCRITERIA_NOT_IGNORE_THREAD;
case MATCHCRITERIA_WATCH_THREAD:
@@ -1323,8 +1343,10 @@
case MATCH_HEADER:
header = gtk_entry_get_text(GTK_ENTRY(matcher.header_entry));
return header_name_to_crit(header);
+#if !GTK_CHECK_VERSION(3, 0, 0)
case MATCH_LABEL:
return CRITERIA_COLORLABEL;
+#endif
case MATCH_PARTIAL:
return CRITERIA_PARTIAL;
case MATCH_TEST:
@@ -1508,11 +1530,13 @@
value *= KB_SIZE;
break;
+#if !GTK_CHECK_VERSION(3, 0, 0)
case CRITERIA_COLORLABEL:
value = colorlabel_get_color_menu_active_item
(gtk_cmoption_menu_get_menu(GTK_CMOPTION_MENU
(matcher.color_optmenu)));
break;
+#endif
case CRITERIA_HEADER:
header = gtk_entry_get_text(GTK_ENTRY(matcher.header_entry));
@@ -1870,8 +1894,10 @@
(value == MATCH_TEST));
prefs_matcher_enable_widget(matcher.addressbook_select_btn,
(value == MATCH_ABOOK));
+#if !GTK_CHECK_VERSION(3, 0, 0)
prefs_matcher_enable_widget(matcher.color_optmenu,
(value == MATCH_LABEL));
+#endif
prefs_matcher_enable_widget(matcher.upper_filler,
MATCH_CASE_REGEXP(value));
prefs_matcher_enable_widget(matcher.lower_filler,
@@ -1913,12 +1939,14 @@
#endif
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
break;
+#if !GTK_CHECK_VERSION(3, 0, 0)
case MATCH_LABEL:
gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(matcher.color_optmenu), 0);
prefs_matcher_set_model(matcher.match_combo2, matcher.model_set);
gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Label"));
gtk_label_set_text(GTK_LABEL(matcher.match_label2), _("is"));
break;
+#endif
case MATCH_PARTIAL:
prefs_matcher_set_model(matcher.criteria_combo2, matcher.model_partial);
gtk_label_set_text(GTK_LABEL(matcher.criteria_label2), _("Value:"));
@@ -2248,9 +2276,11 @@
case CRITERIA_TEST:
match_criteria = MATCH_TEST;
break;
+#if !GTK_CHECK_VERSION(3, 0, 0)
case CRITERIA_COLORLABEL:
match_criteria = MATCH_LABEL;
break;
+#endif
case CRITERIA_TAG:
case CRITERIA_TAGGED:
match_criteria = MATCH_TAGS;
@@ -2479,6 +2509,7 @@
}
break;
+#if !GTK_CHECK_VERSION(3, 0, 0)
case MATCHCRITERIA_NOT_COLORLABEL:
case MATCHCRITERIA_COLORLABEL:
gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(matcher.color_optmenu),
@@ -2486,6 +2517,7 @@
menu = gtk_cmoption_menu_get_menu(GTK_CMOPTION_MENU(matcher.color_optmenu));
g_signal_emit_by_name(G_OBJECT(menu), "selection-done", menu);
break;
+#endif
case MATCHCRITERIA_NOT_HEADER:
case MATCHCRITERIA_HEADER:
Index: compose.c
===================================================================
RCS file: /home/claws-mail/claws/src/compose.c,v
retrieving revision 1.382.2.582
retrieving revision 1.382.2.583
diff -u -d -r1.382.2.582 -r1.382.2.583
--- compose.c 7 Oct 2011 09:17:48 -0000 1.382.2.582
+++ compose.c 7 Oct 2011 09:40:14 -0000 1.382.2.583
@@ -86,7 +86,9 @@
#include "socket.h"
#include "alertpanel.h"
#include "manage_window.h"
+#if !GTK_CHECK_VERSION(3, 0, 0)
#include "gtkshruler.h"
+#endif
#include "folder.h"
#include "addr_compl.h"
#include "quote_fmt.h"
@@ -351,9 +353,11 @@
/* callback functions */
+#if !GTK_CHECK_VERSION(3, 0, 0)
static gboolean compose_edit_size_alloc (GtkEditable *widget,
GtkAllocation *allocation,
GtkSHRuler *shruler);
+#endif
static void account_activated (GtkComboBox *optmenu,
gpointer data);
static void attach_selected (GtkTreeView *tree_view,
@@ -437,8 +441,10 @@
static void compose_toggle_autoindent_cb(GtkToggleAction *action,
gpointer data);
+#if !GTK_CHECK_VERSION(3, 0, 0)
static void compose_toggle_ruler_cb (GtkToggleAction *action,
gpointer data);
+#endif
static void compose_toggle_sign_cb (GtkToggleAction *action,
gpointer data);
static void compose_toggle_encrypt_cb (GtkToggleAction *action,
@@ -668,7 +674,9 @@
{"Options/Encrypt", NULL, N_("_Encrypt"), NULL, NULL, G_CALLBACK(compose_toggle_encrypt_cb) }, /* Toggle */
{"Options/RequestRetRcpt", NULL, N_("_Request Return Receipt"), NULL, NULL, G_CALLBACK(compose_toggle_return_receipt_cb) }, /* TOGGLE */
{"Options/RemoveReferences", NULL, N_("Remo_ve references"), NULL, NULL, G_CALLBACK(compose_toggle_remove_refs_cb) }, /* TOGGLE */
+#if !GTK_CHECK_VERSION(3, 0, 0)
{"Tools/ShowRuler", NULL, N_("Show _ruler"), NULL, NULL, G_CALLBACK(compose_toggle_ruler_cb) }, /* Toggle */
+#endif
};
static GtkRadioActionEntry compose_radio_rm_entries[] =
@@ -786,9 +794,11 @@
{
GtkTextBuffer *buffer;
GdkColor black = {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
+#if !GTK_CHECK_VERSION(3, 0, 0)
GdkColormap *cmap;
- GdkColor color[8];
gboolean success[8];
+#endif
+ GdkColor color[8];
int i;
buffer = gtk_text_view_get_buffer(text);
@@ -859,6 +869,7 @@
color[5] = quote_bgcolor3;
color[6] = signature_color;
color[7] = uri_color;
+#if !GTK_CHECK_VERSION(3, 0, 0)
cmap = gdk_drawable_get_colormap(gtk_widget_get_window(compose->window));
gdk_colormap_alloc_colors(cmap, color, 8, FALSE, TRUE, success);
@@ -873,6 +884,7 @@
signature_color = uri_color = black;
}
}
+#endif
}
Compose *compose_new(PrefsAccount *account, const gchar *mailto,
@@ -2424,7 +2436,9 @@
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/InsertSig", FALSE);
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit", FALSE);
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options", FALSE);
+#if !GTK_CHECK_VERSION(3, 0, 0)
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Tools/ShowRuler", FALSE);
+#endif
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Tools/Actions", FALSE);
if (compose->toolbar->draft_btn)
@@ -2533,12 +2547,18 @@
static void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
{
+#if !GTK_CHECK_VERSION(3, 0, 0)
static GdkColor yellow;
static GdkColor black;
static gboolean yellow_initialised = FALSE;
+#else
+ static GdkColor yellow = { (guint32)0, (guint16)0xf5, (guint16)0xf6, (guint16)0xbe };
+ static GdkColor black = { (guint32)0, (guint16)0x0, (guint16)0x0, (guint16)0x0 };
+#endif
GSList *h_list;
GtkEntry *entry;
+#if !GTK_CHECK_VERSION(3, 0, 0)
if (!yellow_initialised) {
gdk_color_parse("#f5f6be", &yellow);
gdk_color_parse("#000000", &black);
@@ -2547,19 +2567,24 @@
yellow_initialised &= gdk_colormap_alloc_color(
gdk_colormap_get_system(), &black, FALSE, TRUE);
}
+#endif
for (h_list = compose->header_list; h_list != NULL; h_list = h_list->next) {
entry = GTK_ENTRY(((ComposeHeaderEntry *)h_list->data)->entry);
if (gtk_entry_get_text(entry) &&
!g_utf8_collate(gtk_entry_get_text(entry), mailto)) {
+#if !GTK_CHECK_VERSION(3, 0, 0)
if (yellow_initialised) {
+#endif
gtk_widget_modify_base(
GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
GTK_STATE_NORMAL, &yellow);
gtk_widget_modify_text(
GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
GTK_STATE_NORMAL, &black);
+#if !GTK_CHECK_VERSION(3, 0, 0)
}
+#endif
}
}
}
@@ -7059,8 +7084,10 @@
GtkWidget *paned;
GtkWidget *edit_vbox;
+#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget *ruler_hbox;
GtkWidget *ruler;
+#endif
GtkWidget *scrolledwin;
GtkWidget *text;
GtkTextBuffer *buffer;
@@ -7316,7 +7343,9 @@
/* phew. */
/* Tools menu */
+#if !GTK_CHECK_VERSION(3, 0, 0)
MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Tools", "ShowRuler", "Tools/ShowRuler", GTK_UI_MANAGER_MENUITEM)
+#endif
MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Tools", "AddressBook", "Tools/AddressBook", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Tools", "Template", "Tools/Template", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Tools/Template", "PlaceHolder", "Tools/Template/PlaceHolder", GTK_UI_MANAGER_MENUITEM)
@@ -7418,6 +7447,7 @@
gtk_box_pack_start(GTK_BOX(edit_vbox), subject_hbox, FALSE, FALSE, 0);
+#if !GTK_CHECK_VERSION(3, 0, 0)
/* ruler */
ruler_hbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(edit_vbox), ruler_hbox, FALSE, FALSE, 0);
@@ -7426,6 +7456,7 @@
gtk_ruler_set_range(GTK_RULER(ruler), 0.0, 100.0, 1.0, 100.0);
gtk_box_pack_start(GTK_BOX(ruler_hbox), ruler, TRUE, TRUE,
BORDER_WIDTH);
+#endif
/* text widget */
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
@@ -7449,10 +7480,11 @@
gtk_text_buffer_add_selection_clipboard(buffer, clipboard);
gtk_container_add(GTK_CONTAINER(scrolledwin), text);
-
+#if !GTK_CHECK_VERSION(3, 0, 0)
g_signal_connect_after(G_OBJECT(text), "size_allocate",
G_CALLBACK(compose_edit_size_alloc),
ruler);
+#endif
g_signal_connect(G_OBJECT(buffer), "changed",
G_CALLBACK(compose_changed_cb), compose);
g_signal_connect(G_OBJECT(text), "grab_focus",
@@ -7546,8 +7578,10 @@
compose->notebook = notebook;
compose->edit_vbox = edit_vbox;
+#if !GTK_CHECK_VERSION(3, 0, 0)
compose->ruler_hbox = ruler_hbox;
compose->ruler = ruler;
+#endif
compose->scrolledwin = scrolledwin;
compose->text = text;
@@ -7666,10 +7700,12 @@
compose_list = g_list_append(compose_list, compose);
+#if !GTK_CHECK_VERSION(3, 0, 0)
if (!prefs_common.show_ruler)
gtk_widget_hide(ruler_hbox);
cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Tools/ShowRuler", prefs_common.show_ruler);
+#endif
/* Priority */
compose->priority = PRIORITY_NORMAL;
@@ -9113,6 +9149,7 @@
* includes "non-client" (windows-izm) in calculation, so this calculation
* may not be accurate.
*/
+#if !GTK_CHECK_VERSION(3, 0, 0)
static gboolean compose_edit_size_alloc(GtkEditable *widget,
GtkAllocation *allocation,
GtkSHRuler *shruler)
@@ -9134,6 +9171,7 @@
return TRUE;
}
+#endif
typedef struct {
gchar *header;
@@ -10555,6 +10593,7 @@
compose_update_privacy_system_menu_item(compose, warn);
}
+#if !GTK_CHECK_VERSION(3, 0, 0)
static void compose_toggle_ruler_cb(GtkToggleAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
@@ -10568,6 +10607,7 @@
prefs_common.show_ruler = FALSE;
}
}
+#endif
static void compose_attach_drag_received_cb (GtkWidget *widget,
GdkDragContext *context,
Index: stock_pixmap.c
===================================================================
RCS file: /home/claws-mail/claws/src/stock_pixmap.c,v
retrieving revision 1.25.2.69
retrieving revision 1.25.2.70
diff -u -d -r1.25.2.69 -r1.25.2.70
--- stock_pixmap.c 7 Oct 2011 09:08:56 -0000 1.25.2.69
+++ stock_pixmap.c 7 Oct 2011 09:40:15 -0000 1.25.2.70
@@ -195,8 +195,13 @@
struct _StockPixmapData
{
gchar **data;
+#if !GTK_CHECK_VERSION(3, 0, 0)
GdkPixmap *pixmap;
GdkBitmap *mask;
+#else
+ cairo_surface_t *pixmap;
+ cairo_pattern_t *mask;
+#endif
gchar *file;
gchar *icon_path;
GdkPixbuf *pixbuf;
@@ -207,10 +212,15 @@
struct _OverlayData
{
gboolean is_pixmap;
+#if !GTK_CHECK_VERSION(3, 0, 0)
GdkPixmap *base_pixmap;
GdkBitmap *base_mask;
GdkPixmap *overlay_pixmap;
GdkBitmap *overlay_mask;
+#else
+ cairo_surface_t *base_pixmap;
+ cairo_surface_t *overlay_pixmap;
+#endif
GdkPixbuf *base_pixbuf;
GdkPixbuf *overlay_pixbuf;
@@ -590,24 +600,43 @@
return -1;
}
+#if !GTK_CHECK_VERSION(3, 0, 0)
static gboolean pixmap_with_overlay_expose_event_cb(GtkWidget *widget, GdkEventExpose *expose,
OverlayData *data)
+#else
+static gboolean pixmap_with_overlay_expose_event_cb(GtkWidget *widget, cairo_t *cr,
+ OverlayData *data)
+#endif
{
- GdkDrawable *drawable = gtk_widget_get_window(widget);
+#if !GTK_CHECK_VERSION(3, 0, 0)
cairo_t *cr;
+#endif
+ GdkWindow *drawable = gtk_widget_get_window(widget);
gint left = 0;
gint top = 0;
if (data->is_pixmap) {
cm_return_val_if_fail(data->base_pixmap != NULL, FALSE);
+#if !GTK_CHECK_VERSION(3, 0, 0)
cm_return_val_if_fail(data->base_mask != NULL, FALSE);
+#endif
} else {
cm_return_val_if_fail(data->base_pixbuf != NULL, FALSE);
}
+#if !GTK_CHECK_VERSION(3, 0, 0)
cr = gdk_cairo_create(drawable);
gdk_window_clear_area (drawable, expose->area.x, expose->area.y,
expose->area.width, expose->area.height);
+#else
+ cairo_pattern_t *pattern = gdk_window_get_background_pattern(drawable);
+ if (pattern == NULL)
+ pattern = gdk_window_get_background_pattern(gdk_window_get_parent(drawable));
+
+ cairo_set_source(cr, pattern);
+ cairo_fill(cr);
+ cairo_pattern_destroy(pattern);
+#endif
if (data->highlight) {
MainWindow *mw = NULL;
@@ -631,13 +660,25 @@
}
if (data->is_pixmap) {
+#if !GTK_CHECK_VERSION(3, 0, 0)
gdk_cairo_set_source_pixmap(cr, data->base_pixmap, data->border_x, data->border_y);
+#else
+ cairo_set_source_surface(cr, data->base_pixmap, data->border_x, data->border_y);
+#endif
cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_REPEAT);
+#if !GTK_CHECK_VERSION(3, 0, 0)
cairo_rectangle(cr, data->border_x, data->border_y,
data->base_width, data->base_height);
+#else
+ cairo_rectangle(cr, 0, 0, data->base_width, data->base_height);
+#endif
cairo_fill(cr);
} else {
+#if !GTK_CHECK_VERSION(3, 0, 0)
gdk_cairo_set_source_pixbuf(cr, data->base_pixbuf, data->border_x, data->border_y);
+#else
+ gdk_cairo_set_source_pixbuf(cr, data->base_pixbuf, 0, 0);
+#endif
cairo_paint(cr);
}
@@ -653,13 +694,21 @@
case OVERLAY_TOP_CENTER:
case OVERLAY_MID_CENTER:
case OVERLAY_BOTTOM_CENTER:
+#if !GTK_CHECK_VERSION(3, 0, 0)
left = (data->base_width + data->border_x * 2 - data->overlay_width)/2;
+#else
+ left = (data->base_width - data->overlay_width)/2;
+#endif
break;
case OVERLAY_TOP_RIGHT:
case OVERLAY_MID_RIGHT:
case OVERLAY_BOTTOM_RIGHT:
+#if !GTK_CHECK_VERSION(3, 0, 0)
left = data->base_width + data->border_x * 2 - data->overlay_width;
+#else
+ left = data->base_width - data->overlay_width;
+#endif
break;
default:
@@ -675,13 +724,21 @@
case OVERLAY_MID_LEFT:
case OVERLAY_MID_CENTER:
case OVERLAY_MID_RIGHT:
+#if !GTK_CHECK_VERSION(3, 0, 0)
top = (data->base_height + data->border_y * 2 - data->overlay_height)/2;
+#else
+ top = (data->base_height - data->overlay_height)/2;
+#endif
break;
case OVERLAY_BOTTOM_LEFT:
case OVERLAY_BOTTOM_CENTER:
case OVERLAY_BOTTOM_RIGHT:
+#if !GTK_CHECK_VERSION(3, 0, 0)
top = data->base_height + data->border_y * 2 - data->overlay_height;
+#else
+ top = data->base_height - data->overlay_height;
+#endif
break;
default:
@@ -692,8 +749,12 @@
if (data->position != OVERLAY_NONE) {
if (data->is_pixmap) {
cm_return_val_if_fail(data->overlay_pixmap != NULL, FALSE);
+#if !GTK_CHECK_VERSION(3, 0, 0)
cm_return_val_if_fail(data->overlay_mask != NULL, FALSE);
gdk_cairo_set_source_pixmap(cr, data->overlay_pixmap, left, top);
+#else
+ cairo_set_source_surface(cr, data->overlay_pixmap, left, top);
+#endif
cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
cairo_rectangle (cr, left, top, data->overlay_width, data->overlay_height);
cairo_fill(cr);
@@ -704,20 +765,33 @@
}
}
+#if !GTK_CHECK_VERSION(3, 0, 0)
cairo_destroy(cr);
+#endif
return TRUE;
}
+#if !GTK_CHECK_VERSION(3, 0, 0)
static void pixmap_with_overlay_destroy_cb(GtkObject *object, OverlayData *data)
+#else
+static void pixmap_with_overlay_destroy_cb(GtkWidget *object, OverlayData *data)
+#endif
{
if (data->is_pixmap) {
+#if !GTK_CHECK_VERSION(3, 0, 0)
g_object_unref(data->base_pixmap);
g_object_unref(data->base_mask);
if (data->position != OVERLAY_NONE) {
g_object_unref(data->overlay_pixmap);
g_object_unref(data->overlay_mask);
}
+#else
+ cairo_surface_destroy(data->base_pixmap);
+ if (data->position != OVERLAY_NONE) {
+ cairo_surface_destroy(data->overlay_pixmap);
+ }
+#endif
} else {
g_object_unref(data->base_pixbuf);
if (data->position != OVERLAY_NONE) {
@@ -744,8 +818,12 @@
StockPixmap overlay, OverlayPosition pos,
gint border_x, gint border_y)
{
+#if !GTK_CHECK_VERSION(3, 0, 0)
GdkPixmap *stock_pixmap = NULL;
GdkBitmap *stock_mask = NULL;
+#else
+ cairo_surface_t *stock_pixmap = NULL;
+#endif
GdkPixbuf *stock_pixbuf = NULL;
GtkWidget *widget = NULL;
GtkWidget *stock_wid = NULL;
@@ -763,25 +841,45 @@
data->is_pixmap = FALSE;
if (data->is_pixmap) {
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_image_get_pixmap(GTK_IMAGE(stock_wid), &stock_pixmap, &stock_mask);
g_object_ref(stock_pixmap);
g_object_ref(stock_mask);
+#else
+ cr = gdk_cairo_create(gtk_widget_get_window(stock_wid));
+ stock_pixmap = cairo_get_target(cr);
+ cairo_surface_reference(stock_pixmap);
+ cairo_destroy(cr);
+#endif
data->base_pixmap = stock_pixmap;
+#if !GTK_CHECK_VERSION(3, 0, 0)
data->base_mask = stock_mask;
+#endif
data->base_height = requisition.height;
data->base_width = requisition.width;
gtk_widget_destroy(stock_wid);
if (pos == OVERLAY_NONE) {
data->overlay_pixmap = NULL;
+#if !GTK_CHECK_VERSION(3, 0, 0)
data->overlay_mask = NULL;
+#endif
} else {
stock_wid = stock_pixmap_widget(window, overlay);
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_image_get_pixmap(GTK_IMAGE(stock_wid), &stock_pixmap, &stock_mask);
g_object_ref(stock_pixmap);
g_object_ref(stock_mask);
+#else
+ cr = gdk_cairo_create(gtk_widget_get_window(stock_wid));
+ stock_pixmap = cairo_get_target(cr);
+ cairo_surface_reference(stock_pixmap);
+ cairo_destroy(cr);
+#endif
data->overlay_pixmap = stock_pixmap;
+#if !GTK_CHECK_VERSION(3, 0, 0)
data->overlay_mask = stock_mask;
+#endif
data->overlay_height = requisition.height;
data->overlay_width = requisition.width;
@@ -797,7 +895,9 @@
gtk_widget_destroy(stock_wid);
if (pos == OVERLAY_NONE) {
data->overlay_pixmap = NULL;
+#if !GTK_CHECK_VERSION(3, 0, 0)
data->overlay_mask = NULL;
+#endif
} else {
stock_wid = stock_pixmap_widget(window, overlay);
stock_pixbuf = gtk_image_get_pixbuf(GTK_IMAGE(stock_wid));
@@ -817,8 +917,13 @@
widget = gtk_drawing_area_new();
gtk_widget_set_size_request(widget, data->base_width + border_x * 2,
data->base_height + border_y * 2);
+#if !GTK_CHECK_VERSION(3, 0, 0)
g_signal_connect(G_OBJECT(widget), "expose_event",
G_CALLBACK(pixmap_with_overlay_expose_event_cb), data);
+#else
+ g_signal_connect(G_OBJECT(widget), "draw",
+ G_CALLBACK(pixmap_with_overlay_expose_event_cb), data);
+#endif
g_signal_connect(G_OBJECT(widget), "destroy",
G_CALLBACK(pixmap_with_overlay_destroy_cb), data);
g_object_set_data(G_OBJECT(widget), "highlight", &(data->highlight));
Index: prefs_summaries.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_summaries.c,v
retrieving revision 1.1.2.67
retrieving revision 1.1.2.68
diff -u -d -r1.1.2.67 -r1.1.2.68
--- prefs_summaries.c 7 Oct 2011 09:17:49 -0000 1.1.2.67
+++ prefs_summaries.c 7 Oct 2011 09:40:15 -0000 1.1.2.68
@@ -318,7 +318,7 @@
GtkWidget *hbox1;
GtkWidget *label_ng_abbrev;
GtkWidget *spinbtn_ng_abbrev_len;
- GtkObject *spinbtn_ng_abbrev_len_adj;
+ GtkAdjustment *spinbtn_ng_abbrev_len_adj;
GtkWidget *vbox2;
GtkWidget *vbox3;
GtkWidget *checkbtn_useaddrbook;
@@ -333,7 +333,7 @@
GtkWidget *checkbtn_reopen_last_folder;
GtkWidget *optmenu_always_show_msg;
GtkWidget *spinbtn_mark_as_read_delay;
- GtkObject *spinbtn_mark_as_read_delay_adj;
+ GtkAdjustment *spinbtn_mark_as_read_delay_adj;
GtkWidget *checkbtn_immedexec;
GtkWidget *checkbtn_ask_mark_all_read;
GtkWidget *label, *label_fill;
Index: prefs_compose_writing.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_compose_writing.c,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -u -d -r1.1.2.30 -r1.1.2.31
--- prefs_compose_writing.c 16 Feb 2011 07:16:12 -0000 1.1.2.30
+++ prefs_compose_writing.c 7 Oct 2011 09:40:15 -0000 1.1.2.31
@@ -85,12 +85,12 @@
GtkWidget *hbox_undolevel;
GtkWidget *label_undolevel;
- GtkObject *spinbtn_undolevel_adj;
+ GtkAdjustment *spinbtn_undolevel_adj;
GtkWidget *spinbtn_undolevel;
GtkWidget *hbox_warn_large_insert;
GtkWidget *checkbtn_warn_large_insert;
- GtkObject *spinbtn_warn_large_insert_adj;
+ GtkAdjustment *spinbtn_warn_large_insert_adj;
GtkWidget *spinbtn_warn_large_insert_size;
GtkWidget *label_warn_large_insert_size;
@@ -102,7 +102,7 @@
GtkWidget *hbox_autosave;
GtkWidget *checkbtn_autosave;
- GtkObject *spinbtn_autosave_adj;
+ GtkAdjustment *spinbtn_autosave_adj;
GtkWidget *spinbtn_autosave_length;
GtkWidget *label_autosave_length;
Index: prefs_message.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_message.c,v
retrieving revision 1.1.2.33
retrieving revision 1.1.2.34
diff -u -d -r1.1.2.33 -r1.1.2.34
--- prefs_message.c 16 Feb 2011 07:16:13 -0000 1.1.2.33
+++ prefs_message.c 7 Oct 2011 09:40:15 -0000 1.1.2.34
@@ -91,7 +91,7 @@
GtkWidget *checkbtn_promote_html_part;
GtkWidget *hbox_linespc;
GtkWidget *label_linespc;
- GtkObject *spinbtn_linespc_adj;
+ GtkAdjustment *spinbtn_linespc_adj;
GtkWidget *spinbtn_linespc;
GtkWidget *frame;
@@ -99,7 +99,7 @@
GtkWidget *checkbtn_smoothscroll;
GtkWidget *hbox_scr;
GtkWidget *label_scr;
- GtkObject *spinbtn_scrollstep_adj;
+ GtkAdjustment *spinbtn_scrollstep_adj;
GtkWidget *spinbtn_scrollstep;
GtkWidget *checkbtn_halfpage;
GtkWidget *checkbtn_hide_quoted;
Index: message_search.c
===================================================================
RCS file: /home/claws-mail/claws/src/message_search.c,v
retrieving revision 1.3.12.40
retrieving revision 1.3.12.41
diff -u -d -r1.3.12.40 -r1.3.12.41
--- message_search.c 7 Oct 2011 09:17:49 -0000 1.3.12.40
+++ message_search.c 7 Oct 2011 09:40:15 -0000 1.3.12.41
@@ -27,7 +27,6 @@
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "gtk/gtksctree.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: prefs_filtering_action.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_filtering_action.c,v
retrieving revision 1.1.4.71
retrieving revision 1.1.4.72
diff -u -d -r1.1.4.71 -r1.1.4.72
--- prefs_filtering_action.c 7 Oct 2011 09:17:49 -0000 1.1.4.71
+++ prefs_filtering_action.c 7 Oct 2011 09:40:15 -0000 1.1.4.72
@@ -32,7 +32,9 @@
#include <string.h>
#include <errno.h>
+#if !GTK_CHECK_VERSION(3, 0, 0)
#include "gtkcmoptionmenu.h"
+#endif
#include "main.h"
#include "prefs_gtk.h"
#include "prefs_filtering_action.h"
@@ -113,7 +115,9 @@
GtkWidget *dest_entry;
GtkWidget *dest_btn;
GtkWidget *exec_btn;
+#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget *color_optmenu;
+#endif
GtkWidget *header_combo;
GtkWidget *header_entry;
GtkWidget *addressbook_btn;
@@ -172,7 +176,9 @@
{ N_("Message flags"), N_("Mark as spam"), ACTION_MARK_AS_SPAM },
{ N_("Message flags"), N_("Mark as ham"), ACTION_MARK_AS_HAM },
{ NULL, N_("Execute"), ACTION_EXECUTE },
+#if !GTK_CHECK_VERSION(3, 0, 0)
{ NULL, N_("Color label"), ACTION_COLOR },
+#endif
{ N_("Resend"), N_("Forward"), ACTION_FORWARD },
{ N_("Resend"), N_("Forward as attachment"), ACTION_FORWARD_AS_ATTACHMENT },
{ N_("Resend"), N_("Redirect"), ACTION_REDIRECT },
@@ -270,9 +276,11 @@
if (!filtering_action.window) {
prefs_filtering_action_create();
} else {
+#if !GTK_CHECK_VERSION(3, 0, 0)
/* update color label menu */
gtk_cmoption_menu_set_menu(GTK_CMOPTION_MENU(filtering_action.color_optmenu),
colorlabel_create_color_menu());
+#endif
}
manage_window_set_transient(GTK_WINDOW(filtering_action.window));
@@ -355,7 +363,9 @@
GtkWidget *exec_btn;
+#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget *color_optmenu;
+#endif
static GdkGeometry geometry;
@@ -503,12 +513,14 @@
score_entry = gtk_spin_button_new_with_range(-1000, 1000, 1);
gtk_box_pack_start(GTK_BOX(hbox1), score_entry, FALSE, FALSE, 0);
+#if !GTK_CHECK_VERSION(3, 0, 0)
color_optmenu = gtk_cmoption_menu_new();
gtk_size_group_add_widget(size_action, color_optmenu);
gtk_cmoption_menu_set_menu(GTK_CMOPTION_MENU(color_optmenu),
colorlabel_create_color_menu());
prefs_filtering_action_check_widget_width(color_optmenu);
gtk_box_pack_start(GTK_BOX(hbox1), color_optmenu, FALSE, FALSE, 0);
+#endif
tags_combo = gtk_combo_box_new_text ();
gtk_size_group_add_widget(size_action, tags_combo);
@@ -627,7 +639,9 @@
filtering_action.dest_entry = dest_entry;
filtering_action.dest_btn = dest_btn;
filtering_action.exec_btn = exec_btn;
+#if !GTK_CHECK_VERSION(3, 0, 0)
filtering_action.color_optmenu = color_optmenu;
+#endif
filtering_action.score_entry = score_entry;
filtering_action.header_combo = header_combo;
filtering_action.header_entry = header_entry;
@@ -826,8 +840,10 @@
return MATCHACTION_REDIRECT;
case ACTION_EXECUTE:
return MATCHACTION_EXECUTE;
+#if !GTK_CHECK_VERSION(3, 0, 0)
case ACTION_COLOR:
return MATCHACTION_COLOR;
+#endif
case ACTION_HIDE:
return MATCHACTION_HIDE;
case ACTION_IGNORE:
@@ -899,11 +915,13 @@
return NULL;
}
break;
+#if !GTK_CHECK_VERSION(3, 0, 0)
case ACTION_COLOR:
labelcolor = colorlabel_get_color_menu_active_item(
gtk_cmoption_menu_get_menu(GTK_CMOPTION_MENU(filtering_action.color_optmenu)));
destination = NULL;
break;
+#endif
case ACTION_CHANGE_SCORE:
case ACTION_SET_SCORE:
score = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(
@@ -1335,8 +1353,10 @@
prefs_filtering_action_enable_widget(filtering_action.exec_btn,
(value == ACTION_EXECUTE));
+#if !GTK_CHECK_VERSION(3, 0, 0)
prefs_filtering_action_enable_widget(filtering_action.color_optmenu,
(value == ACTION_COLOR));
+#endif
prefs_filtering_action_enable_widget(filtering_action.header_combo,
(value == ACTION_ADD_TO_ADDRESSBOOK));
@@ -1362,9 +1382,11 @@
case ACTION_MOVE:
gtk_label_set_text(GTK_LABEL(filtering_action.label3), _("Destination"));
break;
+#if !GTK_CHECK_VERSION(3, 0, 0)
case ACTION_COLOR:
gtk_label_set_text(GTK_LABEL(filtering_action.label3), _("Color"));
break;
+#endif
case ACTION_EXECUTE:
gtk_label_set_text(GTK_LABEL(filtering_action.label3), _("Execute"));
break;
@@ -1568,6 +1590,7 @@
combobox_select_by_data(GTK_COMBO_BOX(filtering_action.action_combo),
ACTION_EXECUTE);
break;
+#if !GTK_CHECK_VERSION(3, 0, 0)
case MATCHACTION_COLOR:
combobox_select_by_data(GTK_COMBO_BOX(filtering_action.action_combo),
ACTION_COLOR);
@@ -1577,6 +1600,7 @@
filtering_action.color_optmenu));
g_signal_emit_by_name(G_OBJECT(menu), "selection-done", menu);
break;
+#endif
case MATCHACTION_CHANGE_SCORE:
combobox_select_by_data(GTK_COMBO_BOX(filtering_action.action_combo),
ACTION_CHANGE_SCORE);
Index: mimeview.c
===================================================================
RCS file: /home/claws-mail/claws/src/mimeview.c,v
retrieving revision 1.83.2.172
retrieving revision 1.83.2.173
diff -u -d -r1.83.2.172 -r1.83.2.173
--- mimeview.c 7 Oct 2011 09:17:49 -0000 1.83.2.172
+++ mimeview.c 7 Oct 2011 09:40:15 -0000 1.83.2.173
@@ -73,12 +73,14 @@
#define N_MIMEVIEW_COLS 3
+#if !GTK_CHECK_VERSION(3, 0, 0)
static void mimeview_set_multipart_tree (MimeView *mimeview,
MimeInfo *mimeinfo,
GtkCMCTreeNode *parent);
static GtkCMCTreeNode *mimeview_append_part (MimeView *mimeview,
MimeInfo *partinfo,
GtkCMCTreeNode *parent);
+#endif
static void mimeview_show_message_part (MimeView *mimeview,
MimeInfo *partinfo);
static void mimeview_change_view_type (MimeView *mimeview,
@@ -89,10 +91,12 @@
static gboolean mimeview_write_part (const gchar *filename,
MimeInfo *partinfo);
+#if !GTK_CHECK_VERSION(3, 0, 0)
static void mimeview_selected (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
gint column,
MimeView *mimeview);
+#endif
static void mimeview_start_drag (GtkWidget *widget,
gint button,
GdkEvent *event,
Index: textview.c
===================================================================
RCS file: /home/claws-mail/claws/src/textview.c,v
retrieving revision 1.96.2.234
retrieving revision 1.96.2.235
diff -u -d -r1.96.2.234 -r1.96.2.235
--- textview.c 7 Oct 2011 09:17:50 -0000 1.96.2.234
+++ textview.c 7 Oct 2011 09:40:15 -0000 1.96.2.235
@@ -380,10 +380,16 @@
{
GtkTextBuffer *buffer;
GtkTextTag *tag, *qtag;
+#if !GTK_CHECK_VERSION(3, 0, 0)
static GdkColor yellow, black;
static gboolean color_init = FALSE;
+#else
+ static GdkColor yellow = { (guint32)0, (guint16)0xf5, (guint16)0xf6, (guint16)0xbe };
+ static GdkColor black = { (guint32)0, (guint16)0x0, (guint16)0x0, (guint16)0x0 };
+#endif
static PangoFontDescription *font_desc, *bold_font_desc;
+#if !GTK_CHECK_VERSION(3, 0, 0)
if (!color_init) {
gdk_color_parse("#f5f6be", &yellow);
gdk_color_parse("#000000", &black);
@@ -392,6 +398,7 @@
color_init &= gdk_colormap_alloc_color(
gdk_colormap_get_system(), &black, FALSE, TRUE);
}
+#endif
if (!font_desc)
font_desc = pango_font_description_from_string
Index: statusbar.c
===================================================================
RCS file: /home/claws-mail/claws/src/statusbar.c,v
retrieving revision 1.5.2.29
retrieving revision 1.5.2.30
diff -u -d -r1.5.2.29 -r1.5.2.30
--- statusbar.c 16 Feb 2011 07:16:16 -0000 1.5.2.29
+++ statusbar.c 7 Oct 2011 09:40:15 -0000 1.5.2.30
@@ -57,8 +57,13 @@
statusbar = gtk_statusbar_new();
gtk_widget_set_size_request(statusbar, 1, -1);
statusbar_list = g_list_append(statusbar_list, statusbar);
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(statusbar),
FALSE);
+#else
+ gtk_window_set_has_resize_grip(GTK_WINDOW(statusbar),
+ FALSE);
+#endif
gtk_container_set_border_width(GTK_CONTAINER(statusbar), 1);
#if GTK_CHECK_VERSION (2, 19, 1)
child = gtk_statusbar_get_message_area(GTK_STATUSBAR(statusbar));
Index: mimeview.h
===================================================================
RCS file: /home/claws-mail/claws/src/mimeview.h,v
retrieving revision 1.20.2.32
retrieving revision 1.20.2.33
diff -u -d -r1.20.2.32 -r1.20.2.33
--- mimeview.h 4 Mar 2011 15:50:15 -0000 1.20.2.32
+++ mimeview.h 7 Oct 2011 09:40:15 -0000 1.20.2.33
@@ -27,7 +27,9 @@
#include <glib.h>
#include <gdk/gdk.h>
#include <gtk/gtk.h>
+#if !GTK_CHECK_VERSION(3, 0, 0)
#include "gtk/gtksctree.h"
+#endif
#ifdef USE_PTHREAD
#include <pthread.h>
#endif
@@ -77,7 +79,9 @@
GtkWidget *popupmenu;
+#if !GTK_CHECK_VERSION(3, 0, 0)
GtkCMCTreeNode *opened;
+#endif
TextView *textview;
MimeViewer *mimeviewer;
Index: ssl_manager.c
===================================================================
RCS file: /home/claws-mail/claws/src/ssl_manager.c,v
retrieving revision 1.3.2.36
retrieving revision 1.3.2.37
diff -u -d -r1.3.2.36 -r1.3.2.37
--- ssl_manager.c 7 Oct 2011 09:17:50 -0000 1.3.2.36
+++ ssl_manager.c 7 Oct 2011 09:40:15 -0000 1.3.2.37
@@ -34,7 +34,6 @@
#include "manage_window.h"
#include "utils.h"
#include "mainwindow.h"
-#include "gtksctree.h"
#include "alertpanel.h"
#include "sslcertwindow.h"
#include "prefs_common.h"
Index: summary_search.c
===================================================================
RCS file: /home/claws-mail/claws/src/summary_search.c,v
retrieving revision 1.15.2.66
retrieving revision 1.15.2.67
diff -u -d -r1.15.2.66 -r1.15.2.67
--- summary_search.c 7 Oct 2011 09:17:50 -0000 1.15.2.66
+++ summary_search.c 7 Oct 2011 09:40:15 -0000 1.15.2.67
@@ -27,7 +27,9 @@
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
+#if !GTK_CHECK_VERSION(3, 0, 0)
#include "gtk/gtksctree.h"
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: prefs_wrapping.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_wrapping.c,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -d -r1.1.2.22 -r1.1.2.23
--- prefs_wrapping.c 16 Feb 2011 07:16:14 -0000 1.1.2.22
+++ prefs_wrapping.c 7 Oct 2011 09:40:15 -0000 1.1.2.23
@@ -60,7 +60,7 @@
GtkWidget *vbox1;
GtkWidget *vbox2;
GtkWidget *label_linewrap;
- GtkObject *spinbtn_linewrap_adj;
+ GtkAdjustment *spinbtn_linewrap_adj;
GtkWidget *spinbtn_linewrap;
GtkWidget *checkbtn_wrapquote;
GtkWidget *checkbtn_wrappastes;
Index: mainwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/mainwindow.c,v
retrieving revision 1.274.2.330
retrieving revision 1.274.2.331
diff -u -d -r1.274.2.330 -r1.274.2.331
--- mainwindow.c 7 Oct 2011 09:17:49 -0000 1.274.2.330
+++ mainwindow.c 7 Oct 2011 09:40:15 -0000 1.274.2.331
@@ -1553,9 +1553,11 @@
FolderView *folderview;
SummaryView *summaryview;
MessageView *messageview;
+#if !GTK_CHECK_VERSION(3, 0, 0)
GdkColormap *colormap;
- GdkColor color[4];
gboolean success[4];
+#endif
+ GdkColor color[4];
GtkWidget *ac_menu;
gint i;
@@ -2206,12 +2208,14 @@
color[2] = folderview->color_new;
color[3] = folderview->color_op;
+#if !GTK_CHECK_VERSION(3, 0, 0)
colormap = gdk_drawable_get_colormap(gtk_widget_get_window(window));
gdk_colormap_alloc_colors(colormap, color, 4, FALSE, TRUE, success);
for (i = 0; i < 4; i++) {
if (success[i] == FALSE)
g_warning("MainWindow: color allocation %d failed\n", i);
}
+#endif
debug_print("done.\n");
Index: prefs_account.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_account.c,v
retrieving revision 1.105.2.168
retrieving revision 1.105.2.169
diff -u -d -r1.105.2.168 -r1.105.2.169
--- prefs_account.c 29 Aug 2011 15:42:10 -0000 1.105.2.168
+++ prefs_account.c 7 Oct 2011 09:40:15 -0000 1.105.2.169
@@ -34,7 +34,9 @@
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
+#if !GTK_CHECK_VERSION(3, 0, 0)
#include "gtkcmoptionmenu.h"
+#endif
#include "main.h"
#include "prefs_gtk.h"
#include "prefs_account.h"
@@ -152,7 +154,7 @@
GtkWidget *frame_maxarticle;
GtkWidget *maxarticle_label;
GtkWidget *maxarticle_spinbtn;
- GtkObject *maxarticle_spinbtn_adj;
+ GtkAdjustment *maxarticle_spinbtn_adj;
} ReceivePage;
typedef struct SendPage
@@ -283,8 +285,10 @@
GtkWidget *nntpport_spinbtn;
GtkWidget *domain_checkbtn;
GtkWidget *domain_entry;
+#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget *crosspost_checkbtn;
GtkWidget *crosspost_colormenu;
+#endif
#ifndef G_OS_WIN32
GtkWidget *tunnelcmd_checkbtn;
@@ -349,9 +353,11 @@
static void prefs_account_enum_set_data_from_radiobtn (PrefParam *pparam);
static void prefs_account_enum_set_radiobtn (PrefParam *pparam);
+#if !GTK_CHECK_VERSION(3, 0, 0)
static void crosspost_color_toggled(void);
static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam);
static void prefs_account_crosspost_set_colormenu(PrefParam *pparam);
+#endif
static void prefs_account_nntpauth_toggled(GtkToggleButton *button,
gpointer user_data);
@@ -814,6 +820,7 @@
&advanced_page.tunnelcmd_entry,
prefs_set_data_from_entry, prefs_set_entry},
#endif
+#if !GTK_CHECK_VERSION(3, 0, 0)
{"mark_crosspost_read", "FALSE", &tmp_ac_prefs.mark_crosspost_read, P_BOOL,
&advanced_page.crosspost_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
@@ -822,6 +829,7 @@
&advanced_page.crosspost_colormenu,
prefs_account_crosspost_set_data_from_colormenu,
prefs_account_crosspost_set_colormenu},
+#endif
{"set_sent_folder", "FALSE", &tmp_ac_prefs.set_sent_folder, P_BOOL,
&advanced_page.sent_folder_checkbtn,
@@ -1382,7 +1390,7 @@
GtkWidget *frame2;
GtkWidget *maxarticle_label;
GtkWidget *maxarticle_spinbtn;
- GtkObject *maxarticle_spinbtn_adj;
+ GtkAdjustment *maxarticle_spinbtn_adj;
CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
@@ -2609,9 +2617,11 @@
GtkWidget *checkbtn_domain;
GtkWidget *entry_domain;
gchar *tip_domain;
+#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget *checkbtn_crosspost;
GtkWidget *colormenu_crosspost;
GtkWidget *menu;
+#endif
#ifndef G_OS_WIN32
GtkWidget *checkbtn_tunnelcmd;
GtkWidget *entry_tunnelcmd;
@@ -2710,6 +2720,7 @@
CLAWS_SET_TIP(imap_use_trash_checkbtn,
_("Moves deleted mails to trash instead of using the \\Deleted flag without expunging."));
+#if !GTK_CHECK_VERSION(3, 0, 0)
PACK_CHECK_BUTTON (hbox1, checkbtn_crosspost,
_("Mark cross-posted messages as read and color:"));
g_signal_connect (G_OBJECT (checkbtn_crosspost), "toggled",
@@ -2723,6 +2734,7 @@
menu = colorlabel_create_color_menu();
gtk_cmoption_menu_set_menu (GTK_CMOPTION_MENU(colormenu_crosspost), menu);
SET_TOGGLE_SENSITIVITY(checkbtn_crosspost, colormenu_crosspost);
+#endif
PACK_HBOX (hbox1);
#undef PACK_HBOX
@@ -2788,8 +2800,10 @@
page->nntpport_spinbtn = spinbtn_nntpport;
page->domain_checkbtn = checkbtn_domain;
page->domain_entry = entry_domain;
+#if !GTK_CHECK_VERSION(3, 0, 0)
page->crosspost_checkbtn = checkbtn_crosspost;
page->crosspost_colormenu = colormenu_crosspost;
+#endif
#ifndef G_OS_WIN32
page->tunnelcmd_checkbtn = checkbtn_tunnelcmd;
@@ -3692,6 +3706,7 @@
return ac_prefs;
}
+#if !GTK_CHECK_VERSION(3, 0, 0)
static void crosspost_color_toggled(void)
{
gboolean is_active;
@@ -3724,6 +3739,7 @@
menuitem = gtk_menu_get_active(GTK_MENU(menu));
gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
}
+#endif
static void pop_bfr_smtp_tm_set_sens(GtkWidget *widget, gpointer data)
{
@@ -4155,8 +4171,10 @@
gtk_widget_hide(advanced_page.popport_hbox);
gtk_widget_hide(advanced_page.imapport_hbox);
gtk_widget_show(advanced_page.nntpport_hbox);
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_show(advanced_page.crosspost_checkbtn);
gtk_widget_show(advanced_page.crosspost_colormenu);
+#endif
#ifndef G_OS_WIN32
gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
gtk_widget_hide(advanced_page.tunnelcmd_entry);
@@ -4251,8 +4269,10 @@
gtk_widget_hide(advanced_page.popport_hbox);
gtk_widget_hide(advanced_page.imapport_hbox);
gtk_widget_hide(advanced_page.nntpport_hbox);
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_hide(advanced_page.crosspost_checkbtn);
gtk_widget_hide(advanced_page.crosspost_colormenu);
+#endif
#ifndef G_OS_WIN32
gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
gtk_widget_hide(advanced_page.tunnelcmd_entry);
@@ -4360,8 +4380,10 @@
gtk_widget_hide(advanced_page.popport_hbox);
gtk_widget_show(advanced_page.imapport_hbox);
gtk_widget_hide(advanced_page.nntpport_hbox);
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_hide(advanced_page.crosspost_checkbtn);
gtk_widget_hide(advanced_page.crosspost_colormenu);
+#endif
#ifndef G_OS_WIN32
gtk_widget_show(advanced_page.tunnelcmd_checkbtn);
gtk_widget_show(advanced_page.tunnelcmd_entry);
@@ -4454,8 +4476,10 @@
gtk_widget_hide(advanced_page.popport_hbox);
gtk_widget_hide(advanced_page.imapport_hbox);
gtk_widget_hide(advanced_page.nntpport_hbox);
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_hide(advanced_page.crosspost_checkbtn);
gtk_widget_hide(advanced_page.crosspost_colormenu);
+#endif
#ifndef G_OS_WIN32
gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
gtk_widget_hide(advanced_page.tunnelcmd_entry);
@@ -4554,8 +4578,10 @@
gtk_widget_show(advanced_page.popport_hbox);
gtk_widget_hide(advanced_page.imapport_hbox);
gtk_widget_hide(advanced_page.nntpport_hbox);
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_hide(advanced_page.crosspost_checkbtn);
gtk_widget_hide(advanced_page.crosspost_colormenu);
+#endif
#ifndef G_OS_WIN32
gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
gtk_widget_hide(advanced_page.tunnelcmd_entry);
Index: prefs_receive.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_receive.c,v
retrieving revision 1.1.2.28
retrieving revision 1.1.2.29
diff -u -d -r1.1.2.28 -r1.1.2.29
--- prefs_receive.c 16 Feb 2011 07:16:13 -0000 1.1.2.28
+++ prefs_receive.c 7 Oct 2011 09:40:15 -0000 1.1.2.29
@@ -100,7 +100,7 @@
GtkWidget *hbox_autochk;
GtkWidget *checkbtn_autochk;
- GtkObject *spinbtn_autochk_adj;
+ GtkAdjustment *spinbtn_autochk_adj;
GtkWidget *spinbtn_autochk;
GtkWidget *label_autochk2;
GtkWidget *checkbtn_chkonstartup;
Index: printing.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/printing.c,v
retrieving revision 1.1.2.33
retrieving revision 1.1.2.34
diff -u -d -r1.1.2.33 -r1.1.2.34
--- printing.c 7 Oct 2011 09:17:50 -0000 1.1.2.33
+++ printing.c 7 Oct 2011 09:40:15 -0000 1.1.2.34
@@ -91,7 +91,11 @@
static void cb_preview_size_allocate(GtkWidget*, GtkAllocation*);
static void cb_preview_ready(GtkPrintOperationPreview*,
GtkPrintContext*, gpointer);
+#if !GTK_CHECK_VERSION(3, 0, 0)
static gboolean cb_preview_expose(GtkWidget*, GdkEventExpose*, gpointer);
+#else
+static gboolean cb_preview_expose(GtkWidget*, cairo_t*, gpointer);
+#endif
static void cb_preview_got_page_size(GtkPrintOperationPreview*,
GtkPrintContext*,
GtkPageSetup*, gpointer);
@@ -620,9 +624,15 @@
preview_data->current_page = preview_data->pages_to_print;
preview_data->context = context;
+#if !GTK_CHECK_VERSION(3, 0, 0)
g_signal_connect(preview_data->area, "expose_event",
G_CALLBACK(cb_preview_expose),
preview_data);
+#else
+ g_signal_connect(preview_data->area, "draw",
+ G_CALLBACK(cb_preview_expose),
+ preview_data);
+#endif
gtk_widget_queue_draw(preview_data->area);
}
@@ -655,19 +665,32 @@
paper_width, paper_height);
}
+#if !GTK_CHECK_VERSION(3, 0, 0)
static gboolean cb_preview_expose(GtkWidget *widget, GdkEventExpose *event,
gpointer data)
+#else
+static gboolean cb_preview_expose(GtkWidget *widget, cairo_t *event,
+ gpointer data)
+#endif
{
PreviewData *preview_data = data;
+#if !GTK_CHECK_VERSION(3, 0, 0)
cairo_t *cr;
+#endif
debug_print("preview_expose (current %p)\n", preview_data->current_page);
+#if !GTK_CHECK_VERSION(3, 0, 0)
cr = gdk_cairo_create(gtk_widget_get_window(preview_data->area));
+#endif
/* background */
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);
/* shadow */
@@ -685,7 +708,9 @@
cairo_fill(cr);
gtk_print_context_set_cairo_context(preview_data->context, cr, PREVIEW_SCALE, PREVIEW_SCALE);
+#if !GTK_CHECK_VERSION(3, 0, 0)
cairo_destroy(cr);
+#endif
if (preview_data->current_page) {
preview_data->rendering = TRUE;
Index: addrgather.c
===================================================================
RCS file: /home/claws-mail/claws/src/addrgather.c,v
retrieving revision 1.5.10.34
retrieving revision 1.5.10.35
diff -u -d -r1.5.10.34 -r1.5.10.35
--- addrgather.c 7 Oct 2011 09:17:48 -0000 1.5.10.34
+++ addrgather.c 7 Oct 2011 09:40:14 -0000 1.5.10.35
@@ -271,7 +271,7 @@
GtkWidget *frameHeader;
GtkWidget *checkHeader[NUM_FIELDS];
GtkWidget *spinbtnFolder;
- GtkObject *adjFolder;
+ GtkAdjustment *adjFolder;
GtkWidget *checkRecurse;
gint top;
gint i;
More information about the Commits
mailing list