[Commits] account.c 1.61.2.100 1.61.2.101 addr_compl.c 1.27.2.57 1.27.2.58 addrgather.c 1.5.10.35 1.5.10.36 compose.c 1.382.2.586 1.382.2.587 editldap.c 1.8.2.42 1.8.2.43 expldifdlg.c 1.1.4.34 1.1.4.35 folderview.c 1.207.2.222 1.207.2.223 grouplistdialog.c 1.14.2.30 1.14.2.31 headerview.c 1.8.2.33 1.8.2.34 importldif.c 1.14.2.27 1.14.2.28 main.c 1.115.2.242 1.115.2.243 mainwindow.c 1.274.2.331 1.274.2.332 mimeview.c 1.83.2.173 1.83.2.174 noticeview.c 1.5.2.26 1.5.2.27 prefs_account.c 1.105.2.169 1.105.2.170 prefs_actions.c 1.60.2.74 1.60.2.75 prefs_ext_prog.c 1.3.2.26 1.3.2.27 prefs_filtering.c 1.59.2.83 1.59.2.84 prefs_folder_item.c 1.52.2.84 1.52.2.85 prefs_image_viewer.c 1.1.2.16 1.1.2.17 prefs_logging.c 1.1.2.20 1.1.2.21 prefs_msg_colors.c 1.1.2.45 1.1.2.46 prefs_other.c 1.1.2.43 1.1.2.44 prefs_send.c 1.1.2.28 1.1.2.29 prefs_spelling.c 1.5.2.42 1.5.2.43 prefs_summaries.c 1.1.2.68 1.1.2.69 prefs_template.c 1.12.2.76 1.12.2.77 printing.c 1.1.2.34 1.1.2.35 quote_fmt.c 1.8.2.44 1.8.2.45 send_message.c 1.17.2.60 1.17.2.61 statusbar.c 1.5.2.30 1.5.2.31 summary_search.c 1.15.2.67 1.15.2.68 summaryview.c 1.395.2.432 1.395.2.433 wizard.c 1.1.2.85 1.1.2.86
colin at claws-mail.org
colin at claws-mail.org
Sat Oct 22 19:09:06 CEST 2011
Update of /home/claws-mail/claws/src
In directory claws-mail:/tmp/cvs-serv32605/src
Modified Files:
Tag: gtk2
account.c addr_compl.c addrgather.c compose.c editldap.c
expldifdlg.c folderview.c grouplistdialog.c headerview.c
importldif.c main.c mainwindow.c mimeview.c noticeview.c
prefs_account.c prefs_actions.c prefs_ext_prog.c
prefs_filtering.c prefs_folder_item.c prefs_image_viewer.c
prefs_logging.c prefs_msg_colors.c prefs_other.c prefs_send.c
prefs_spelling.c prefs_summaries.c prefs_template.c printing.c
quote_fmt.c send_message.c statusbar.c summary_search.c
summaryview.c wizard.c
Log Message:
2011-10-22 [colin] 3.7.10cvs41
* src/account.c
* src/addr_compl.c
* src/addrgather.c
* src/compose.c
* src/editldap.c
* src/expldifdlg.c
* src/folderview.c
* src/grouplistdialog.c
* src/headerview.c
* src/importldif.c
* src/main.c
* src/mainwindow.c
* src/mimeview.c
* src/noticeview.c
* src/prefs_account.c
* src/prefs_actions.c
* src/prefs_ext_prog.c
* src/prefs_filtering.c
* src/prefs_folder_item.c
* src/prefs_image_viewer.c
* src/prefs_logging.c
* src/prefs_msg_colors.c
* src/prefs_other.c
* src/prefs_send.c
* src/prefs_spelling.c
* src/prefs_summaries.c
* src/prefs_template.c
* src/printing.c
* src/quote_fmt.c
* src/send_message.c
* src/statusbar.c
* src/summary_search.c
* src/summaryview.c
* src/wizard.c
* src/gtk/gtkcmclist.c
* src/gtk/gtkcmctree.c
* src/gtk/gtkcmoptionmenu.c
* src/gtk/gtksctree.c
* src/gtk/gtkutils.c
* src/gtk/gtkutils.h
* src/gtk/gtkvscrollbutton.c
* src/gtk/inputdialog.c
* src/gtk/pluginwindow.c
* src/gtk/quicksearch.c
* src/gtk/spell_entry.c
* src/plugins/bogofilter/bogofilter_gtk.c
* src/plugins/dillo_viewer/dillo_prefs.c
* src/plugins/pgpcore/prefs_gpg.c
* src/plugins/spamassassin/spamassassin_gtk.c
* src/plugins/trayicon/trayicon.c
* src/plugins/trayicon/trayicon_prefs.c
Remove all possible #if GTK_CHECK_VERSION() checks,
and make Claws build with GTK+2.16 (untested right
now), as the Gpg4Win project uses GTK+2.16 currently.
Index: editldap.c
===================================================================
RCS file: /home/claws-mail/claws/src/editldap.c,v
retrieving revision 1.8.2.42
retrieving revision 1.8.2.43
diff -u -d -r1.8.2.42 -r1.8.2.43
--- editldap.c 7 Oct 2011 09:40:14 -0000 1.8.2.42
+++ editldap.c 22 Oct 2011 17:09:02 -0000 1.8.2.43
@@ -404,7 +404,6 @@
GtkWidget *entry_baseDN;
GtkWidget *check_btn;
GtkWidget *lookdn_btn;
- CLAWS_TIP_DECL();
gint top;
vbox = gtk_vbox_new( FALSE, 8 );
@@ -555,7 +554,6 @@
GtkWidget *check_dynsearch;
GtkWidget *check_matchoption;
GtkWidget *reset_btn;
- CLAWS_TIP_DECL();
gint top;
vbox = gtk_vbox_new( FALSE, 8 );
@@ -679,7 +677,6 @@
GtkWidget *spinbtn_timeout;
GtkAdjustment *spinbtn_maxentry_adj;
GtkWidget *spinbtn_maxentry;
- CLAWS_TIP_DECL();
gint top;
vbox = gtk_vbox_new( FALSE, 8 );
Index: prefs_other.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_other.c,v
retrieving revision 1.1.2.43
retrieving revision 1.1.2.44
diff -u -d -r1.1.2.43 -r1.1.2.44
--- prefs_other.c 7 Oct 2011 09:40:15 -0000 1.1.2.43
+++ prefs_other.c 22 Oct 2011 17:09:03 -0000 1.1.2.44
@@ -461,7 +461,6 @@
GtkWidget *flush_metadata_safer_radiobtn;
gchar *shred_binary = NULL;
- CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
Index: expldifdlg.c
===================================================================
RCS file: /home/claws-mail/claws/src/expldifdlg.c,v
retrieving revision 1.1.4.34
retrieving revision 1.1.4.35
diff -u -d -r1.1.4.34 -r1.1.4.35
--- expldifdlg.c 7 Oct 2011 09:17:49 -0000 1.1.4.34
+++ expldifdlg.c 22 Oct 2011 17:09:03 -0000 1.1.4.35
@@ -463,7 +463,6 @@
GtkWidget *checkEMail;
GtkListStore *store;
GtkTreeIter iter;
- CLAWS_TIP_DECL();
gint top;
vbox = gtk_vbox_new(FALSE, 8);
Index: summaryview.c
===================================================================
RCS file: /home/claws-mail/claws/src/summaryview.c,v
retrieving revision 1.395.2.432
retrieving revision 1.395.2.433
diff -u -d -r1.395.2.432 -r1.395.2.433
--- summaryview.c 7 Oct 2011 09:17:50 -0000 1.395.2.432
+++ summaryview.c 22 Oct 2011 17:09:03 -0000 1.395.2.433
@@ -512,7 +512,6 @@
GtkWidget *toggle_arrow;
GtkWidget *toggle_search;
QuickSearch *quicksearch;
- CLAWS_TIP_DECL();
debug_print("Creating summary view...\n");
summaryview = g_new0(SummaryView, 1);
@@ -2450,9 +2449,7 @@
goffset sel_size = 0, n_size = 0;
MsgInfo *msginfo;
gchar *name;
-#if GTK_CHECK_VERSION(2, 12, 0)
gchar *tooltip;
-#endif
if (!summaryview->folder_item) {
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), "");
@@ -2569,7 +2566,6 @@
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
g_free(str);
-#if GTK_CHECK_VERSION(2, 12, 0)
tooltip = g_strdup_printf(_("<b>Message summary</b>\n"
"<b>New:</b> %d\n"
"<b>Unread:</b> %d\n"
@@ -2589,7 +2585,6 @@
gtk_widget_set_tooltip_markup(GTK_WIDGET(summaryview->statlabel_msgs),
tooltip);
g_free(tooltip);
-#endif
} else {
gchar *ssize, *tsize;
if (n_selected) {
@@ -3137,13 +3132,9 @@
gchar *from_text = NULL, *to_text = NULL, *tags_text = NULL;
gboolean should_swap = FALSE;
gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-#if GTK_CHECK_VERSION(2,12,0)
static const gchar *color_dim_rgb = NULL;
if (!color_dim_rgb)
color_dim_rgb = gdk_color_to_string(&summaryview->color_dim);
-#else
- static const gchar *color_dim_rgb = "#888888";
-#endif
text[col_pos[S_COL_FROM]] = "";
text[col_pos[S_COL_TO]] = "";
text[col_pos[S_COL_SUBJECT]]= "";
@@ -6122,7 +6113,7 @@
return TRUE;
}
-#if GTK_CHECK_VERSION(2,12,0) && !GENERIC_UMPC
+#if !GENERIC_UMPC
static gchar *summaryview_get_tooltip_text(SummaryView *summaryview, MsgInfo *info, gint column)
{
MsgFlags flags;
@@ -6436,7 +6427,7 @@
G_CALLBACK(summary_drag_motion_cb),
summaryview);
-#if GTK_CHECK_VERSION(2,12,0) && !GENERIC_UMPC
+#if !GENERIC_UMPC
g_object_set (G_OBJECT(ctree), "has-tooltip", TRUE, NULL);
g_signal_connect(G_OBJECT(ctree), "query-tooltip",
G_CALLBACK(tooltip_cb),
Index: addr_compl.c
===================================================================
RCS file: /home/claws-mail/claws/src/addr_compl.c,v
retrieving revision 1.27.2.57
retrieving revision 1.27.2.58
diff -u -d -r1.27.2.57 -r1.27.2.58
--- addr_compl.c 9 Oct 2011 21:20:00 -0000 1.27.2.57
+++ addr_compl.c 22 Oct 2011 17:09:02 -0000 1.27.2.58
@@ -1262,7 +1262,7 @@
cm_return_val_if_fail(entry != NULL, FALSE);
- if (!gtkut_widget_has_focus(GTK_WIDGET(entry))) return FALSE;
+ if (!gtk_widget_has_focus(GTK_WIDGET(entry))) return FALSE;
/* get an address component from the cursor */
searchTerm = get_address_from_edit( entry, &cursor_pos );
Index: wizard.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/wizard.c,v
retrieving revision 1.1.2.85
retrieving revision 1.1.2.86
diff -u -d -r1.1.2.85 -r1.1.2.86
--- wizard.c 7 Oct 2011 09:08:56 -0000 1.1.2.85
+++ wizard.c 22 Oct 2011 17:09:04 -0000 1.1.2.86
@@ -1123,7 +1123,6 @@
gchar *uri, *mount_path;
#endif
GtkWidget *hbox;
- CLAWS_TIP_DECL();
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
@@ -1259,7 +1258,6 @@
GtkWidget *smtp_cert_table;
#endif
gchar *text;
- CLAWS_TIP_DECL();
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
@@ -1524,7 +1522,6 @@
GtkTreeIter iter;
gchar *text;
gint index = 0;
- CLAWS_TIP_DECL();
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
Index: prefs_image_viewer.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_image_viewer.c,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -d -r1.1.2.16 -r1.1.2.17
--- prefs_image_viewer.c 16 Feb 2011 07:16:13 -0000 1.1.2.16
+++ prefs_image_viewer.c 22 Oct 2011 17:09:03 -0000 1.1.2.17
@@ -58,7 +58,6 @@
GtkWidget *resize_img;
GtkWidget *inline_img;
GtkWidget *print_imgs;
- CLAWS_TIP_DECL();
table = gtk_table_new(4, 1, FALSE);
gtk_widget_show(table);
Index: prefs_folder_item.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_folder_item.c,v
retrieving revision 1.52.2.84
retrieving revision 1.52.2.85
diff -u -d -r1.52.2.84 -r1.52.2.85
--- prefs_folder_item.c 7 Oct 2011 09:40:15 -0000 1.52.2.84
+++ prefs_folder_item.c 22 Oct 2011 17:09:03 -0000 1.52.2.85
@@ -249,7 +249,6 @@
GtkWidget *enable_processing_when_opening_rec_checkbtn;
GtkWidget *newmailcheck_rec_checkbtn;
GtkWidget *offlinesync_rec_checkbtn;
- CLAWS_TIP_DECL();
page->item = item;
Index: prefs_filtering.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_filtering.c,v
retrieving revision 1.59.2.83
retrieving revision 1.59.2.84
diff -u -d -r1.59.2.83 -r1.59.2.84
--- prefs_filtering.c 7 Oct 2011 09:17:49 -0000 1.59.2.83
+++ prefs_filtering.c 22 Oct 2011 17:09:03 -0000 1.59.2.84
@@ -330,7 +330,6 @@
GtkWidget *bottom_btn;
GtkWidget *table;
static GdkGeometry geometry;
- CLAWS_TIP_DECL();
debug_print("Creating filtering configuration window...\n");
Index: prefs_logging.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_logging.c,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -d -r1.1.2.20 -r1.1.2.21
--- prefs_logging.c 7 Oct 2011 09:40:15 -0000 1.1.2.20
+++ prefs_logging.c 22 Oct 2011 17:09:03 -0000 1.1.2.21
@@ -130,7 +130,6 @@
GtkWidget *checkbtn_log_error;
GtkWidget *checkbtn_log_status;
GtkSizeGroup *log_size_group;
- CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
Index: prefs_send.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_send.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_send.c 16 Feb 2011 07:16:14 -0000 1.1.2.28
+++ prefs_send.c 22 Oct 2011 17:09:03 -0000 1.1.2.29
@@ -145,7 +145,6 @@
GtkWidget *checkbtn_confirm_send_queued_messages;
GtkWidget *checkbtn_never_send_retrcpt;
GtkWidget *table;
- CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
Index: compose.c
===================================================================
RCS file: /home/claws-mail/claws/src/compose.c,v
retrieving revision 1.382.2.586
retrieving revision 1.382.2.587
diff -u -d -r1.382.2.586 -r1.382.2.587
--- compose.c 17 Oct 2011 09:01:27 -0000 1.382.2.586
+++ compose.c 22 Oct 2011 17:09:02 -0000 1.382.2.587
@@ -7080,7 +7080,6 @@
GtkWidget *text;
GtkTextBuffer *buffer;
GtkClipboard *clipboard;
- CLAWS_TIP_DECL();
UndoMain *undostruct;
@@ -9988,7 +9987,7 @@
Compose *compose = (Compose *)data;
if (compose->focused_editable
#ifndef GENERIC_UMPC
- && gtkut_widget_has_focus(compose->focused_editable)
+ && gtk_widget_has_focus(compose->focused_editable)
#endif
)
entry_cut_clipboard(compose->focused_editable);
@@ -9999,7 +9998,7 @@
Compose *compose = (Compose *)data;
if (compose->focused_editable
#ifndef GENERIC_UMPC
- && gtkut_widget_has_focus(compose->focused_editable)
+ && gtk_widget_has_focus(compose->focused_editable)
#endif
)
entry_copy_clipboard(compose->focused_editable);
@@ -10012,14 +10011,14 @@
GtkTextBuffer *buffer;
BLOCK_WRAP();
if (compose->focused_editable &&
- gtkut_widget_has_focus(compose->focused_editable))
+ gtk_widget_has_focus(compose->focused_editable))
entry_paste_clipboard(compose, compose->focused_editable,
prefs_common.linewrap_pastes,
GDK_SELECTION_CLIPBOARD, NULL);
UNBLOCK_WRAP();
#ifdef USE_ENCHANT
- if (gtkut_widget_has_focus(compose->text) &&
+ if (gtk_widget_has_focus(compose->text) &&
compose->gtkaspell &&
compose->gtkaspell->check_while_typing)
gtkaspell_highlight_all(compose->gtkaspell);
@@ -10032,7 +10031,7 @@
gint wrap_quote = prefs_common.linewrap_quote;
if (compose->focused_editable
#ifndef GENERIC_UMPC
- && gtkut_widget_has_focus(compose->focused_editable)
+ && gtk_widget_has_focus(compose->focused_editable)
#endif
) {
/* let text_insert() (called directly or at a later time
@@ -10061,7 +10060,7 @@
BLOCK_WRAP();
if (compose->focused_editable
#ifndef GENERIC_UMPC
- && gtkut_widget_has_focus(compose->focused_editable)
+ && gtk_widget_has_focus(compose->focused_editable)
#endif
)
entry_paste_clipboard(compose, compose->focused_editable, FALSE,
@@ -10069,7 +10068,7 @@
UNBLOCK_WRAP();
#ifdef USE_ENCHANT
- if (gtkut_widget_has_focus(compose->text) &&
+ if (gtk_widget_has_focus(compose->text) &&
compose->gtkaspell &&
compose->gtkaspell->check_while_typing)
gtkaspell_highlight_all(compose->gtkaspell);
@@ -10084,7 +10083,7 @@
BLOCK_WRAP();
if (compose->focused_editable
#ifndef GENERIC_UMPC
- && gtkut_widget_has_focus(compose->focused_editable)
+ && gtk_widget_has_focus(compose->focused_editable)
#endif
)
entry_paste_clipboard(compose, compose->focused_editable, TRUE,
@@ -10092,7 +10091,7 @@
UNBLOCK_WRAP();
#ifdef USE_ENCHANT
- if (gtkut_widget_has_focus(compose->text) &&
+ if (gtk_widget_has_focus(compose->text) &&
compose->gtkaspell &&
compose->gtkaspell->check_while_typing)
gtkaspell_highlight_all(compose->gtkaspell);
@@ -10104,7 +10103,7 @@
Compose *compose = (Compose *)data;
if (compose->focused_editable
#ifndef GENERIC_UMPC
- && gtkut_widget_has_focus(compose->focused_editable)
+ && gtk_widget_has_focus(compose->focused_editable)
#endif
)
entry_allsel(compose->focused_editable);
@@ -10408,7 +10407,7 @@
{textview_delete_to_line_end}
};
- if (!gtkut_widget_has_focus(GTK_WIDGET(text))) return;
+ if (!gtk_widget_has_focus(GTK_WIDGET(text))) return;
if (action >= COMPOSE_CALL_ADVANCED_ACTION_MOVE_BEGINNING_OF_LINE &&
action <= COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END) {
@@ -10991,7 +10990,7 @@
if (!compose->gtkaspell)
return;
- if (gtkut_widget_has_focus(compose->subject_entry))
+ if (gtk_widget_has_focus(compose->subject_entry))
claws_spell_entry_check_all(
CLAWS_SPELL_ENTRY(compose->subject_entry));
else
@@ -11016,7 +11015,7 @@
return;
}
- if (gtkut_widget_has_focus(compose->subject_entry))
+ if (gtk_widget_has_focus(compose->subject_entry))
claws_spell_entry_check_backwards(
CLAWS_SPELL_ENTRY(compose->subject_entry));
else
@@ -11031,7 +11030,7 @@
return;
}
- if (gtkut_widget_has_focus(compose->subject_entry))
+ if (gtk_widget_has_focus(compose->subject_entry))
claws_spell_entry_check_forwards_go(
CLAWS_SPELL_ENTRY(compose->subject_entry));
else
Index: send_message.c
===================================================================
RCS file: /home/claws-mail/claws/src/send_message.c,v
retrieving revision 1.17.2.60
retrieving revision 1.17.2.61
diff -u -d -r1.17.2.60 -r1.17.2.61
--- send_message.c 5 May 2011 07:26:37 -0000 1.17.2.60
+++ send_message.c 22 Oct 2011 17:09:03 -0000 1.17.2.61
@@ -509,7 +509,7 @@
(dialog->dialog, (total_len == 0) ? 0 : (gfloat)cur_len / (gfloat)total_len);
if (mainwin) {
- if (!gtkut_widget_get_visible(mainwin->progressbar))
+ if (!gtk_widget_get_visible(mainwin->progressbar))
gtk_widget_show(mainwin->progressbar);
gtk_progress_bar_set_fraction
(GTK_PROGRESS_BAR(mainwin->progressbar),
Index: prefs_summaries.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_summaries.c,v
retrieving revision 1.1.2.68
retrieving revision 1.1.2.69
diff -u -d -r1.1.2.68 -r1.1.2.69
--- prefs_summaries.c 7 Oct 2011 09:40:15 -0000 1.1.2.68
+++ prefs_summaries.c 22 Oct 2011 17:09:03 -0000 1.1.2.69
@@ -345,7 +345,6 @@
GtkWidget *button_edit_actions;
GtkWidget *radio_mark_as_read_on_select;
GtkWidget *radio_mark_as_read_on_new_win;
- CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
Index: quote_fmt.c
===================================================================
RCS file: /home/claws-mail/claws/src/quote_fmt.c,v
retrieving revision 1.8.2.44
retrieving revision 1.8.2.45
diff -u -d -r1.8.2.44 -r1.8.2.45
--- quote_fmt.c 16 Feb 2011 07:16:15 -0000 1.8.2.44
+++ quote_fmt.c 22 Oct 2011 17:09:03 -0000 1.8.2.45
@@ -176,8 +176,6 @@
gtk_container_set_border_width (GTK_CONTAINER (vbox_format), 8);
if (override_from_format) {
- CLAWS_TIP_DECL();
-
hbox2_format = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox2_format);
gtk_box_pack_start (GTK_BOX (vbox_format), hbox2_format, FALSE, FALSE, 0);
@@ -302,8 +300,6 @@
gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
if (override_from_format) {
- CLAWS_TIP_DECL();
-
hbox3 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox3);
gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0);
@@ -432,8 +428,6 @@
gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
if (override_from_format) {
- CLAWS_TIP_DECL();
-
hbox3 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox3);
gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0);
Index: importldif.c
===================================================================
RCS file: /home/claws-mail/claws/src/importldif.c,v
retrieving revision 1.14.2.27
retrieving revision 1.14.2.28
diff -u -d -r1.14.2.27 -r1.14.2.28
--- importldif.c 7 Oct 2011 09:17:49 -0000 1.14.2.27
+++ importldif.c 22 Oct 2011 17:09:03 -0000 1.14.2.28
@@ -631,7 +631,6 @@
GtkWidget *entryFile;
GtkWidget *entryName;
GtkWidget *btnFile;
- CLAWS_TIP_DECL();
gint top;
vbox = gtk_vbox_new(FALSE, 8);
@@ -717,7 +716,6 @@
GtkWidget *checkSelect;
GtkWidget *btnModify;
GtkWidget *eventBox;
- CLAWS_TIP_DECL();
gint top;
gchar *titles[ FIELDS_N_COLS ];
Index: grouplistdialog.c
===================================================================
RCS file: /home/claws-mail/claws/src/grouplistdialog.c,v
retrieving revision 1.14.2.30
retrieving revision 1.14.2.31
diff -u -d -r1.14.2.30 -r1.14.2.31
--- grouplistdialog.c 7 Oct 2011 09:17:49 -0000 1.14.2.30
+++ grouplistdialog.c 22 Oct 2011 17:09:03 -0000 1.14.2.31
@@ -94,7 +94,7 @@
GNode *node;
FolderItem *item;
- if (dialog && gtkut_widget_get_visible(dialog)) return NULL;
+ if (dialog && gtk_widget_get_visible(dialog)) return NULL;
if (!dialog)
grouplist_dialog_create();
Index: mimeview.c
===================================================================
RCS file: /home/claws-mail/claws/src/mimeview.c,v
retrieving revision 1.83.2.173
retrieving revision 1.83.2.174
diff -u -d -r1.83.2.173 -r1.83.2.174
--- mimeview.c 7 Oct 2011 09:40:15 -0000 1.83.2.173
+++ mimeview.c 22 Oct 2011 17:09:03 -0000 1.83.2.174
@@ -263,7 +263,6 @@
gchar *titles[N_MIMEVIEW_COLS];
gint i;
- CLAWS_TIP_DECL();
if (!hand_cursor)
hand_cursor = gdk_cursor_new(GDK_HAND2);
@@ -1254,7 +1253,7 @@
if (!partinfo) return;
/* ungrab the mouse event */
- if (gtkut_widget_has_grab(GTK_WIDGET(ctree))) {
+ if (gtk_widget_has_grab(GTK_WIDGET(ctree))) {
gtk_grab_remove(GTK_WIDGET(ctree));
if (gdk_pointer_is_grabbed())
gdk_pointer_ungrab(GDK_CURRENT_TIME);
@@ -2376,15 +2375,9 @@
content_type = procmime_get_content_type_str(mimeinfo->type,
mimeinfo->subtype);
-#if GTK_CHECK_VERSION(2,12,0)
tip = g_strconcat("<b>", _("Type:"), " </b>", content_type,
"\n<b>", _("Size:"), " </b>",
to_human_readable((goffset)mimeinfo->length), NULL);
-#else
- tip = g_strconcat(_("Type:"), " ", content_type,
- "\n", _("Size:"), " ",
- to_human_readable((goffset)mimeinfo->length), NULL);
-#endif
g_free(content_type);
if (desc && *desc) {
gchar *tmp = NULL;
@@ -2393,17 +2386,10 @@
} else {
tmp = g_strdup(desc);
}
-#if GTK_CHECK_VERSION(2,12,0)
tiptmp = g_strconcat(tip, "\n<b>",
prefs_common.attach_desc && mimeinfo->description ?
_("Description:") : _("Filename:"),
" </b>", tmp, NULL);
-#else
- tiptmp = g_strconcat(tip, "\n",
- prefs_common.attach_desc && mimeinfo->description ?
- _("Description:") : _("Filename:"),
- " ", tmp, NULL);
-#endif
g_free(tip);
tip = tiptmp;
g_free(tmp);
@@ -2415,11 +2401,7 @@
}
g_free(sigshort);
-#if GTK_CHECK_VERSION(2,12,0)
gtk_widget_set_tooltip_markup(button, tip);
-#else
- CLAWS_SET_TIP(button, tip);
-#endif
g_free(tip);
gtk_widget_show_all(button);
gtk_drag_source_set(button, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK,
Index: statusbar.c
===================================================================
RCS file: /home/claws-mail/claws/src/statusbar.c,v
retrieving revision 1.5.2.30
retrieving revision 1.5.2.31
diff -u -d -r1.5.2.30 -r1.5.2.31
--- statusbar.c 7 Oct 2011 09:40:15 -0000 1.5.2.30
+++ statusbar.c 22 Oct 2011 17:09:03 -0000 1.5.2.31
@@ -65,11 +65,7 @@
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));
-#else
- child = GTK_STATUSBAR(statusbar)->label;
-#endif
parent = gtk_widget_get_parent(child);
gtk_container_remove(GTK_CONTAINER(parent), g_object_ref(child));
hbox = gtk_hbox_new(FALSE, 0);
@@ -255,7 +251,7 @@
gtk_progress_bar_set_text(progressbar, buf);
gtk_progress_bar_set_fraction(progressbar,
(total == 0) ? 0 : (gfloat)done / (gfloat)total);
- if (!gtkut_widget_get_visible(GTK_WIDGET(progressbar)))
+ if (!gtk_widget_get_visible(GTK_WIDGET(progressbar)))
gtk_widget_show(GTK_WIDGET(progressbar));
} else if (total == 0) {
gtk_progress_bar_set_text(progressbar, "");
Index: prefs_actions.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_actions.c,v
retrieving revision 1.60.2.74
retrieving revision 1.60.2.75
diff -u -d -r1.60.2.74 -r1.60.2.75
--- prefs_actions.c 7 Oct 2011 09:17:49 -0000 1.60.2.74
+++ prefs_actions.c 22 Oct 2011 17:09:03 -0000 1.60.2.75
@@ -197,7 +197,6 @@
GtkWidget *up_btn;
GtkWidget *down_btn;
static GdkGeometry geometry;
- CLAWS_TIP_DECL();
debug_print("Creating actions configuration window...\n");
Index: main.c
===================================================================
RCS file: /home/claws-mail/claws/src/main.c,v
retrieving revision 1.115.2.242
retrieving revision 1.115.2.243
diff -u -d -r1.115.2.242 -r1.115.2.243
--- main.c 17 Oct 2011 10:50:28 -0000 1.115.2.242
+++ main.c 22 Oct 2011 17:09:03 -0000 1.115.2.243
@@ -424,7 +424,6 @@
gint r = 0;
GtkWidget *window = NULL;
GtkWidget *keep_backup_chk;
- CLAWS_TIP_DECL();
gboolean backup = TRUE;
keep_backup_chk = gtk_check_button_new_with_label (_("Keep old configuration"));
@@ -1182,33 +1181,6 @@
g_error(_("g_thread is not supported by glib.\n"));
}
- /* check that we're not on a too recent/old gtk+ */
-#if GTK_CHECK_VERSION(2, 9, 0)
- if (gtk_check_version(2, 9, 0) != NULL) {
- alertpanel_error(_("Claws Mail has been compiled with "
- "a more recent GTK+ library than is "
- "currently available. This will cause "
- "crashes. You need to upgrade GTK+ or "
- "recompile Claws Mail."));
-#ifdef G_OS_WIN32
- win32_close_log();
-#endif
- exit(1);
- }
-#else
- if (gtk_check_version(2, 9, 0) == NULL) {
- alertpanel_error(_("Claws Mail has been compiled with "
- "an older GTK+ library than is "
- "currently available. This will cause "
- "crashes. You need to recompile "
- "Claws Mail."));
-#ifdef G_OS_WIN32
- win32_close_log();
-#endif
- exit(1);
- }
-#endif
-
#ifdef G_OS_WIN32
CHDIR_EXEC_CODE_RETURN_VAL_IF_FAIL(get_home_dir(), 1, win32_close_log(););
#else
Index: summary_search.c
===================================================================
RCS file: /home/claws-mail/claws/src/summary_search.c,v
retrieving revision 1.15.2.67
retrieving revision 1.15.2.68
diff -u -d -r1.15.2.67 -r1.15.2.68
--- summary_search.c 7 Oct 2011 09:40:15 -0000 1.15.2.67
+++ summary_search.c 22 Oct 2011 17:09:03 -0000 1.15.2.68
@@ -222,7 +222,6 @@
GtkWidget *close_btn;
GtkWidget *stop_btn;
gboolean is_searching = FALSE;
- CLAWS_TIP_DECL();
window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "summary_search");
gtk_window_set_title(GTK_WINDOW (window), _("Search messages"));
Index: folderview.c
===================================================================
RCS file: /home/claws-mail/claws/src/folderview.c,v
retrieving revision 1.207.2.222
retrieving revision 1.207.2.223
diff -u -d -r1.207.2.222 -r1.207.2.223
--- folderview.c 7 Oct 2011 09:17:49 -0000 1.207.2.222
+++ folderview.c 22 Oct 2011 17:09:03 -0000 1.207.2.223
@@ -2173,7 +2173,7 @@
gtk_cmctree_expand(ctree, row);
/* ungrab the mouse event */
- if (gtkut_widget_has_grab(GTK_WIDGET(ctree))) {
+ if (gtk_widget_has_grab(GTK_WIDGET(ctree))) {
gtk_grab_remove(GTK_WIDGET(ctree));
if (gdk_pointer_is_grabbed())
gdk_pointer_ungrab(GDK_CURRENT_TIME);
Index: prefs_msg_colors.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_msg_colors.c,v
retrieving revision 1.1.2.45
retrieving revision 1.1.2.46
diff -u -d -r1.1.2.45 -r1.1.2.46
--- prefs_msg_colors.c 19 Oct 2011 08:44:27 -0000 1.1.2.45
+++ prefs_msg_colors.c 22 Oct 2011 17:09:03 -0000 1.1.2.46
@@ -133,7 +133,6 @@
gint c;
gchar *tooltip_btn_text = NULL;
gchar *tooltip_entry_text = NULL;
- CLAWS_TIP_DECL();
notebook = gtk_notebook_new();
gtk_widget_show(notebook);
Index: prefs_template.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_template.c,v
retrieving revision 1.12.2.76
retrieving revision 1.12.2.77
diff -u -d -r1.12.2.76 -r1.12.2.77
--- prefs_template.c 7 Oct 2011 09:17:50 -0000 1.12.2.76
+++ prefs_template.c 22 Oct 2011 17:09:03 -0000 1.12.2.77
@@ -184,7 +184,6 @@
GtkWidget *ok_btn;
static GdkGeometry geometry;
gint i;
- CLAWS_TIP_DECL();
debug_print("Creating templates configuration window...\n");
Index: headerview.c
===================================================================
RCS file: /home/claws-mail/claws/src/headerview.c,v
retrieving revision 1.8.2.33
retrieving revision 1.8.2.34
diff -u -d -r1.8.2.33 -r1.8.2.34
--- headerview.c 16 Feb 2011 07:16:00 -0000 1.8.2.33
+++ headerview.c 22 Oct 2011 17:09:03 -0000 1.8.2.34
@@ -258,13 +258,13 @@
!msginfo->extradata->xface ||
strlen(msginfo->extradata->xface) < 5) {
if (headerview->image &&
- gtkut_widget_get_visible(headerview->image)) {
+ gtk_widget_get_visible(headerview->image)) {
gtk_widget_hide(headerview->image);
gtk_widget_queue_resize(hbox);
}
return -1;
}
- if (!gtkut_widget_get_visible(headerview->hbox)) return -1;
+ if (!gtk_widget_get_visible(headerview->hbox)) return -1;
if (headerview->image) {
gtk_widget_destroy(headerview->image);
@@ -295,13 +295,13 @@
if (!msginfo->extradata || !msginfo->extradata->face) {
if (headerview->image &&
- gtkut_widget_get_visible(headerview->image)) {
+ gtk_widget_get_visible(headerview->image)) {
gtk_widget_hide(headerview->image);
gtk_widget_queue_resize(hbox);
}
return -1;
}
- if (!gtkut_widget_get_visible(headerview->hbox)) return -1;
+ if (!gtk_widget_get_visible(headerview->hbox)) return -1;
if (headerview->image) {
gtk_widget_destroy(headerview->image);
@@ -331,7 +331,7 @@
GError *error = NULL;
GdkPixbuf *picture = NULL;
- if (!gtkut_widget_get_visible(headerview->hbox)) return;
+ if (!gtk_widget_get_visible(headerview->hbox)) return;
if (headerview->image) {
picture = gtk_image_get_pixbuf(GTK_IMAGE(headerview->image));
@@ -360,7 +360,7 @@
GdkPixbuf *picture = NULL;
gint w, h;
- if (!gtkut_widget_get_visible(headerview->hbox)) return -1;
+ if (!gtk_widget_get_visible(headerview->hbox)) return -1;
if (headerview->image) {
gtk_widget_destroy(headerview->image);
@@ -425,7 +425,7 @@
gtk_widget_hide(headerview->tags_header_label);
gtk_widget_hide(headerview->tags_body_label);
- if (headerview->image && gtkut_widget_get_visible(headerview->image)) {
+ if (headerview->image && gtk_widget_get_visible(headerview->image)) {
gtk_widget_hide(headerview->image);
gtk_widget_queue_resize(headerview->hbox);
}
Index: mainwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/mainwindow.c,v
retrieving revision 1.274.2.331
retrieving revision 1.274.2.332
diff -u -d -r1.274.2.331 -r1.274.2.332
--- mainwindow.c 7 Oct 2011 09:40:15 -0000 1.274.2.331
+++ mainwindow.c 22 Oct 2011 17:09:03 -0000 1.274.2.332
@@ -1093,11 +1093,7 @@
if (keyval == GDK_KEY_BackSpace) {
const gchar *accel_path;
-#if GTK_CHECK_VERSION(2,14,0)
accel_path = gtk_menu_item_get_accel_path(item);
-#else
- accel_path = GTK_MENU_ITEM(item)->accel_path;
-#endif
keyval = 0; modifier = 0;
gtk_accel_map_change_entry (accel_path, keyval, modifier, TRUE);
}
@@ -1546,7 +1542,6 @@
GtkWidget *offline_pixmap;
GtkWidget *warning_icon;
GtkWidget *warning_btn;
- CLAWS_TIP_DECL();
#endif
GtkWidget *online_switch;
GtkWidget *offline_switch;
@@ -3610,7 +3605,7 @@
{
static gboolean first_start = TRUE;
- if (!gtkut_widget_get_visible(GTK_WIDGET(mainwin->window)))
+ if (!gtk_widget_get_visible(GTK_WIDGET(mainwin->window)))
main_window_show(mainwin);
if (prefs_common.mainwin_maximised)
@@ -4868,7 +4863,7 @@
MessageView *msgview = mainwin->messageview;
if (messageview_is_visible(msgview) &&
- (gtkut_widget_has_focus(msgview->mimeview->textview->text)))
+ (gtk_widget_has_focus(msgview->mimeview->textview->text)))
messageview_select_all(mainwin->messageview);
else
summary_select_all(mainwin->summaryview);
Index: prefs_account.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_account.c,v
retrieving revision 1.105.2.169
retrieving revision 1.105.2.170
diff -u -d -r1.105.2.169 -r1.105.2.170
--- prefs_account.c 7 Oct 2011 09:40:15 -0000 1.105.2.169
+++ prefs_account.c 22 Oct 2011 17:09:03 -0000 1.105.2.170
@@ -1391,7 +1391,6 @@
GtkWidget *maxarticle_label;
GtkWidget *maxarticle_spinbtn;
GtkAdjustment *maxarticle_spinbtn_adj;
- CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
@@ -2404,7 +2403,6 @@
GtkWidget *hbox;
GtkWidget *hbox_spc;
GtkWidget *label;
- CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
@@ -2638,8 +2636,6 @@
GtkWidget *trash_folder_checkbtn;
GtkWidget *trash_folder_entry;
GtkWidget *imap_use_trash_checkbtn;
-
- CLAWS_TIP_DECL();
GtkSizeGroup *size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
#define PACK_HBOX(hbox) \
{ \
@@ -4602,7 +4598,7 @@
{
gboolean auth;
- if (!gtkut_widget_get_sensitive (GTK_WIDGET (button)))
+ if (!gtk_widget_get_sensitive (GTK_WIDGET (button)))
return;
auth = gtk_toggle_button_get_active (button);
gtk_widget_set_sensitive(basic_page.uid_label, auth);
Index: printing.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/printing.c,v
retrieving revision 1.1.2.34
retrieving revision 1.1.2.35
diff -u -d -r1.1.2.34 -r1.1.2.35
--- printing.c 7 Oct 2011 09:40:15 -0000 1.1.2.34
+++ printing.c 22 Oct 2011 17:09:03 -0000 1.1.2.35
@@ -193,7 +193,6 @@
read_from_file = FALSE;
-#if GTK_CHECK_VERSION(2,14,0)
/* try reading the page setup from file */
page_setup_filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
PRINTING_PAGE_SETUP_STORAGE_FILE, NULL);
@@ -212,11 +211,6 @@
} else {
debug_print("Printing: Could not read page setup from key file\n");
}
-#else
- key_file_read = FALSE;
- keyfile = NULL;
- page_setup_filename = NULL;
-#endif
/* if reading from file did not work, or has not been tried (GTK+ < 2.14), use prefs */
if (!read_from_file) {
@@ -282,10 +276,8 @@
/* Config for printing */
gtk_print_operation_set_print_settings(op, settings);
gtk_print_operation_set_default_page_setup(op, page_setup);
-#if GTK_CHECK_VERSION(2, 18, 0)
/* enable Page Size and Orientation in the print dialog */
gtk_print_operation_set_embed_page_setup(op, TRUE);
-#endif
/* signals */
g_signal_connect(op, "begin_print", G_CALLBACK(renderer->cb_begin_print), print_data);
@@ -387,7 +379,6 @@
prefs_common.print_margin_right = (int) (100*gtk_page_setup_get_right_margin(page_setup,
PAGE_MARGIN_STORAGE_UNIT));
-#if GTK_CHECK_VERSION(2,14,0)
/* save to file */
keyfile = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
PRINTING_PAGE_SETUP_STORAGE_FILE, NULL);
@@ -395,7 +386,6 @@
debug_print("Printing: Could not store page setup in file `%s'\n", keyfile);
}
g_free(keyfile);
-#endif
}
static gboolean cb_preview(GtkPrintOperation *operation,
@@ -416,7 +406,6 @@
static GdkGeometry geometry;
GtkWidget *dialog = NULL;
GtkWidget *statusbar = gtk_hbox_new(2, FALSE);
- CLAWS_TIP_DECL();
debug_print("Creating internal print preview\n");
Index: addrgather.c
===================================================================
RCS file: /home/claws-mail/claws/src/addrgather.c,v
retrieving revision 1.5.10.35
retrieving revision 1.5.10.36
diff -u -d -r1.5.10.35 -r1.5.10.36
--- addrgather.c 7 Oct 2011 09:40:14 -0000 1.5.10.35
+++ addrgather.c 22 Oct 2011 17:09:02 -0000 1.5.10.36
@@ -275,7 +275,6 @@
GtkWidget *checkRecurse;
gint top;
gint i;
- CLAWS_TIP_DECL();
/* Container */
vbox = gtk_vbox_new(FALSE, 6);
Index: account.c
===================================================================
RCS file: /home/claws-mail/claws/src/account.c,v
retrieving revision 1.61.2.100
retrieving revision 1.61.2.101
diff -u -d -r1.61.2.100 -r1.61.2.101
--- account.c 7 Oct 2011 09:17:48 -0000 1.61.2.100
+++ account.c 22 Oct 2011 17:09:02 -0000 1.61.2.101
@@ -1518,7 +1518,6 @@
{
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
- CLAWS_TIP_DECL();
renderer = gtk_cell_renderer_toggle_new();
g_object_set(renderer,
Index: prefs_spelling.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_spelling.c,v
retrieving revision 1.5.2.42
retrieving revision 1.5.2.43
diff -u -d -r1.5.2.42 -r1.5.2.43
--- prefs_spelling.c 16 Feb 2011 07:16:14 -0000 1.5.2.42
+++ prefs_spelling.c 22 Oct 2011 17:09:03 -0000 1.5.2.43
@@ -116,8 +116,6 @@
GtkWidget *misspelled_hbox;
GtkWidget *misspelled_colorbtn;
- CLAWS_TIP_DECL();
-
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
Index: prefs_ext_prog.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_ext_prog.c,v
retrieving revision 1.3.2.26
retrieving revision 1.3.2.27
diff -u -d -r1.3.2.26 -r1.3.2.27
--- prefs_ext_prog.c 16 Feb 2011 07:16:12 -0000 1.3.2.26
+++ prefs_ext_prog.c 22 Oct 2011 17:09:03 -0000 1.3.2.27
@@ -82,7 +82,6 @@
GtkWidget *exteditor_entry;
GtkWidget *astextviewer_label;
GtkWidget *astextviewer_entry;
- CLAWS_TIP_DECL();
int i = 0;
gchar *tmp;
Index: noticeview.c
===================================================================
RCS file: /home/claws-mail/claws/src/noticeview.c,v
retrieving revision 1.5.2.26
retrieving revision 1.5.2.27
diff -u -d -r1.5.2.26 -r1.5.2.27
--- noticeview.c 7 Oct 2011 09:08:56 -0000 1.5.2.26
+++ noticeview.c 22 Oct 2011 17:09:03 -0000 1.5.2.27
@@ -68,7 +68,6 @@
GtkWidget *widget;
GtkWidget *widget2;
GtkWidget *evtbox;
- CLAWS_TIP_DECL();
debug_print("Creating notice view...\n");
noticeview = g_new0(NoticeView, 1);
More information about the Commits
mailing list