[Commits] about.c 1.4.2.80 1.4.2.81 colorsel.c 1.1.4.16 1.1.4.17 combobox.c 1.1.2.23 1.1.2.24 description_window.c 1.5.2.31 1.5.2.32 foldersort.c 1.1.2.21 1.1.2.22 gtkaspell.c 1.9.2.72 1.9.2.73 gtkcmclist.c 1.1.2.16 1.1.2.17 gtkcmctree.c 1.1.2.18 1.1.2.19 gtkcmoptionmenu.c 1.1.2.7 1.1.2.8 gtkutils.c 1.5.2.96 1.5.2.97 icon_legend.c 1.1.2.19 1.1.2.20 inputdialog.c 1.2.2.43 1.2.2.44 logwindow.c 1.1.4.38 1.1.4.39 pluginwindow.c 1.5.2.59 1.5.2.60 prefswindow.c 1.12.2.57 1.12.2.58 quicksearch.c 1.1.2.103 1.1.2.104
colin at claws-mail.org
colin at claws-mail.org
Fri Oct 7 11:17:53 CEST 2011
Update of /home/claws-mail/claws/src/gtk
In directory claws-mail:/tmp/cvs-serv24785/src/gtk
Modified Files:
Tag: gtk2
about.c colorsel.c combobox.c description_window.c
foldersort.c gtkaspell.c gtkcmclist.c gtkcmctree.c
gtkcmoptionmenu.c gtkutils.c icon_legend.c inputdialog.c
logwindow.c pluginwindow.c prefswindow.c quicksearch.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: colorsel.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/colorsel.c,v
retrieving revision 1.1.4.16
retrieving revision 1.1.4.17
diff -u -d -r1.1.4.16 -r1.1.4.17
--- colorsel.c 7 Oct 2011 09:08:57 -0000 1.1.4.16
+++ colorsel.c 7 Oct 2011 09:17:50 -0000 1.1.4.17
@@ -40,11 +40,11 @@
GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
*((gint *) data) = 1;
gtk_main_quit();
return TRUE;
- } else if (event && event->keyval == GDK_Return) {
+ } else if (event && event->keyval == GDK_KEY_Return) {
*((gint *) data) = 0;
gtk_main_quit();
return FALSE;
Index: description_window.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/description_window.c,v
retrieving revision 1.5.2.31
retrieving revision 1.5.2.32
diff -u -d -r1.5.2.31 -r1.5.2.32
--- description_window.c 6 Aug 2011 07:11:40 -0000 1.5.2.31
+++ description_window.c 7 Oct 2011 09:17:50 -0000 1.5.2.32
@@ -192,7 +192,7 @@
GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
description_window_destroy(widget, data);
return FALSE;
}
Index: foldersort.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/foldersort.c,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -d -r1.1.2.21 -r1.1.2.22
--- foldersort.c 24 Apr 2011 07:03:20 -0000 1.1.2.21
+++ foldersort.c 7 Oct 2011 09:17:50 -0000 1.1.2.22
@@ -123,7 +123,7 @@
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, FolderSortDialog *dialog)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
destroy_dialog(dialog);
return FALSE;
}
Index: prefswindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/prefswindow.c,v
retrieving revision 1.12.2.57
retrieving revision 1.12.2.58
diff -u -d -r1.12.2.57 -r1.12.2.58
--- prefswindow.c 7 Oct 2011 09:08:57 -0000 1.12.2.57
+++ prefswindow.c 7 Oct 2011 09:17:51 -0000 1.12.2.58
@@ -222,11 +222,11 @@
if (event) {
switch (event->keyval) {
- case GDK_Escape :
+ case GDK_KEY_Escape :
cancel_button_clicked(NULL, data);
break;
- case GDK_Return :
- case GDK_KP_Enter :
+ case GDK_KEY_Return :
+ case GDK_KEY_KP_Enter :
focused_child = gtkut_get_focused_child
(GTK_CONTAINER(data->notebook));
/* Press ok, if the focused child is not a text view
Index: gtkcmclist.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/gtkcmclist.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
--- gtkcmclist.c 7 Oct 2011 09:08:57 -0000 1.1.2.16
+++ gtkcmclist.c 7 Oct 2011 09:17:50 -0000 1.1.2.17
@@ -780,157 +780,157 @@
G_TYPE_NONE, 0);
binding_set = gtk_binding_set_by_class (klass);
- gtk_binding_entry_add_signal (binding_set, GDK_Up, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, 0,
"scroll_vertical", 2,
G_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Up, 0,
"scroll_vertical", 2,
G_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal (binding_set, GDK_Down, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, 0,
"scroll_vertical", 2,
G_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Down, 0,
"scroll_vertical", 2,
G_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Up, 0,
"scroll_vertical", 2,
G_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Up, 0,
"scroll_vertical", 2,
G_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Down, 0,
"scroll_vertical", 2,
G_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Down, 0,
"scroll_vertical", 2,
G_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal (binding_set, GDK_Home, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Home, GDK_CONTROL_MASK,
"scroll_vertical", 2,
G_TYPE_ENUM, GTK_SCROLL_JUMP,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Home, GDK_CONTROL_MASK,
"scroll_vertical", 2,
G_TYPE_ENUM, GTK_SCROLL_JUMP,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal (binding_set, GDK_End, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_End, GDK_CONTROL_MASK,
"scroll_vertical", 2,
G_TYPE_ENUM, GTK_SCROLL_JUMP,
G_TYPE_FLOAT, 1.0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_End, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_End, GDK_CONTROL_MASK,
"scroll_vertical", 2,
G_TYPE_ENUM, GTK_SCROLL_JUMP,
G_TYPE_FLOAT, 1.0);
- gtk_binding_entry_add_signal (binding_set, GDK_Up, GDK_SHIFT_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, GDK_SHIFT_MASK,
"extend_selection", 3,
G_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, GDK_SHIFT_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Up, GDK_SHIFT_MASK,
"extend_selection", 3,
G_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_Down, GDK_SHIFT_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, GDK_SHIFT_MASK,
"extend_selection", 3,
G_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, GDK_SHIFT_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Down, GDK_SHIFT_MASK,
"extend_selection", 3,
G_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, GDK_SHIFT_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Up, GDK_SHIFT_MASK,
"extend_selection", 3,
G_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up, GDK_SHIFT_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Up, GDK_SHIFT_MASK,
"extend_selection", 3,
G_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, GDK_SHIFT_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Down, GDK_SHIFT_MASK,
"extend_selection", 3,
G_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down, GDK_SHIFT_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Down, GDK_SHIFT_MASK,
"extend_selection", 3,
G_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_Home,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Home,
GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"extend_selection", 3,
G_TYPE_ENUM, GTK_SCROLL_JUMP,
G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Home,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Home,
GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"extend_selection", 3,
G_TYPE_ENUM, GTK_SCROLL_JUMP,
G_TYPE_FLOAT, 0.0, G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_End,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_End,
GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"extend_selection", 3,
G_TYPE_ENUM, GTK_SCROLL_JUMP,
G_TYPE_FLOAT, 1.0, G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_End,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_End,
GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"extend_selection", 3,
G_TYPE_ENUM, GTK_SCROLL_JUMP,
G_TYPE_FLOAT, 1.0, G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_Left, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, 0,
"scroll_horizontal", 2,
G_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left, 0,
"scroll_horizontal", 2,
G_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal (binding_set, GDK_Right, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, 0,
"scroll_horizontal", 2,
G_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right, 0,
"scroll_horizontal", 2,
G_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal (binding_set, GDK_Home, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Home, 0,
"scroll_horizontal", 2,
G_TYPE_ENUM, GTK_SCROLL_JUMP,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Home, 0,
"scroll_horizontal", 2,
G_TYPE_ENUM, GTK_SCROLL_JUMP,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal (binding_set, GDK_End, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_End, 0,
"scroll_horizontal", 2,
G_TYPE_ENUM, GTK_SCROLL_JUMP,
G_TYPE_FLOAT, 1.0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_End, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_End, 0,
"scroll_horizontal", 2,
G_TYPE_ENUM, GTK_SCROLL_JUMP,
G_TYPE_FLOAT, 1.0);
- gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0,
"undo_selection", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0,
"abort_column_resize", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_space, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, 0,
"toggle_focus_row", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, 0,
"toggle_focus_row", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, GDK_CONTROL_MASK,
"toggle_add_mode", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, GDK_CONTROL_MASK,
"toggle_add_mode", 0);
gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
"select_all", 0);
@@ -938,17 +938,17 @@
"select_all", 0);
gtk_binding_entry_add_signal (binding_set, '\\', GDK_CONTROL_MASK,
"unselect_all", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_Shift_L,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Shift_L,
GDK_RELEASE_MASK | GDK_SHIFT_MASK,
"end_selection", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_Shift_R,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Shift_R,
GDK_RELEASE_MASK | GDK_SHIFT_MASK,
"end_selection", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_Shift_L,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Shift_L,
GDK_RELEASE_MASK | GDK_SHIFT_MASK |
GDK_CONTROL_MASK,
"end_selection", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_Shift_R,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Shift_R,
GDK_RELEASE_MASK | GDK_SHIFT_MASK |
GDK_CONTROL_MASK,
"end_selection", 0);
Index: gtkcmctree.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/gtkcmctree.c,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -d -r1.1.2.18 -r1.1.2.19
--- gtkcmctree.c 7 Oct 2011 09:08:57 -0000 1.1.2.18
+++ gtkcmctree.c 7 Oct 2011 09:17:51 -0000 1.1.2.19
@@ -602,64 +602,64 @@
binding_set = gtk_binding_set_by_class (klass);
gtk_binding_entry_add_signal (binding_set,
- GDK_plus, 0,
+ GDK_KEY_plus, 0,
"change_focus_row_expansion", 1,
G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_EXPAND);
gtk_binding_entry_add_signal (binding_set,
- GDK_plus, GDK_CONTROL_MASK,
+ GDK_KEY_plus, GDK_CONTROL_MASK,
"change_focus_row_expansion", 1,
G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_EXPAND_RECURSIVE);
gtk_binding_entry_add_signal (binding_set,
- GDK_KP_Add, 0,
+ GDK_KEY_KP_Add, 0,
"change_focus_row_expansion", 1,
G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_EXPAND);
gtk_binding_entry_add_signal (binding_set,
- GDK_KP_Add, GDK_CONTROL_MASK,
+ GDK_KEY_KP_Add, GDK_CONTROL_MASK,
"change_focus_row_expansion", 1,
G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_EXPAND_RECURSIVE);
gtk_binding_entry_add_signal (binding_set,
- GDK_minus, 0,
+ GDK_KEY_minus, 0,
"change_focus_row_expansion", 1,
G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_COLLAPSE);
gtk_binding_entry_add_signal (binding_set,
- GDK_minus, GDK_CONTROL_MASK,
+ GDK_KEY_minus, GDK_CONTROL_MASK,
"change_focus_row_expansion", 1,
G_TYPE_ENUM,
GTK_CMCTREE_EXPANSION_COLLAPSE_RECURSIVE);
gtk_binding_entry_add_signal (binding_set,
- GDK_KP_Subtract, 0,
+ GDK_KEY_KP_Subtract, 0,
"change_focus_row_expansion", 1,
G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_COLLAPSE);
gtk_binding_entry_add_signal (binding_set,
- GDK_KP_Subtract, GDK_CONTROL_MASK,
+ GDK_KEY_KP_Subtract, GDK_CONTROL_MASK,
"change_focus_row_expansion", 1,
G_TYPE_ENUM,
GTK_CMCTREE_EXPANSION_COLLAPSE_RECURSIVE);
gtk_binding_entry_add_signal (binding_set,
- GDK_equal, 0,
+ GDK_KEY_equal, 0,
"change_focus_row_expansion", 1,
G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_TOGGLE);
gtk_binding_entry_add_signal (binding_set,
- GDK_KP_Equal, 0,
+ GDK_KEY_KP_Equal, 0,
"change_focus_row_expansion", 1,
G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_TOGGLE);
gtk_binding_entry_add_signal (binding_set,
- GDK_KP_Multiply, 0,
+ GDK_KEY_KP_Multiply, 0,
"change_focus_row_expansion", 1,
G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_TOGGLE);
gtk_binding_entry_add_signal (binding_set,
- GDK_asterisk, 0,
+ GDK_KEY_asterisk, 0,
"change_focus_row_expansion", 1,
G_TYPE_ENUM, GTK_CMCTREE_EXPANSION_TOGGLE);
gtk_binding_entry_add_signal (binding_set,
- GDK_KP_Multiply, GDK_CONTROL_MASK,
+ GDK_KEY_KP_Multiply, GDK_CONTROL_MASK,
"change_focus_row_expansion", 1,
G_TYPE_ENUM,
GTK_CMCTREE_EXPANSION_TOGGLE_RECURSIVE);
gtk_binding_entry_add_signal (binding_set,
- GDK_asterisk, GDK_CONTROL_MASK,
+ GDK_KEY_asterisk, GDK_CONTROL_MASK,
"change_focus_row_expansion", 1,
G_TYPE_ENUM,
GTK_CMCTREE_EXPANSION_TOGGLE_RECURSIVE);
Index: inputdialog.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/inputdialog.c,v
retrieving revision 1.2.2.43
retrieving revision 1.2.2.44
diff -u -d -r1.2.2.43 -r1.2.2.44
--- inputdialog.c 7 Oct 2011 09:08:57 -0000 1.2.2.43
+++ inputdialog.c 7 Oct 2011 09:17:51 -0000 1.2.2.44
@@ -526,10 +526,10 @@
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
ack = FALSE;
fin = TRUE;
- } else if (event && event->keyval == GDK_Return) {
+ } else if (event && event->keyval == GDK_KEY_Return) {
ack = TRUE;
fin = TRUE;
return TRUE; /* do not let Return pass - it
Index: gtkutils.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/gtkutils.c,v
retrieving revision 1.5.2.96
retrieving revision 1.5.2.97
diff -u -d -r1.5.2.96 -r1.5.2.97
--- gtkutils.c 7 Oct 2011 09:08:57 -0000 1.5.2.96
+++ gtkutils.c 7 Oct 2011 09:17:51 -0000 1.5.2.97
@@ -662,7 +662,7 @@
binding_set = gtk_binding_set_by_class
(GTK_CMCLIST_GET_CLASS(clist));
- gtk_binding_entry_add_signal(binding_set, GDK_n, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_n, GDK_CONTROL_MASK,
"scroll_vertical", 2,
G_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
G_TYPE_FLOAT, 0.0);
Index: pluginwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/pluginwindow.c,v
retrieving revision 1.5.2.59
retrieving revision 1.5.2.60
diff -u -d -r1.5.2.59 -r1.5.2.60
--- pluginwindow.c 16 Feb 2011 07:16:21 -0000 1.5.2.59
+++ pluginwindow.c 7 Oct 2011 09:17:51 -0000 1.5.2.60
@@ -232,21 +232,21 @@
{
if (event) {
switch (event->keyval) {
- case GDK_Escape :
- case GDK_Return :
- case GDK_KP_Enter :
+ case GDK_KEY_Escape :
+ case GDK_KEY_Return :
+ case GDK_KEY_KP_Enter :
close_cb(NULL, pluginwindow);
break;
- case GDK_Insert :
- case GDK_KP_Insert :
- case GDK_KP_Add :
- case GDK_plus :
+ case GDK_KEY_Insert :
+ case GDK_KEY_KP_Insert :
+ case GDK_KEY_KP_Add :
+ case GDK_KEY_plus :
load_cb(NULL, pluginwindow);
break;
- case GDK_Delete :
- case GDK_KP_Delete :
- case GDK_KP_Subtract :
- case GDK_minus :
+ case GDK_KEY_Delete :
+ case GDK_KEY_KP_Delete :
+ case GDK_KEY_KP_Subtract :
+ case GDK_KEY_minus :
unload_cb(NULL, pluginwindow);
break;
default :
Index: gtkaspell.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/gtkaspell.c,v
retrieving revision 1.9.2.72
retrieving revision 1.9.2.73
diff -u -d -r1.9.2.72 -r1.9.2.73
--- gtkaspell.c 6 Jan 2011 11:43:50 -0000 1.9.2.72
+++ gtkaspell.c 7 Oct 2011 09:17:50 -0000 1.9.2.73
@@ -1349,10 +1349,10 @@
GdkEventKey *event,
GtkAspell *gtkaspell)
{
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
gtk_widget_destroy(widget);
return TRUE;
- } else if (event && event->keyval == GDK_Return) {
+ } else if (event && event->keyval == GDK_KEY_Return) {
replace_with_supplied_word_cb(widget, gtkaspell);
return TRUE;
}
@@ -1719,11 +1719,11 @@
GdkEventKey *event,
GtkAspell *gtkaspell)
{
- if (event && (isascii(event->keyval) || event->keyval == GDK_Return)) {
+ if (event && (isascii(event->keyval) || event->keyval == GDK_KEY_Return)) {
gtk_accel_groups_activate(
G_OBJECT(gtkaspell->parent_window),
event->keyval, event->state);
- } else if (event && event->keyval == GDK_Escape) {
+ } else if (event && event->keyval == GDK_KEY_Escape) {
destroy_menu(NULL, gtkaspell);
}
return FALSE;
@@ -1775,7 +1775,7 @@
g_signal_connect(G_OBJECT(item), "activate",
G_CALLBACK(add_word_to_session_cb),
gtkaspell);
- gtk_widget_add_accelerator(item, "activate", accel, GDK_space,
+ gtk_widget_add_accelerator(item, "activate", accel, GDK_KEY_space,
GDK_CONTROL_MASK,
GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
@@ -1785,7 +1785,7 @@
g_signal_connect(G_OBJECT(item), "activate",
G_CALLBACK(add_word_to_personal_cb),
gtkaspell);
- gtk_widget_add_accelerator(item, "activate", accel, GDK_Return,
+ gtk_widget_add_accelerator(item, "activate", accel, GDK_KEY_Return,
GDK_CONTROL_MASK,
GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
@@ -1795,9 +1795,9 @@
g_signal_connect(G_OBJECT(item), "activate",
G_CALLBACK(replace_with_create_dialog_cb),
gtkaspell);
- gtk_widget_add_accelerator(item, "activate", accel, GDK_R, 0,
+ gtk_widget_add_accelerator(item, "activate", accel, GDK_KEY_R, 0,
GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
- gtk_widget_add_accelerator(item, "activate", accel, GDK_R,
+ gtk_widget_add_accelerator(item, "activate", accel, GDK_KEY_R,
GDK_CONTROL_MASK,
GTK_ACCEL_LOCKED);
@@ -1811,9 +1811,9 @@
g_signal_connect(G_OBJECT(item), "activate",
G_CALLBACK(check_with_alternate_cb),
gtkaspell);
- gtk_widget_add_accelerator(item, "activate", accel, GDK_X, 0,
+ gtk_widget_add_accelerator(item, "activate", accel, GDK_KEY_X, 0,
GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
- gtk_widget_add_accelerator(item, "activate", accel, GDK_X,
+ gtk_widget_add_accelerator(item, "activate", accel, GDK_KEY_X,
GDK_CONTROL_MASK,
GTK_ACCEL_LOCKED);
}
@@ -1864,12 +1864,12 @@
if (curmenu == NULL && count < MENUCOUNT) {
gtk_widget_add_accelerator(item, "activate",
accel,
- GDK_A + count, 0,
+ GDK_KEY_A + count, 0,
GTK_ACCEL_LOCKED |
GTK_ACCEL_VISIBLE);
gtk_widget_add_accelerator(item, "activate",
accel,
- GDK_A + count,
+ GDK_KEY_A + count,
GDK_CONTROL_MASK,
GTK_ACCEL_LOCKED);
}
Index: quicksearch.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/quicksearch.c,v
retrieving revision 1.1.2.103
retrieving revision 1.1.2.104
diff -u -d -r1.1.2.103 -r1.1.2.104
--- quicksearch.c 12 Aug 2011 08:41:54 -0000 1.1.2.103
+++ quicksearch.c 7 Oct 2011 09:17:51 -0000 1.1.2.104
@@ -331,7 +331,7 @@
static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
QuickSearch *quicksearch)
{
- if (event && (event->keyval == GDK_Escape)) {
+ if (event && (event->keyval == GDK_KEY_Escape)) {
gchar *str;
quicksearch->in_typing = FALSE;
@@ -353,7 +353,7 @@
return TRUE;
}
- if (event != NULL && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)) {
+ if (event != NULL && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)) {
if (quicksearch->press_timeout_id != -1) {
g_source_remove(quicksearch->press_timeout_id);
quicksearch->press_timeout_id = -1;
@@ -366,7 +366,7 @@
return TRUE;
}
- if (event && (event->keyval == GDK_Down || event->keyval == GDK_Up)) {
+ if (event && (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_Up)) {
combobox_set_value_from_arrow_key(
GTK_COMBO_BOX(quicksearch->search_string_entry),
event->keyval);
Index: gtkcmoptionmenu.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/gtkcmoptionmenu.c,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- gtkcmoptionmenu.c 7 Oct 2011 09:08:57 -0000 1.1.2.7
+++ gtkcmoptionmenu.c 7 Oct 2011 09:17:51 -0000 1.1.2.8
@@ -696,8 +696,8 @@
switch (event->keyval)
{
- case GDK_KP_Space:
- case GDK_space:
+ case GDK_KEY_KP_Space:
+ case GDK_KEY_space:
gtk_cmoption_menu_remove_contents (option_menu);
gtk_menu_popup (GTK_MENU (option_menu->menu), NULL, NULL,
gtk_cmoption_menu_position, option_menu,
Index: logwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/logwindow.c,v
retrieving revision 1.1.4.38
retrieving revision 1.1.4.39
diff -u -d -r1.1.4.38 -r1.1.4.39
--- logwindow.c 7 Oct 2011 09:08:57 -0000 1.1.4.38
+++ logwindow.c 7 Oct 2011 09:17:51 -0000 1.1.4.39
@@ -384,9 +384,9 @@
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
LogWindow *logwin)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
gtk_widget_hide(logwin->window);
- else if (event && event->keyval == GDK_Delete)
+ else if (event && event->keyval == GDK_KEY_Delete)
log_window_clear(NULL, logwin);
return FALSE;
Index: icon_legend.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/icon_legend.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
--- icon_legend.c 16 Feb 2011 07:16:20 -0000 1.1.2.19
+++ icon_legend.c 7 Oct 2011 09:17:51 -0000 1.1.2.20
@@ -184,7 +184,7 @@
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event)
{
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
legend_close();
}
return FALSE;
Index: combobox.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/combobox.c,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -d -r1.1.2.23 -r1.1.2.24
--- combobox.c 10 Apr 2011 17:19:05 -0000 1.1.2.23
+++ combobox.c 7 Oct 2011 09:17:50 -0000 1.1.2.24
@@ -203,14 +203,14 @@
if (gtk_combo_box_get_active_iter(combobox, &iter)) {
/* if current text is in list, get prev or next one */
- if (keyval == GDK_Up) {
+ if (keyval == GDK_KEY_Up) {
gchar *text = gtk_combo_box_get_active_text(combobox);
if (!text)
text = gtk_editable_get_chars(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(combobox))),0,-1);
valid = gtkut_tree_model_text_iter_prev(model, &iter, text);
g_free(text);
} else
- if (keyval == GDK_Down)
+ if (keyval == GDK_KEY_Down)
valid = gtk_tree_model_iter_next(model, &iter);
if (valid)
@@ -219,10 +219,10 @@
} else {
/* current text is not in list, get first or next one */
- if (keyval == GDK_Up)
+ if (keyval == GDK_KEY_Up)
valid = gtkut_tree_model_get_iter_last(model, &iter);
else
- if (keyval == GDK_Down)
+ if (keyval == GDK_KEY_Down)
valid = gtk_tree_model_get_iter_first(model, &iter);
if (valid)
Index: about.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/about.c,v
retrieving revision 1.4.2.80
retrieving revision 1.4.2.81
diff -u -d -r1.4.2.80 -r1.4.2.81
--- about.c 7 Oct 2011 09:08:57 -0000 1.4.2.80
+++ about.c 7 Oct 2011 09:17:50 -0000 1.4.2.81
@@ -768,7 +768,7 @@
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
gtk_widget_hide(window);
return FALSE;
}
More information about the Commits
mailing list