[Commits] account.c 1.61.2.99 1.61.2.100 action.c 1.12.2.67 1.12.2.68 addr_compl.c 1.27.2.54 1.27.2.55 addrcustomattr.c 1.1.2.9 1.1.2.10 addrduplicates.c 1.1.2.17 1.1.2.18 addressadd.c 1.9.2.32 1.9.2.33 addressbook.c 1.60.2.144 1.60.2.145 addressbook_foldersel.c 1.1.2.19 1.1.2.20 addrgather.c 1.5.10.33 1.5.10.34 alertpanel.c 1.17.2.44 1.17.2.45 browseldap.c 1.2.4.26 1.2.4.27 compose.c 1.382.2.581 1.382.2.582 editaddress.c 1.14.2.60 1.14.2.61 editaddress_other_attributes_ldap.c 1.1.2.15 1.1.2.16 editbook.c 1.5.12.16 1.5.12.17 editgroup.c 1.11.2.26 1.11.2.27 editjpilot.c 1.5.12.18 1.5.12.19 editldap.c 1.8.2.40 1.8.2.41 editldap_basedn.c 1.10.2.18 1.10.2.19 edittags.c 1.1.2.25 1.1.2.26 editvcard.c 1.5.12.17 1.5.12.18 exphtmldlg.c 1.3.2.28 1.3.2.29 expldifdlg.c 1.1.4.33 1.1.4.34 export.c 1.8.2.31 1.8.2.32 foldersel.c 1.26.2.46 1.26.2.47 folderview.c 1.207.2.221 1.207.2.222 grouplistdialog.c 1.14.2.29 1.14.2.30 import.c 1.13.2.30 1.13.2.31 importldif.c 1.14.2.26 1.14.2.27 importmutt.c 1.4.12.22 1.4.12.23 importpine.c 1.1.14.22 1.1.14.23 mainwindow.c 1.274.2.329 1.274.2.330 message_search.c 1.3.12.39 1.3.12.40 messageview.c 1.94.2.218 1.94.2.219 mimeview.c 1.83.2.171 1.83.2.172 prefs_actions.c 1.60.2.73 1.60.2.74 prefs_customheader.c 1.16.2.41 1.16.2.42 prefs_display_header.c 1.16.2.43 1.16.2.44 prefs_filtering.c 1.59.2.82 1.59.2.83 prefs_filtering_action.c 1.1.4.70 1.1.4.71 prefs_folder_column.c 1.1.2.19 1.1.2.20 prefs_matcher.c 1.43.2.89 1.43.2.90 prefs_msg_colors.c 1.1.2.43 1.1.2.44 prefs_other.c 1.1.2.41 1.1.2.42 prefs_summaries.c 1.1.2.66 1.1.2.67 prefs_summary_column.c 1.10.2.28 1.10.2.29 prefs_summary_open.c 1.1.2.10 1.1.2.11 prefs_template.c 1.12.2.75 1.12.2.76 prefs_toolbar.c 1.30.2.68 1.30.2.69 printing.c 1.1.2.32 1.1.2.33 sourcewindow.c 1.9.2.26 1.9.2.27 ssl_manager.c 1.3.2.35 1.3.2.36 summary_search.c 1.15.2.65 1.15.2.66 summaryview.c 1.395.2.431 1.395.2.432 textview.c 1.96.2.233 1.96.2.234 uri_opener.c 1.1.2.14 1.1.2.15
colin at claws-mail.org
colin at claws-mail.org
Fri Oct 7 11:17:52 CEST 2011
Update of /home/claws-mail/claws/src
In directory claws-mail:/tmp/cvs-serv24785/src
Modified Files:
Tag: gtk2
account.c action.c addr_compl.c addrcustomattr.c
addrduplicates.c addressadd.c addressbook.c
addressbook_foldersel.c addrgather.c alertpanel.c browseldap.c
compose.c editaddress.c editaddress_other_attributes_ldap.c
editbook.c editgroup.c editjpilot.c editldap.c
editldap_basedn.c edittags.c editvcard.c exphtmldlg.c
expldifdlg.c export.c foldersel.c folderview.c
grouplistdialog.c import.c importldif.c importmutt.c
importpine.c mainwindow.c message_search.c messageview.c
mimeview.c prefs_actions.c prefs_customheader.c
prefs_display_header.c prefs_filtering.c
prefs_filtering_action.c prefs_folder_column.c prefs_matcher.c
prefs_msg_colors.c prefs_other.c prefs_summaries.c
prefs_summary_column.c prefs_summary_open.c prefs_template.c
prefs_toolbar.c printing.c sourcewindow.c ssl_manager.c
summary_search.c summaryview.c textview.c uri_opener.c
Log Message:
2011-10-07 [colin] 3.7.10cvs20
* src/account.c
* src/action.c
* src/addr_compl.c
* src/addrcustomattr.c
* src/addrduplicates.c
* src/addressadd.c
* src/addressbook.c
* src/addressbook_foldersel.c
* src/addrgather.c
* src/alertpanel.c
* src/browseldap.c
* src/compose.c
* src/editaddress.c
* src/editaddress_other_attributes_ldap.c
* src/editbook.c
* src/editgroup.c
* src/editjpilot.c
* src/editldap.c
* src/editldap_basedn.c
* src/edittags.c
* src/editvcard.c
* src/exphtmldlg.c
* src/expldifdlg.c
* src/export.c
* src/foldersel.c
* src/folderview.c
* src/grouplistdialog.c
* src/import.c
* src/importldif.c
* src/importmutt.c
* src/importpine.c
* src/mainwindow.c
* src/message_search.c
* src/messageview.c
* src/mimeview.c
* src/prefs_actions.c
* src/prefs_customheader.c
* src/prefs_display_header.c
* src/prefs_filtering.c
* src/prefs_filtering_action.c
* src/prefs_folder_column.c
* src/prefs_matcher.c
* src/prefs_msg_colors.c
* src/prefs_other.c
* src/prefs_summaries.c
* src/prefs_summary_column.c
* src/prefs_summary_open.c
* src/prefs_template.c
* src/prefs_toolbar.c
* src/printing.c
* src/sourcewindow.c
* src/ssl_manager.c
* src/summary_search.c
* src/summaryview.c
* src/textview.c
* src/uri_opener.c
* src/gtk/about.c
* src/gtk/colorsel.c
* src/gtk/combobox.c
* src/gtk/description_window.c
* src/gtk/foldersort.c
* src/gtk/gtkaspell.c
* src/gtk/gtkcmclist.c
* src/gtk/gtkcmctree.c
* src/gtk/gtkcmoptionmenu.c
* src/gtk/gtkutils.c
* src/gtk/icon_legend.c
* src/gtk/inputdialog.c
* src/gtk/logwindow.c
* src/gtk/pluginwindow.c
* src/gtk/prefswindow.c
* src/gtk/quicksearch.c
* src/plugins/pgpcore/passphrase.c
* src/plugins/pgpcore/select-keys.c
Bug #2371, "Port to GTK+ 3.0". Monster-patch by Hanno Meyer-Thurow
to replace GDK_* by GDK_KEY_*.
Index: edittags.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/edittags.c,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -u -d -r1.1.2.25 -r1.1.2.26
--- edittags.c 7 Oct 2011 09:08:56 -0000 1.1.2.25
+++ edittags.c 7 Oct 2011 09:17:49 -0000 1.1.2.26
@@ -488,9 +488,9 @@
{
if (applywindow.busy)
return FALSE;
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
apply_window_close();
- else if (event && event->keyval == GDK_Delete)
+ else if (event && event->keyval == GDK_KEY_Delete)
apply_popup_delete(NULL, NULL);
return FALSE;
}
@@ -500,7 +500,7 @@
if (applywindow.busy)
return FALSE;
- if (event && (event->keyval == GDK_KP_Enter || event->keyval == GDK_Return)) {
+ if (event && (event->keyval == GDK_KEY_KP_Enter || event->keyval == GDK_KEY_Return)) {
apply_window_add_tag();
gtk_entry_set_text(GTK_ENTRY(applywindow.add_entry), "");
gtk_widget_grab_focus(applywindow.taglist);
Index: prefs_other.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_other.c,v
retrieving revision 1.1.2.41
retrieving revision 1.1.2.42
diff -u -d -r1.1.2.41 -r1.1.2.42
--- prefs_other.c 10 Apr 2011 17:19:04 -0000 1.1.2.41
+++ prefs_other.c 7 Oct 2011 09:17:49 -0000 1.1.2.42
@@ -159,7 +159,7 @@
static gboolean prefs_keybind_key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
prefs_keybind_cancel();
return FALSE;
}
Index: exphtmldlg.c
===================================================================
RCS file: /home/claws-mail/claws/src/exphtmldlg.c,v
retrieving revision 1.3.2.28
retrieving revision 1.3.2.29
diff -u -d -r1.3.2.28 -r1.3.2.29
--- exphtmldlg.c 16 Feb 2011 07:15:58 -0000 1.3.2.28
+++ exphtmldlg.c 7 Oct 2011 09:17:49 -0000 1.3.2.29
@@ -146,7 +146,7 @@
* \param data User data.
*/
static gboolean export_html_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data ) {
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
export_html_cancel( widget, data );
}
return FALSE;
Index: expldifdlg.c
===================================================================
RCS file: /home/claws-mail/claws/src/expldifdlg.c,v
retrieving revision 1.1.4.33
retrieving revision 1.1.4.34
diff -u -d -r1.1.4.33 -r1.1.4.34
--- expldifdlg.c 16 Feb 2011 07:15:58 -0000 1.1.4.33
+++ expldifdlg.c 7 Oct 2011 09:17:49 -0000 1.1.4.34
@@ -148,7 +148,7 @@
* \param data User data.
*/
static gboolean export_ldif_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data ) {
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
export_ldif_cancel( widget, data );
}
return FALSE;
Index: summaryview.c
===================================================================
RCS file: /home/claws-mail/claws/src/summaryview.c,v
retrieving revision 1.395.2.431
retrieving revision 1.395.2.432
diff -u -d -r1.395.2.431 -r1.395.2.432
--- summaryview.c 7 Oct 2011 09:08:56 -0000 1.395.2.431
+++ summaryview.c 7 Oct 2011 09:17:50 -0000 1.395.2.432
@@ -6581,7 +6581,7 @@
if (summaryview->selected) {
gboolean handled = FALSE;
switch (event->keyval) {
- case GDK_space: /* Page down or go to the next */
+ case GDK_KEY_space: /* Page down or go to the next */
handled = TRUE;
if (event->state & GDK_CONTROL_MASK) {
handled = FALSE;
@@ -6604,12 +6604,12 @@
}
}
break;
- case GDK_BackSpace: /* Page up */
+ case GDK_KEY_BackSpace: /* Page up */
handled = TRUE;
mimeview_scroll_page(messageview->mimeview, TRUE);
break;
- case GDK_Return: /* Scroll up/down one line */
- case GDK_KP_Enter:
+ case GDK_KEY_Return: /* Scroll up/down one line */
+ case GDK_KEY_KP_Enter:
handled = TRUE;
if (summaryview->displayed != summaryview->selected) {
#ifndef GENERIC_UMPC
@@ -6631,21 +6631,21 @@
return TRUE;
switch (event->keyval) {
- case GDK_Left: /* Move focus */
+ case GDK_KEY_Left: /* Move focus */
adj = gtk_scrolled_window_get_hadjustment
(GTK_SCROLLED_WINDOW(summaryview->scrolledwin));
if (gtk_adjustment_get_lower(adj) != gtk_adjustment_get_value(adj))
break;
/* FALLTHROUGH */
- case GDK_Escape:
+ case GDK_KEY_Escape:
gtk_widget_grab_focus(summaryview->folderview->ctree);
mainwindow_exit_folder(summaryview->mainwin);
return TRUE;
- case GDK_Home:
- case GDK_End:
+ case GDK_KEY_Home:
+ case GDK_KEY_End:
if ((node = summaryview->selected) != NULL) {
GtkCMCTreeNode *next = NULL;
- next = (event->keyval == GDK_Home)
+ next = (event->keyval == GDK_KEY_Home)
? gtk_cmctree_node_nth(ctree, 0)
: gtk_cmctree_node_nth(ctree,
g_list_length(GTK_CMCLIST(ctree)->row_list)-1);
@@ -6673,16 +6673,16 @@
}
switch (event->keyval) {
- case GDK_Delete:
+ case GDK_KEY_Delete:
BREAK_ON_MODIFIER_KEY();
summary_delete_trash(summaryview);
break;
- case GDK_y:
- case GDK_t:
- case GDK_l:
- case GDK_o:
- case GDK_c:
- case GDK_a:
+ case GDK_KEY_y:
+ case GDK_KEY_t:
+ case GDK_KEY_l:
+ case GDK_KEY_o:
+ case GDK_KEY_c:
+ case GDK_KEY_a:
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
g_signal_stop_emission_by_name(G_OBJECT(widget),
"key_press_event");
Index: prefs_display_header.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_display_header.c,v
retrieving revision 1.16.2.43
retrieving revision 1.16.2.44
diff -u -d -r1.16.2.43 -r1.16.2.44
--- prefs_display_header.c 10 Apr 2011 17:19:04 -0000 1.16.2.43
+++ prefs_display_header.c 7 Oct 2011 09:17:49 -0000 1.16.2.44
@@ -703,7 +703,7 @@
GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
prefs_display_header_cancel();
return FALSE;
}
Index: addr_compl.c
===================================================================
RCS file: /home/claws-mail/claws/src/addr_compl.c,v
retrieving revision 1.27.2.54
retrieving revision 1.27.2.55
diff -u -d -r1.27.2.54 -r1.27.2.55
--- addr_compl.c 7 Oct 2011 09:08:55 -0000 1.27.2.54
+++ addr_compl.c 7 Oct 2011 09:17:48 -0000 1.27.2.55
@@ -1212,14 +1212,14 @@
GdkEventKey *ev,
gpointer data)
{
- if (ev->keyval == GDK_Tab) {
+ if (ev->keyval == GDK_KEY_Tab) {
addrcompl_clear_queue();
_allowCommas_ = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(entry), ENTRY_DATA_ALLOW_COMMAS));
if( address_completion_complete_address_in_entry( entry, TRUE ) ) {
/* route a void character to the default handler */
/* this is a dirty hack; we're actually changing a key
* reported by the system. */
- ev->keyval = GDK_AudibleBell_Enable;
+ ev->keyval = GDK_KEY_AudibleBell_Enable;
ev->state &= ~GDK_SHIFT_MASK;
/* Create window */
@@ -1233,16 +1233,16 @@
else {
/* old behaviour */
}
- } else if (ev->keyval == GDK_Shift_L
- || ev->keyval == GDK_Shift_R
- || ev->keyval == GDK_Control_L
- || ev->keyval == GDK_Control_R
- || ev->keyval == GDK_Caps_Lock
- || ev->keyval == GDK_Shift_Lock
- || ev->keyval == GDK_Meta_L
- || ev->keyval == GDK_Meta_R
- || ev->keyval == GDK_Alt_L
- || ev->keyval == GDK_Alt_R) {
+ } else if (ev->keyval == GDK_KEY_Shift_L
+ || ev->keyval == GDK_KEY_Shift_R
+ || ev->keyval == GDK_KEY_Control_L
+ || ev->keyval == GDK_KEY_Control_R
+ || ev->keyval == GDK_KEY_Caps_Lock
+ || ev->keyval == GDK_KEY_Shift_Lock
+ || ev->keyval == GDK_KEY_Meta_L
+ || ev->keyval == GDK_KEY_Meta_R
+ || ev->keyval == GDK_KEY_Alt_L
+ || ev->keyval == GDK_KEY_Alt_R) {
/* these buttons should not clear the cache... */
} else
clear_completion_cache();
@@ -1451,17 +1451,17 @@
cm_return_val_if_fail(entry != NULL, FALSE);
/* allow keyboard navigation in the alternatives tree view */
- if (event->keyval == GDK_Up || event->keyval == GDK_Down ||
- event->keyval == GDK_Page_Up || event->keyval == GDK_Page_Down) {
+ if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down ||
+ event->keyval == GDK_KEY_Page_Up || event->keyval == GDK_KEY_Page_Down) {
completion_window_advance_selection
(GTK_TREE_VIEW(list_view),
- event->keyval == GDK_Down ||
- event->keyval == GDK_Page_Down ? TRUE : FALSE);
+ event->keyval == GDK_KEY_Down ||
+ event->keyval == GDK_KEY_Page_Down ? TRUE : FALSE);
return FALSE;
}
/* make tab move to next field */
- if( event->keyval == GDK_Tab ) {
+ if( event->keyval == GDK_KEY_Tab ) {
/* Reference to parent */
parent = gtk_widget_get_parent(GTK_WIDGET(entry));
@@ -1477,7 +1477,7 @@
}
/* make backtab move to previous field */
- if( event->keyval == GDK_ISO_Left_Tab ) {
+ if( event->keyval == GDK_KEY_ISO_Left_Tab ) {
/* Reference to parent */
parent = gtk_widget_get_parent(GTK_WIDGET(entry));
@@ -1494,17 +1494,17 @@
_allowCommas_ = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(entry), ENTRY_DATA_ALLOW_COMMAS));
/* look for presses that accept the selection */
- if (event->keyval == GDK_Return || event->keyval == GDK_space ||
- event->keyval == GDK_KP_Enter ||
- (_allowCommas_ && event->keyval == GDK_comma)) {
+ if (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_space ||
+ event->keyval == GDK_KEY_KP_Enter ||
+ (_allowCommas_ && event->keyval == GDK_KEY_comma)) {
/* User selected address with a key press */
/* Display selected address in entry field */
completion_window_apply_selection(
GTK_TREE_VIEW(list_view), GTK_ENTRY(entry),
- event->keyval != GDK_comma);
+ event->keyval != GDK_KEY_comma);
- if (event->keyval == GDK_comma) {
+ if (event->keyval == GDK_KEY_comma) {
gint pos = gtk_editable_get_position(GTK_EDITABLE(entry));
gtk_editable_insert_text(GTK_EDITABLE(entry), ", ", 2, &pos);
gtk_editable_set_position(GTK_EDITABLE(entry), pos + 1);
@@ -1517,16 +1517,16 @@
}
/* key state keys should never be handled */
- if (event->keyval == GDK_Shift_L
- || event->keyval == GDK_Shift_R
- || event->keyval == GDK_Control_L
- || event->keyval == GDK_Control_R
- || event->keyval == GDK_Caps_Lock
- || event->keyval == GDK_Shift_Lock
- || event->keyval == GDK_Meta_L
- || event->keyval == GDK_Meta_R
- || event->keyval == GDK_Alt_L
- || event->keyval == GDK_Alt_R) {
+ if (event->keyval == GDK_KEY_Shift_L
+ || event->keyval == GDK_KEY_Shift_R
+ || event->keyval == GDK_KEY_Control_L
+ || event->keyval == GDK_KEY_Control_R
+ || event->keyval == GDK_KEY_Caps_Lock
+ || event->keyval == GDK_KEY_Shift_Lock
+ || event->keyval == GDK_KEY_Meta_L
+ || event->keyval == GDK_KEY_Meta_R
+ || event->keyval == GDK_KEY_Alt_L
+ || event->keyval == GDK_KEY_Alt_R) {
return FALSE;
}
Index: importpine.c
===================================================================
RCS file: /home/claws-mail/claws/src/importpine.c,v
retrieving revision 1.1.14.22
retrieving revision 1.1.14.23
diff -u -d -r1.1.14.22 -r1.1.14.23
--- importpine.c 16 Feb 2011 07:16:03 -0000 1.1.14.22
+++ importpine.c 7 Oct 2011 09:17:49 -0000 1.1.14.23
@@ -174,7 +174,7 @@
}
static gboolean imp_pine_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
Index: alertpanel.c
===================================================================
RCS file: /home/claws-mail/claws/src/alertpanel.c,v
retrieving revision 1.17.2.44
retrieving revision 1.17.2.45
diff -u -d -r1.17.2.44 -r1.17.2.45
--- alertpanel.c 7 Oct 2011 09:08:55 -0000 1.17.2.44
+++ alertpanel.c 7 Oct 2011 09:17:48 -0000 1.17.2.45
@@ -421,7 +421,7 @@
gpointer data)
{
if (event->type == GDK_KEY_PRESS)
- if (((GdkEventKey *)event)->keyval != GDK_Escape)
+ if (((GdkEventKey *)event)->keyval != GDK_KEY_Escape)
return FALSE;
value = (value & ~G_ALERT_VALUE_MASK) | (AlertValue)data;
Index: prefs_filtering.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_filtering.c,v
retrieving revision 1.59.2.82
retrieving revision 1.59.2.83
diff -u -d -r1.59.2.82 -r1.59.2.83
--- prefs_filtering.c 16 Feb 2011 07:16:12 -0000 1.59.2.82
+++ prefs_filtering.c 7 Oct 2011 09:17:49 -0000 1.59.2.83
@@ -1532,7 +1532,7 @@
static gboolean prefs_filtering_key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
prefs_filtering_cancel(NULL, NULL);
return TRUE;
}
Index: messageview.c
===================================================================
RCS file: /home/claws-mail/claws/src/messageview.c,v
retrieving revision 1.94.2.218
retrieving revision 1.94.2.219
diff -u -d -r1.94.2.218 -r1.94.2.219
--- messageview.c 31 Aug 2011 16:54:54 -0000 1.94.2.218
+++ messageview.c 7 Oct 2011 09:17:49 -0000 1.94.2.219
@@ -1717,14 +1717,14 @@
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
MessageView *messageview)
{
- if (event && event->keyval == GDK_Escape && messageview->window) {
+ if (event && event->keyval == GDK_KEY_Escape && messageview->window) {
messageview_destroy(messageview);
return TRUE;
}
if (event && (event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0)
return FALSE;
- if (event && (event->state & GDK_SHIFT_MASK) && event->keyval != GDK_space)
+ if (event && (event->state & GDK_SHIFT_MASK) && event->keyval != GDK_KEY_space)
return FALSE;
g_signal_stop_emission_by_name(G_OBJECT(widget),
Index: editbook.c
===================================================================
RCS file: /home/claws-mail/claws/src/editbook.c,v
retrieving revision 1.5.12.16
retrieving revision 1.5.12.17
diff -u -d -r1.5.12.16 -r1.5.12.17
--- editbook.c 16 Feb 2011 07:15:57 -0000 1.5.12.16
+++ editbook.c 7 Oct 2011 09:17:49 -0000 1.5.12.17
@@ -91,7 +91,7 @@
}
static gboolean edit_book_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
Index: prefs_summary_column.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_summary_column.c,v
retrieving revision 1.10.2.28
retrieving revision 1.10.2.29
diff -u -d -r1.10.2.28 -r1.10.2.29
--- prefs_summary_column.c 7 Oct 2011 09:08:56 -0000 1.10.2.28
+++ prefs_summary_column.c 7 Oct 2011 09:17:50 -0000 1.10.2.29
@@ -671,7 +671,7 @@
GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
summary_col.finished = TRUE;
return FALSE;
}
Index: editaddress.c
===================================================================
RCS file: /home/claws-mail/claws/src/editaddress.c,v
retrieving revision 1.14.2.60
retrieving revision 1.14.2.61
diff -u -d -r1.14.2.60 -r1.14.2.61
--- editaddress.c 10 Apr 2011 17:19:04 -0000 1.14.2.60
+++ editaddress.c 7 Oct 2011 09:17:49 -0000 1.14.2.61
@@ -200,7 +200,7 @@
static gboolean edit_person_key_pressed(GtkWidget *widget, GdkEventKey *event, gboolean *cancelled) {
if (prefs_common.addressbook_use_editaddress_dialog) {
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
@@ -1021,7 +1021,7 @@
static gboolean edit_person_entry_email_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Return) {
+ if (event && event->keyval == GDK_KEY_Return) {
if (email_saving)
edit_person_email_modify(NULL);
else if (email_adding)
@@ -1236,7 +1236,7 @@
static gboolean edit_person_entry_att_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Return) {
+ if (event && event->keyval == GDK_KEY_Return) {
if (attrib_saving)
edit_person_attrib_modify(NULL);
else if (attrib_adding)
Index: export.c
===================================================================
RCS file: /home/claws-mail/claws/src/export.c,v
retrieving revision 1.8.2.31
retrieving revision 1.8.2.32
diff -u -d -r1.8.2.31 -r1.8.2.32
--- export.c 16 Feb 2011 07:15:58 -0000 1.8.2.31
+++ export.c 7 Oct 2011 09:17:49 -0000 1.8.2.32
@@ -276,7 +276,7 @@
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
export_cancel_cb(NULL, NULL);
return FALSE;
}
Index: addrcustomattr.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/addrcustomattr.c,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- addrcustomattr.c 16 Feb 2011 07:15:55 -0000 1.1.2.9
+++ addrcustomattr.c 7 Oct 2011 09:17:48 -0000 1.1.2.10
@@ -433,9 +433,9 @@
static gboolean custom_attr_window_key_pressed(GtkWidget *widget,
GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
custom_attr_window_close();
- else if (event && event->keyval == GDK_Delete)
+ else if (event && event->keyval == GDK_KEY_Delete)
custom_attr_popup_delete(NULL, NULL);
return FALSE;
}
@@ -443,7 +443,7 @@
static gboolean custom_attr_window_add_key_pressed(GtkWidget *widget,
GdkEventKey *event, gpointer data)
{
- if (event && (event->keyval == GDK_KP_Enter || event->keyval == GDK_Return)) {
+ if (event && (event->keyval == GDK_KEY_KP_Enter || event->keyval == GDK_KEY_Return)) {
custom_attr_window_add_attr();
gtk_entry_set_text(GTK_ENTRY(custom_attr_window.add_entry), "");
gtk_widget_grab_focus(custom_attr_window.attr_list);
Index: uri_opener.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/uri_opener.c,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -d -r1.1.2.14 -r1.1.2.15
--- uri_opener.c 16 Feb 2011 07:16:17 -0000 1.1.2.14
+++ uri_opener.c 7 Oct 2011 09:17:50 -0000 1.1.2.15
@@ -322,7 +322,7 @@
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
uri_opener_close();
return FALSE;
}
Index: summary_search.c
===================================================================
RCS file: /home/claws-mail/claws/src/summary_search.c,v
retrieving revision 1.15.2.65
retrieving revision 1.15.2.66
diff -u -d -r1.15.2.65 -r1.15.2.66
--- summary_search.c 10 Apr 2011 17:19:04 -0000 1.15.2.65
+++ summary_search.c 7 Oct 2011 09:17:50 -0000 1.15.2.66
@@ -934,7 +934,7 @@
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event && (event->keyval == GDK_Escape)) {
+ if (event && (event->keyval == GDK_KEY_Escape)) {
/* ESC key will:
- stop a running search
- close the search window if no search is running
@@ -946,13 +946,13 @@
}
}
- if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)) {
+ if (event && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)) {
if (!search_window.is_searching) {
summary_search_execute(FALSE, FALSE);
}
}
- if (event && (event->keyval == GDK_Down || event->keyval == GDK_Up)) {
+ if (event && (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_Up)) {
if (search_window.from_entry_has_focus) {
combobox_set_value_from_arrow_key(
GTK_COMBO_BOX(search_window.from_entry),
Index: compose.c
===================================================================
RCS file: /home/claws-mail/claws/src/compose.c,v
retrieving revision 1.382.2.581
retrieving revision 1.382.2.582
diff -u -d -r1.382.2.581 -r1.382.2.582
--- compose.c 7 Oct 2011 09:08:55 -0000 1.382.2.581
+++ compose.c 7 Oct 2011 09:17:48 -0000 1.382.2.582
@@ -8797,11 +8797,11 @@
GdkEventKey *event,
gboolean *cancelled)
{
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
- if (event && event->keyval == GDK_Return) {
+ if (event && event->keyval == GDK_KEY_Return) {
*cancelled = FALSE;
gtk_main_quit();
return TRUE;
@@ -9295,7 +9295,7 @@
if (!event) return FALSE;
switch (event->keyval) {
- case GDK_Delete:
+ case GDK_KEY_Delete:
compose_attach_remove_selected(NULL, compose);
break;
}
@@ -10793,7 +10793,7 @@
if ((g_slist_length(headerentry->compose->header_list) > 0) &&
((headerentry->headernum + 1) != headerentry->compose->header_nextrow) &&
!(event->state & GDK_MODIFIER_MASK) &&
- (event->keyval == GDK_BackSpace) &&
+ (event->keyval == GDK_KEY_BackSpace) &&
(strlen(gtk_entry_get_text(GTK_ENTRY(entry))) == 0)) {
gtk_container_remove
(GTK_CONTAINER(headerentry->compose->header_table),
@@ -10805,7 +10805,7 @@
g_slist_remove(headerentry->compose->header_list,
headerentry);
g_free(headerentry);
- } else if (event->keyval == GDK_Tab) {
+ } else if (event->keyval == GDK_KEY_Tab) {
if (headerentry->compose->header_last == headerentry) {
/* Override default next focus, and give it to subject_entry
* instead of notebook tabs
Index: addrduplicates.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/addrduplicates.c,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -d -r1.1.2.17 -r1.1.2.18
--- addrduplicates.c 16 Feb 2011 07:15:55 -0000 1.1.2.17
+++ addrduplicates.c 7 Oct 2011 09:17:48 -0000 1.1.2.18
@@ -885,9 +885,9 @@
gpointer data)
{
if(event) {
- if(event->keyval == GDK_Delete && detail_view_has_focus)
+ if(event->keyval == GDK_KEY_Delete && detail_view_has_focus)
cb_del_btn_clicked(NULL,NULL);
- else if(event->keyval == GDK_Escape)
+ else if(event->keyval == GDK_KEY_Escape)
gtk_widget_destroy(dialog);
}
Index: prefs_summaries.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_summaries.c,v
retrieving revision 1.1.2.66
retrieving revision 1.1.2.67
diff -u -d -r1.1.2.66 -r1.1.2.67
--- prefs_summaries.c 9 Apr 2011 21:00:42 -0000 1.1.2.66
+++ prefs_summaries.c 7 Oct 2011 09:17:49 -0000 1.1.2.67
@@ -733,7 +733,7 @@
static gboolean date_format_key_pressed(GtkWidget *keywidget, GdkEventKey *event,
GtkWidget **widget)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
date_format_cancel_btn_clicked(NULL, widget);
return FALSE;
}
Index: prefs_toolbar.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_toolbar.c,v
retrieving revision 1.30.2.68
retrieving revision 1.30.2.69
diff -u -d -r1.30.2.68 -r1.30.2.69
--- prefs_toolbar.c 7 Oct 2011 09:08:56 -0000 1.30.2.68
+++ prefs_toolbar.c 7 Oct 2011 09:17:50 -0000 1.30.2.69
@@ -1536,7 +1536,7 @@
static gboolean icon_chooser_key_pressed(GtkWidget *widget, GdkEventKey *event,
ToolbarPage *prefs_toolbar)
{
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
icon_chooser_cancel_clicked(NULL, prefs_toolbar);
return TRUE;
}
@@ -1548,9 +1548,9 @@
ToolbarPage *prefs_toolbar)
{
if (event) {
- if (event->keyval == GDK_KP_Enter ||
- event->keyval == GDK_Return ||
- event->keyval == GDK_space) {
+ if (event->keyval == GDK_KEY_KP_Enter ||
+ event->keyval == GDK_KEY_Return ||
+ event->keyval == GDK_KEY_space) {
icon_chooser_ok_clicked(NULL, prefs_toolbar);
return TRUE;
}
Index: editldap.c
===================================================================
RCS file: /home/claws-mail/claws/src/editldap.c,v
retrieving revision 1.8.2.40
retrieving revision 1.8.2.41
diff -u -d -r1.8.2.40 -r1.8.2.41
--- editldap.c 16 Feb 2011 07:15:57 -0000 1.8.2.40
+++ editldap.c 7 Oct 2011 09:17:49 -0000 1.8.2.41
@@ -206,7 +206,7 @@
}
static gboolean edit_ldap_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
Index: importldif.c
===================================================================
RCS file: /home/claws-mail/claws/src/importldif.c,v
retrieving revision 1.14.2.26
retrieving revision 1.14.2.27
diff -u -d -r1.14.2.26 -r1.14.2.27
--- importldif.c 16 Feb 2011 07:16:03 -0000 1.14.2.26
+++ importldif.c 7 Oct 2011 09:17:49 -0000 1.14.2.27
@@ -613,7 +613,7 @@
* \param data User data.
*/
static gboolean imp_ldif_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data ) {
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
imp_ldif_cancel( widget, data );
}
return FALSE;
Index: grouplistdialog.c
===================================================================
RCS file: /home/claws-mail/claws/src/grouplistdialog.c,v
retrieving revision 1.14.2.29
retrieving revision 1.14.2.30
diff -u -d -r1.14.2.29 -r1.14.2.30
--- grouplistdialog.c 7 Oct 2011 09:08:56 -0000 1.14.2.29
+++ grouplistdialog.c 7 Oct 2011 09:17:49 -0000 1.14.2.30
@@ -551,7 +551,7 @@
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
cancel_clicked(NULL, NULL);
return FALSE;
}
Index: addressbook.c
===================================================================
RCS file: /home/claws-mail/claws/src/addressbook.c,v
retrieving revision 1.60.2.144
retrieving revision 1.60.2.145
diff -u -d -r1.60.2.144 -r1.60.2.145
--- addressbook.c 7 Oct 2011 09:08:55 -0000 1.60.2.144
+++ addressbook.c 7 Oct 2011 09:17:48 -0000 1.60.2.145
@@ -694,9 +694,9 @@
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
addressbook_close();
- else if (event && event->keyval == GDK_Delete) {
+ else if (event && event->keyval == GDK_KEY_Delete) {
/* TODO: enable deletion when focus is in ctree (needs implementation in _del_clicked() */
if ( /* address_index_has_focus || */ address_list_has_focus )
addressbook_del_clicked(NULL, NULL);
@@ -4378,7 +4378,7 @@
static gboolean addressbook_entry_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter))
+ if (event && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter))
addressbook_lup_clicked(NULL, NULL);
return FALSE;
}
Index: message_search.c
===================================================================
RCS file: /home/claws-mail/claws/src/message_search.c,v
retrieving revision 1.3.12.39
retrieving revision 1.3.12.40
diff -u -d -r1.3.12.39 -r1.3.12.40
--- message_search.c 10 Apr 2011 17:19:04 -0000 1.3.12.39
+++ message_search.c 7 Oct 2011 09:17:49 -0000 1.3.12.40
@@ -391,15 +391,15 @@
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event && (event->keyval == GDK_Escape)) {
+ if (event && (event->keyval == GDK_KEY_Escape)) {
gtk_widget_hide(search_window.window);
}
- if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)) {
+ if (event && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)) {
message_search_execute(FALSE);
}
- if (event && (event->keyval == GDK_Down || event->keyval == GDK_Up)) {
+ if (event && (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_Up)) {
if (search_window.body_entry_has_focus) {
combobox_set_value_from_arrow_key(
GTK_COMBO_BOX(search_window.body_entry),
Index: prefs_filtering_action.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_filtering_action.c,v
retrieving revision 1.1.4.70
retrieving revision 1.1.4.71
diff -u -d -r1.1.4.70 -r1.1.4.71
--- prefs_filtering_action.c 7 Oct 2011 09:08:56 -0000 1.1.4.70
+++ prefs_filtering_action.c 7 Oct 2011 09:17:49 -0000 1.1.4.71
@@ -1129,7 +1129,7 @@
static gboolean prefs_filtering_action_key_pressed(GtkWidget *widget,
GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
prefs_filtering_action_cancel();
return TRUE;
}
Index: browseldap.c
===================================================================
RCS file: /home/claws-mail/claws/src/browseldap.c,v
retrieving revision 1.2.4.26
retrieving revision 1.2.4.27
diff -u -d -r1.2.4.26 -r1.2.4.27
--- browseldap.c 10 Apr 2011 08:07:06 -0000 1.2.4.26
+++ browseldap.c 7 Oct 2011 09:17:48 -0000 1.2.4.27
@@ -179,7 +179,7 @@
static void browse_key_pressed(
GtkWidget *widget, GdkEventKey *event, gboolean *cancelled )
{
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
gtk_main_quit();
}
}
Index: editgroup.c
===================================================================
RCS file: /home/claws-mail/claws/src/editgroup.c,v
retrieving revision 1.11.2.26
retrieving revision 1.11.2.27
diff -u -d -r1.11.2.26 -r1.11.2.27
--- editgroup.c 16 Feb 2011 07:15:57 -0000 1.11.2.26
+++ editgroup.c 7 Oct 2011 09:17:49 -0000 1.11.2.27
@@ -114,7 +114,7 @@
}
static gboolean edit_group_key_pressed(GtkWidget *widget, GdkEventKey *event, gboolean *cancelled) {
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
Index: mimeview.c
===================================================================
RCS file: /home/claws-mail/claws/src/mimeview.c,v
retrieving revision 1.83.2.171
retrieving revision 1.83.2.172
diff -u -d -r1.83.2.171 -r1.83.2.172
--- mimeview.c 7 Oct 2011 09:08:56 -0000 1.83.2.171
+++ mimeview.c 7 Oct 2011 09:17:49 -0000 1.83.2.172
@@ -1443,8 +1443,8 @@
return FALSE;
switch (event->keyval) {
- case GDK_Page_Down:
- case GDK_space:
+ case GDK_KEY_Page_Down:
+ case GDK_KEY_space:
if (mimeview_scroll_page(mimeview,
(event->state & GDK_SHIFT_MASK) != 0))
return TRUE;
@@ -1452,59 +1452,59 @@
if (!(event->state & GDK_SHIFT_MASK))
mimeview_select_next_part(mimeview);
return TRUE;
- case GDK_Page_Up:
- case GDK_BackSpace:
+ case GDK_KEY_Page_Up:
+ case GDK_KEY_BackSpace:
mimeview_scroll_page(mimeview, TRUE);
return TRUE;
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
mimeview_scroll_one_line(mimeview,
(event->state & GDK_MOD1_MASK) != 0);
return TRUE;
- case GDK_Up:
- case GDK_Down:
- mimeview_scroll_one_line(mimeview, (event->keyval == GDK_Up));
+ case GDK_KEY_Up:
+ case GDK_KEY_Down:
+ mimeview_scroll_one_line(mimeview, (event->keyval == GDK_KEY_Up));
return TRUE;
- case GDK_n:
- case GDK_N:
+ case GDK_KEY_n:
+ case GDK_KEY_N:
BREAK_ON_MODIFIER_KEY();
mimeview_select_next_part(mimeview);
return TRUE;
- case GDK_p:
- case GDK_P:
+ case GDK_KEY_p:
+ case GDK_KEY_P:
BREAK_ON_MODIFIER_KEY();
mimeview_select_prev_part(mimeview);
return TRUE;
- case GDK_y:
+ case GDK_KEY_y:
BREAK_ON_MODIFIER_KEY();
KEY_PRESS_EVENT_STOP();
mimeview_save_as(mimeview);
return TRUE;
- case GDK_t:
+ case GDK_KEY_t:
BREAK_ON_MODIFIER_KEY();
KEY_PRESS_EVENT_STOP();
mimeview_display_as_text(mimeview);
return TRUE;
- case GDK_l:
+ case GDK_KEY_l:
BREAK_ON_MODIFIER_KEY();
KEY_PRESS_EVENT_STOP();
mimeview_launch(mimeview, NULL);
return TRUE;
- case GDK_o:
+ case GDK_KEY_o:
BREAK_ON_MODIFIER_KEY();
KEY_PRESS_EVENT_STOP();
#ifndef G_OS_WIN32
mimeview_open_with(mimeview);
#endif
return TRUE;
- case GDK_c:
+ case GDK_KEY_c:
BREAK_ON_MODIFIER_KEY();
KEY_PRESS_EVENT_STOP();
mimeview_check_signature(mimeview);
return TRUE;
- case GDK_a:
+ case GDK_KEY_a:
BREAK_ON_MODIFIER_KEY();
KEY_PRESS_EVENT_STOP();
mimeview_select_next_part(mimeview);
@@ -2159,7 +2159,7 @@
textview = mimeview->textview;
switch (event->keyval) {
- case GDK_space:
+ case GDK_KEY_space:
if (mimeview_scroll_page(mimeview, FALSE))
return TRUE;
@@ -2167,50 +2167,50 @@
return TRUE;
break;
- case GDK_BackSpace:
+ case GDK_KEY_BackSpace:
mimeview_scroll_page(mimeview, TRUE);
return TRUE;
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
mimeview_scroll_one_line(mimeview,
(event->state & GDK_MOD1_MASK) != 0);
return TRUE;
- case GDK_n:
- case GDK_N:
+ case GDK_KEY_n:
+ case GDK_KEY_N:
BREAK_ON_MODIFIER_KEY();
mimeview_select_next_part(mimeview);
return TRUE;
- case GDK_p:
- case GDK_P:
+ case GDK_KEY_p:
+ case GDK_KEY_P:
BREAK_ON_MODIFIER_KEY();
mimeview_select_prev_part(mimeview);
break;
- case GDK_y:
+ case GDK_KEY_y:
BREAK_ON_MODIFIER_KEY();
mimeview_save_as(mimeview);
return TRUE;
- case GDK_t:
+ case GDK_KEY_t:
BREAK_ON_MODIFIER_KEY();
mimeview_display_as_text(mimeview);
return TRUE;
- case GDK_l:
+ case GDK_KEY_l:
BREAK_ON_MODIFIER_KEY();
mimeview_launch(mimeview, NULL);
return TRUE;
#ifndef G_OS_WIN32
- case GDK_o:
+ case GDK_KEY_o:
BREAK_ON_MODIFIER_KEY();
mimeview_open_with(mimeview);
return TRUE;
#endif
- case GDK_c:
+ case GDK_KEY_c:
BREAK_ON_MODIFIER_KEY();
mimeview_check_signature(mimeview);
return TRUE;
- case GDK_a:
+ case GDK_KEY_a:
BREAK_ON_MODIFIER_KEY();
mimeview_select_next_part(mimeview);
return TRUE;
Index: addressadd.c
===================================================================
RCS file: /home/claws-mail/claws/src/addressadd.c,v
retrieving revision 1.9.2.32
retrieving revision 1.9.2.33
diff -u -d -r1.9.2.32 -r1.9.2.33
--- addressadd.c 16 Feb 2011 07:15:55 -0000 1.9.2.32
+++ addressadd.c 7 Oct 2011 09:17:48 -0000 1.9.2.33
@@ -88,7 +88,7 @@
}
static gboolean addressadd_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
addressadd_cancelled = TRUE;
gtk_main_quit();
}
Index: prefs_summary_open.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_summary_open.c,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- prefs_summary_open.c 16 Feb 2011 07:16:14 -0000 1.1.2.10
+++ prefs_summary_open.c 7 Oct 2011 09:17:50 -0000 1.1.2.11
@@ -526,7 +526,7 @@
GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
prefs_summary_open_cancel();
return FALSE;
}
Index: importmutt.c
===================================================================
RCS file: /home/claws-mail/claws/src/importmutt.c,v
retrieving revision 1.4.12.22
retrieving revision 1.4.12.23
diff -u -d -r1.4.12.22 -r1.4.12.23
--- importmutt.c 16 Feb 2011 07:16:03 -0000 1.4.12.22
+++ importmutt.c 7 Oct 2011 09:17:49 -0000 1.4.12.23
@@ -175,7 +175,7 @@
}
static gboolean imp_mutt_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
Index: textview.c
===================================================================
RCS file: /home/claws-mail/claws/src/textview.c,v
retrieving revision 1.96.2.233
retrieving revision 1.96.2.234
diff -u -d -r1.96.2.233 -r1.96.2.234
--- textview.c 7 Oct 2011 09:08:56 -0000 1.96.2.233
+++ textview.c 7 Oct 2011 09:17:50 -0000 1.96.2.234
@@ -2271,19 +2271,19 @@
summaryview = messageview->mainwin->summaryview;
switch (event->keyval) {
- case GDK_Tab:
- case GDK_Home:
- case GDK_Left:
- case GDK_Up:
- case GDK_Right:
- case GDK_Down:
- case GDK_Page_Up:
- case GDK_Page_Down:
- case GDK_End:
- case GDK_Control_L:
- case GDK_Control_R:
+ case GDK_KEY_Tab:
+ case GDK_KEY_Home:
+ case GDK_KEY_Left:
+ case GDK_KEY_Up:
+ case GDK_KEY_Right:
+ case GDK_KEY_Down:
+ case GDK_KEY_Page_Up:
+ case GDK_KEY_Page_Down:
+ case GDK_KEY_End:
+ case GDK_KEY_Control_L:
+ case GDK_KEY_Control_R:
return FALSE;
- case GDK_space:
+ case GDK_KEY_space:
if (summaryview)
summary_pass_key_press_event(summaryview, event);
else
@@ -2292,25 +2292,25 @@
(event->state &
(GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
break;
- case GDK_BackSpace:
+ case GDK_KEY_BackSpace:
mimeview_scroll_page(messageview->mimeview, TRUE);
break;
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
mimeview_scroll_one_line
(messageview->mimeview, (event->state &
(GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
break;
- case GDK_Delete:
+ case GDK_KEY_Delete:
if (summaryview)
summary_pass_key_press_event(summaryview, event);
break;
- case GDK_y:
- case GDK_t:
- case GDK_l:
- case GDK_o:
- case GDK_c:
- case GDK_a:
+ case GDK_KEY_y:
+ case GDK_KEY_t:
+ case GDK_KEY_l:
+ case GDK_KEY_o:
+ case GDK_KEY_c:
+ case GDK_KEY_a:
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
KEY_PRESS_EVENT_STOP();
mimeview_pass_key_press_event(messageview->mimeview,
Index: prefs_matcher.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_matcher.c,v
retrieving revision 1.43.2.89
retrieving revision 1.43.2.90
diff -u -d -r1.43.2.89 -r1.43.2.90
--- prefs_matcher.c 10 Apr 2011 17:19:04 -0000 1.43.2.89
+++ prefs_matcher.c 7 Oct 2011 09:17:49 -0000 1.43.2.90
@@ -1980,7 +1980,7 @@
static gboolean prefs_matcher_key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
prefs_matcher_cancel();
return TRUE;
}
Index: import.c
===================================================================
RCS file: /home/claws-mail/claws/src/import.c,v
retrieving revision 1.13.2.30
retrieving revision 1.13.2.31
diff -u -d -r1.13.2.30 -r1.13.2.31
--- import.c 16 Feb 2011 07:16:01 -0000 1.13.2.30
+++ import.c 7 Oct 2011 09:17:49 -0000 1.13.2.31
@@ -283,7 +283,7 @@
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
import_cancel_cb(NULL, NULL);
return FALSE;
}
Index: sourcewindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/sourcewindow.c,v
retrieving revision 1.9.2.26
retrieving revision 1.9.2.27
diff -u -d -r1.9.2.26 -r1.9.2.27
--- sourcewindow.c 16 Feb 2011 07:16:16 -0000 1.9.2.26
+++ sourcewindow.c 7 Oct 2011 09:17:50 -0000 1.9.2.27
@@ -206,17 +206,17 @@
if (!event || !sourcewin) return FALSE;
switch (event->keyval) {
- case GDK_A:
- case GDK_a:
+ case GDK_KEY_A:
+ case GDK_KEY_a:
if ((event->state & GDK_CONTROL_MASK) != 0)
gtk_editable_select_region(GTK_EDITABLE(sourcewin->text), 0, -1);
break;
- case GDK_W:
- case GDK_w:
+ case GDK_KEY_W:
+ case GDK_KEY_w:
if ((event->state & GDK_CONTROL_MASK) != 0)
gtk_widget_destroy(sourcewin->window);
break;
- case GDK_Escape:
+ case GDK_KEY_Escape:
source_window_destroy(sourcewin);
return TRUE;
break;
Index: prefs_folder_column.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_folder_column.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_folder_column.c 7 Oct 2011 09:08:56 -0000 1.1.2.19
+++ prefs_folder_column.c 7 Oct 2011 09:17:49 -0000 1.1.2.20
@@ -656,7 +656,7 @@
GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
folder_col.finished = TRUE;
return FALSE;
}
Index: prefs_actions.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_actions.c,v
retrieving revision 1.60.2.73
retrieving revision 1.60.2.74
diff -u -d -r1.60.2.73 -r1.60.2.74
--- prefs_actions.c 16 Feb 2011 07:16:12 -0000 1.60.2.73
+++ prefs_actions.c 7 Oct 2011 09:17:49 -0000 1.60.2.74
@@ -848,7 +848,7 @@
static gboolean prefs_actions_key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
prefs_actions_cancel(widget, data);
else {
GtkWidget *focused = gtkut_get_focused_child(
Index: editaddress_other_attributes_ldap.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/editaddress_other_attributes_ldap.c,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -d -r1.1.2.15 -r1.1.2.16
--- editaddress_other_attributes_ldap.c 10 Apr 2011 17:19:04 -0000 1.1.2.15
+++ editaddress_other_attributes_ldap.c 7 Oct 2011 09:17:49 -0000 1.1.2.16
@@ -266,7 +266,7 @@
static gboolean edit_person_entry_att_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)) {
+ if (event && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)) {
if (attrib_saving)
edit_person_attrib_modify(NULL);
else if (attrib_adding)
Index: action.c
===================================================================
RCS file: /home/claws-mail/claws/src/action.c,v
retrieving revision 1.12.2.67
retrieving revision 1.12.2.68
diff -u -d -r1.12.2.67 -r1.12.2.68
--- action.c 7 Oct 2011 09:08:55 -0000 1.12.2.67
+++ action.c 7 Oct 2011 09:17:48 -0000 1.12.2.68
@@ -1185,9 +1185,9 @@
static gint io_dialog_key_pressed_cb(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event && (event->keyval == GDK_Escape ||
- event->keyval == GDK_Return ||
- event->keyval == GDK_KP_Enter))
+ if (event && (event->keyval == GDK_KEY_Escape ||
+ event->keyval == GDK_KEY_Return ||
+ event->keyval == GDK_KEY_KP_Enter))
hide_io_dialog_cb(widget, data);
return TRUE;
}
Index: editvcard.c
===================================================================
RCS file: /home/claws-mail/claws/src/editvcard.c,v
retrieving revision 1.5.12.17
retrieving revision 1.5.12.18
diff -u -d -r1.5.12.17 -r1.5.12.18
--- editvcard.c 16 Feb 2011 07:15:57 -0000 1.5.12.17
+++ editvcard.c 7 Oct 2011 09:17:49 -0000 1.5.12.18
@@ -121,7 +121,7 @@
}
static gboolean edit_vcard_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
Index: ssl_manager.c
===================================================================
RCS file: /home/claws-mail/claws/src/ssl_manager.c,v
retrieving revision 1.3.2.35
retrieving revision 1.3.2.36
diff -u -d -r1.3.2.35 -r1.3.2.36
--- ssl_manager.c 30 Aug 2011 06:18:09 -0000 1.3.2.35
+++ ssl_manager.c 7 Oct 2011 09:17:50 -0000 1.3.2.36
@@ -375,7 +375,7 @@
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
ssl_manager_close();
return FALSE;
}
Index: foldersel.c
===================================================================
RCS file: /home/claws-mail/claws/src/foldersel.c,v
retrieving revision 1.26.2.46
retrieving revision 1.26.2.47
diff -u -d -r1.26.2.46 -r1.26.2.47
--- foldersel.c 16 Feb 2011 07:15:59 -0000 1.26.2.46
+++ foldersel.c 7 Oct 2011 09:17:49 -0000 1.26.2.47
@@ -619,7 +619,7 @@
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
foldersel_cancel(NULL, NULL);
return FALSE;
}
Index: folderview.c
===================================================================
RCS file: /home/claws-mail/claws/src/folderview.c,v
retrieving revision 1.207.2.221
retrieving revision 1.207.2.222
diff -u -d -r1.207.2.221 -r1.207.2.222
--- folderview.c 7 Oct 2011 09:08:56 -0000 1.207.2.221
+++ folderview.c 7 Oct 2011 09:17:49 -0000 1.207.2.222
@@ -2019,10 +2019,10 @@
return FALSE;
switch (event->keyval) {
- case GDK_Right:
+ case GDK_KEY_Right:
#ifndef GENERIC_UMPC
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
#endif
if (folderview->selected) {
folderview_select_node(folderview,
@@ -2030,7 +2030,7 @@
}
break;
#ifdef GENERIC_UMPC
- case GDK_Return:
+ case GDK_KEY_Return:
if (folderview->selected && GTK_CMCTREE_ROW(folderview->selected)->children) {
gtk_cmctree_toggle_expansion(
GTK_CMCTREE(folderview->ctree),
@@ -2038,7 +2038,7 @@
}
break;
#endif
- case GDK_space:
+ case GDK_KEY_space:
BREAK_ON_MODIFIER_KEY();
if (folderview->selected) {
if (folderview->opened == folderview->selected &&
Index: account.c
===================================================================
RCS file: /home/claws-mail/claws/src/account.c,v
retrieving revision 1.61.2.99
retrieving revision 1.61.2.100
diff -u -d -r1.61.2.99 -r1.61.2.100
--- account.c 7 Oct 2011 09:08:55 -0000 1.61.2.99
+++ account.c 7 Oct 2011 09:17:48 -0000 1.61.2.100
@@ -1230,7 +1230,7 @@
static gboolean account_key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
account_edit_close(NULL, NULL);
return FALSE;
}
Index: prefs_template.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_template.c,v
retrieving revision 1.12.2.75
retrieving revision 1.12.2.76
diff -u -d -r1.12.2.75 -r1.12.2.76
--- prefs_template.c 16 Feb 2011 07:16:14 -0000 1.12.2.75
+++ prefs_template.c 7 Oct 2011 09:17:50 -0000 1.12.2.76
@@ -510,7 +510,7 @@
static gboolean prefs_template_key_pressed_cb(GtkWidget *widget,
GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
prefs_template_cancel_cb(NULL, NULL);
else {
GtkWidget *focused = gtkut_get_focused_child(
Index: mainwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/mainwindow.c,v
retrieving revision 1.274.2.329
retrieving revision 1.274.2.330
diff -u -d -r1.274.2.329 -r1.274.2.330
--- mainwindow.c 7 Oct 2011 09:08:56 -0000 1.274.2.329
+++ mainwindow.c 7 Oct 2011 09:17:49 -0000 1.274.2.330
@@ -1091,7 +1091,7 @@
GtkLabel *label = g_object_get_data(G_OBJECT(item), "accel_label");
gchar *new_accel;
- if (keyval == GDK_BackSpace) {
+ 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);
@@ -1338,7 +1338,7 @@
}
switch (event->keyval) {
- case GDK_Q: /* Quit */
+ case GDK_KEY_Q: /* Quit */
#ifndef MAEMO
BREAK_ON_MODIFIER_KEY();
@@ -1347,7 +1347,7 @@
}
#endif
return FALSE;
- case GDK_space:
+ case GDK_KEY_space:
BREAK_ON_MODIFIER_KEY();
if (gtk_window_is_active(GTK_WINDOW(mainwin->window))) {
if (mainwin->folderview != NULL && mainwin->summaryview != NULL
@@ -1363,14 +1363,14 @@
break;
#ifdef MAEMO
- case GDK_F6:
+ case GDK_KEY_F6:
if (maemo_mainwindow_is_fullscreen(widget)) {
gtk_window_unfullscreen(GTK_WINDOW(widget));
} else {
gtk_window_fullscreen(GTK_WINDOW(widget));
}
break;
- case GDK_F7:
+ case GDK_KEY_F7:
{
PangoFontDescription *font_desc;
int size;
@@ -1394,7 +1394,7 @@
pango_font_description_free(font_desc);
}
break;
- case GDK_F8:
+ case GDK_KEY_F8:
{
PangoFontDescription *font_desc;
int size;
@@ -1418,7 +1418,7 @@
pango_font_description_free(font_desc);
}
break;
- case GDK_Escape:
+ case GDK_KEY_Escape:
if (mainwin->summaryview &&
mainwin->summaryview->ext_messageview &&
mainwin->summaryview->ext_messageview->window &&
Index: editjpilot.c
===================================================================
RCS file: /home/claws-mail/claws/src/editjpilot.c,v
retrieving revision 1.5.12.18
retrieving revision 1.5.12.19
diff -u -d -r1.5.12.18 -r1.5.12.19
--- editjpilot.c 16 Feb 2011 07:15:57 -0000 1.5.12.18
+++ editjpilot.c 7 Oct 2011 09:17:49 -0000 1.5.12.19
@@ -78,7 +78,7 @@
}
static gboolean edit_jpilot_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
Index: prefs_customheader.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_customheader.c,v
retrieving revision 1.16.2.41
retrieving revision 1.16.2.42
diff -u -d -r1.16.2.41 -r1.16.2.42
--- prefs_customheader.c 16 Feb 2011 07:16:12 -0000 1.16.2.41
+++ prefs_customheader.c 7 Oct 2011 09:17:49 -0000 1.16.2.42
@@ -778,7 +778,7 @@
GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
prefs_custom_header_cancel();
return FALSE;
}
Index: printing.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/printing.c,v
retrieving revision 1.1.2.32
retrieving revision 1.1.2.33
diff -u -d -r1.1.2.32 -r1.1.2.33
--- printing.c 7 Oct 2011 09:08:56 -0000 1.1.2.32
+++ printing.c 7 Oct 2011 09:17:50 -0000 1.1.2.33
@@ -581,7 +581,7 @@
{
PreviewData *preview_data = (PreviewData *)data;
if (event->type == GDK_KEY_PRESS)
- if (((GdkEventKey *)event)->keyval != GDK_Escape)
+ if (((GdkEventKey *)event)->keyval != GDK_KEY_Escape)
return FALSE;
if (preview_data->rendering)
return FALSE;
Index: addrgather.c
===================================================================
RCS file: /home/claws-mail/claws/src/addrgather.c,v
retrieving revision 1.5.10.33
retrieving revision 1.5.10.34
diff -u -d -r1.5.10.33 -r1.5.10.34
--- addrgather.c 16 Feb 2011 07:15:56 -0000 1.5.10.33
+++ addrgather.c 7 Oct 2011 09:17:48 -0000 1.5.10.34
@@ -121,7 +121,7 @@
static gboolean addrgather_dlg_key_pressed(
GtkWidget *widget, GdkEventKey *event, gpointer data )
{
- if( event && event->keyval == GDK_Escape ) {
+ if( event && event->keyval == GDK_KEY_Escape ) {
addrgather_dlg.cancelled = TRUE;
gtk_main_quit();
}
Index: addressbook_foldersel.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/addressbook_foldersel.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
--- addressbook_foldersel.c 16 Feb 2011 07:15:56 -0000 1.1.2.19
+++ addressbook_foldersel.c 7 Oct 2011 09:17:48 -0000 1.1.2.20
@@ -90,7 +90,7 @@
static gboolean addressbook_foldersel_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled )
{
- if ( event && event->keyval == GDK_Escape ) {
+ if ( event && event->keyval == GDK_KEY_Escape ) {
addressbook_foldersel_cancelled = TRUE;
gtk_main_quit();
}
Index: editldap_basedn.c
===================================================================
RCS file: /home/claws-mail/claws/src/editldap_basedn.c,v
retrieving revision 1.10.2.18
retrieving revision 1.10.2.19
diff -u -d -r1.10.2.18 -r1.10.2.19
--- editldap_basedn.c 16 Feb 2011 07:15:57 -0000 1.10.2.18
+++ editldap_basedn.c 7 Oct 2011 09:17:49 -0000 1.10.2.19
@@ -74,7 +74,7 @@
}
static gboolean edit_ldap_bdn_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
ldapedit_basedn_cancelled = TRUE;
gtk_main_quit();
}
Index: prefs_msg_colors.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_msg_colors.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_msg_colors.c 7 Oct 2011 09:08:56 -0000 1.1.2.43
+++ prefs_msg_colors.c 7 Oct 2011 09:17:49 -0000 1.1.2.44
@@ -745,11 +745,11 @@
if (event) {
switch (event->keyval) {
- case GDK_Escape:
+ case GDK_KEY_Escape:
gtk_button_clicked(GTK_BUTTON(&button_cancel));
return TRUE;
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
/* NOTE: changing focus makes widget accept all currently
* changed settings! */
gtk_widget_grab_focus(&button_ok);
More information about the Commits
mailing list