Mercurial > hg > forks > geeqie

changeset 2036:472c094c0154

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed GDK_<key> to GDK_KEY_<key>
author Vladimir Nadvornik <nadvornik@suse.cz>
date Thu, 02 Aug 2012 20:04:16 +0200
parents 4321c486aec7
children ad2e0cac775c
files src/collect-table.c src/collect.c src/dupe.c src/img-view.c src/layout_util.c src/logwindow.c src/pan-view.c src/search.c src/ui_bookmark.c src/ui_misc.c src/ui_pathsel.c src/ui_tabcomp.c src/ui_tree_edit.c src/ui_utildlg.c src/view_dir_list.c src/view_dir_tree.c src/view_file_icon.c src/view_file_list.c
diffstat 18 files changed, 115 insertions(+), 115 deletions(-) [+]
line wrap: on
line diff
--- a/src/collect-table.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/collect-table.c	Thu Aug 02 20:04:16 2012 +0200
@@ -1144,33 +1144,33 @@
 
 	switch (event->keyval)
 		{
-		case GDK_Left: case GDK_KP_Left:
+		case GDK_KEY_Left: case GDK_KEY_KP_Left:
 			focus_col = -1;
 			break;
-		case GDK_Right: case GDK_KP_Right:
+		case GDK_KEY_Right: case GDK_KEY_KP_Right:
 			focus_col = 1;
 			break;
-		case GDK_Up: case GDK_KP_Up:
+		case GDK_KEY_Up: case GDK_KEY_KP_Up:
 			focus_row = -1;
 			break;
-		case GDK_Down: case GDK_KP_Down:
+		case GDK_KEY_Down: case GDK_KEY_KP_Down:
 			focus_row = 1;
 			break;
-		case GDK_Page_Up: case GDK_KP_Page_Up:
+		case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
 			focus_row = -page_height(ct);
 			break;
-		case GDK_Page_Down: case GDK_KP_Page_Down:
+		case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
 			focus_row = page_height(ct);
 			break;
-		case GDK_Home: case GDK_KP_Home:
+		case GDK_KEY_Home: case GDK_KEY_KP_Home:
 			focus_row = -ct->focus_row;
 			focus_col = -ct->focus_column;
 			break;
-		case GDK_End: case GDK_KP_End:
+		case GDK_KEY_End: case GDK_KEY_KP_End:
 			focus_row = ct->rows - 1 - ct->focus_row;
 			focus_col = ct->columns - 1 - ct->focus_column;
 			break;
-		case GDK_space:
+		case GDK_KEY_space:
 			info = collection_table_find_data(ct, ct->focus_row, ct->focus_column, NULL);
 			if (info)
 				{
@@ -1189,8 +1189,8 @@
 		case 'T': case 't':
 			if (event->state & GDK_CONTROL_MASK) collection_table_toggle_filenames(ct);
 			break;
-		case GDK_Menu:
-		case GDK_F10:
+		case GDK_KEY_Menu:
+		case GDK_KEY_F10:
 			info = collection_table_find_data(ct, ct->focus_row, ct->focus_column, NULL);
 			ct->click_info = info;
 
--- a/src/collect.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/collect.c	Thu Aug 02 20:04:16 2012 +0200
@@ -901,7 +901,7 @@
 		stop_signal = TRUE;
 		switch (event->keyval)
 			{
-			case GDK_Return: case GDK_KP_Enter:
+			case GDK_KEY_Return: case GDK_KEY_KP_Enter:
 				layout_image_set_collection(NULL, cw->cd,
 					collection_table_get_focus_info(cw->table));
 				break;
@@ -951,7 +951,7 @@
 					collection_set_sort_method(cw->cd, SORT_PATH);
 					}
 				break;
-			case GDK_Delete: case GDK_KP_Delete:
+			case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
 				list = g_list_copy(cw->table->selection);
 				if (list)
 					{
--- a/src/dupe.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/dupe.c	Thu Aug 02 20:04:16 2012 +0200
@@ -2971,7 +2971,7 @@
 						gtk_tree_selection_select_all(selection);
 						}
 					break;
-				case GDK_Delete: case GDK_KP_Delete:
+				case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
 					if (on_second)
 						{
 						dupe_second_clear(dw);
@@ -3009,13 +3009,13 @@
 		stop_signal = TRUE;
 		switch (event->keyval)
 			{
-			case GDK_Return: case GDK_KP_Enter:
+			case GDK_KEY_Return: case GDK_KEY_KP_Enter:
 				dupe_menu_view(dw, di, listview, FALSE);
 				break;
 			case 'V': case 'v':
 				dupe_menu_view(dw, di, listview, TRUE);
 				break;
-			case GDK_Delete: case GDK_KP_Delete:
+			case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
 				dupe_window_remove_selection(dw, listview);
 				break;
 			case 'C': case 'c':
@@ -3030,8 +3030,8 @@
 			case '2':
 				dupe_listview_select_dupes(dw, FALSE);
 				break;
-			case GDK_Menu:
-			case GDK_F10:
+			case GDK_KEY_Menu:
+			case GDK_KEY_F10:
 				if (!on_second)
 					{
 					GtkWidget *menu;
--- a/src/img-view.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/img-view.c	Thu Aug 02 20:04:16 2012 +0200
@@ -340,16 +340,16 @@
 	stop_signal = TRUE;
 	switch (event->keyval)
 		{
-		case GDK_Left: case GDK_KP_Left:
+		case GDK_KEY_Left: case GDK_KEY_KP_Left:
 			x -= 1;
 			break;
-		case GDK_Right: case GDK_KP_Right:
+		case GDK_KEY_Right: case GDK_KEY_KP_Right:
 			x += 1;
 			break;
-		case GDK_Up: case GDK_KP_Up:
+		case GDK_KEY_Up: case GDK_KEY_KP_Up:
 			y -= 1;
 			break;
-		case GDK_Down: case GDK_KP_Down:
+		case GDK_KEY_Down: case GDK_KEY_KP_Down:
 			y += 1;
 			break;
 		default:
@@ -467,32 +467,32 @@
 		stop_signal = TRUE;
 		switch (event->keyval)
 			{
-			case GDK_Page_Up: case GDK_KP_Page_Up:
-			case GDK_BackSpace:
+			case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
+			case GDK_KEY_BackSpace:
 			case 'B': case 'b':
 				view_step_prev(vw);
 				break;
-			case GDK_Page_Down: case GDK_KP_Page_Down:
-			case GDK_space:
+			case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
+			case GDK_KEY_space:
 			case 'N': case 'n':
 				view_step_next(vw);
 				break;
-			case GDK_Home: case GDK_KP_Home:
+			case GDK_KEY_Home: case GDK_KEY_KP_Home:
 				view_step_to_end(vw, FALSE);
 				break;
-			case GDK_End: case GDK_KP_End:
+			case GDK_KEY_End: case GDK_KEY_KP_End:
 				view_step_to_end(vw, TRUE);
 				break;
-			case '+': case '=': case GDK_KP_Add:
+			case '+': case '=': case GDK_KEY_KP_Add:
 				image_zoom_adjust(imd, get_zoom_increment());
 				break;
-			case '-': case GDK_KP_Subtract:
+			case '-': case GDK_KEY_KP_Subtract:
 				image_zoom_adjust(imd, -get_zoom_increment());
 				break;
-			case 'X': case 'x': case GDK_KP_Multiply:
+			case 'X': case 'x': case GDK_KEY_KP_Multiply:
 				image_zoom_set(imd, 0.0);
 				break;
-			case 'Z': case 'z': case GDK_KP_Divide: case '1':
+			case 'Z': case 'z': case GDK_KEY_KP_Divide: case '1':
 				image_zoom_set(imd, 1.0);
 				break;
 			case '2':
@@ -537,7 +537,7 @@
 				break;
 			case 'F': case 'f':
 			case 'V': case 'v':
-			case GDK_F11:
+			case GDK_KEY_F11:
 				view_fullscreen_toggle(vw, FALSE);
 				break;
 			case 'I': case 'i':
@@ -549,13 +549,13 @@
 			case '[':
 				image_alter_orientation(imd, ALTER_ROTATE_90_CC);
 				break;
-			case GDK_Delete: case GDK_KP_Delete:
+			case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
 				if (options->file_ops.enable_delete_key)
 					{
 					file_util_delete(image_get_fd(imd), NULL, imd->widget);
 					}
 				break;
-			case GDK_Escape:
+			case GDK_KEY_Escape:
 				if (vw->fs)
 					{
 					view_fullscreen_toggle(vw, TRUE);
@@ -565,8 +565,8 @@
 					view_window_close(vw);
 					}
 				break;
-			case GDK_Menu:
-			case GDK_F10:
+			case GDK_KEY_Menu:
+			case GDK_KEY_F10:
 				menu = view_popup_menu(vw);
 				gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
 					       view_window_menu_pos_cb, vw, 0, GDK_CURRENT_TIME);
--- a/src/layout_util.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/layout_util.c	Thu Aug 02 20:04:16 2012 +0200
@@ -64,10 +64,10 @@
  */
 
 static guint tree_key_overrides[] = {
-	GDK_Page_Up,	GDK_KP_Page_Up,
-	GDK_Page_Down,	GDK_KP_Page_Down,
-	GDK_Home,	GDK_KP_Home,
-	GDK_End,	GDK_KP_End
+	GDK_KEY_Page_Up,	GDK_KEY_KP_Page_Up,
+	GDK_KEY_Page_Down,	GDK_KEY_KP_Page_Down,
+	GDK_KEY_Home,	GDK_KEY_KP_Home,
+	GDK_KEY_End,	GDK_KEY_KP_End
 };
 
 static gboolean layout_key_match(guint keyval)
@@ -95,7 +95,7 @@
 	if (lw->path_entry && GTK_WIDGET_HAS_FOCUS(lw->path_entry))
 #endif
 		{
-		if (event->keyval == GDK_Escape && lw->dir_fd)
+		if (event->keyval == GDK_KEY_Escape && lw->dir_fd)
 			{
 			gtk_entry_set_text(GTK_ENTRY(lw->path_entry), lw->dir_fd->path);
 			}
@@ -140,16 +140,16 @@
 		stop_signal = TRUE;
 		switch (event->keyval)
 			{
-			case GDK_Left: case GDK_KP_Left:
+			case GDK_KEY_Left: case GDK_KEY_KP_Left:
 				x -= 1;
 				break;
-			case GDK_Right: case GDK_KP_Right:
+			case GDK_KEY_Right: case GDK_KEY_KP_Right:
 				x += 1;
 				break;
-			case GDK_Up: case GDK_KP_Up:
+			case GDK_KEY_Up: case GDK_KEY_KP_Up:
 				y -= 1;
 				break;
-			case GDK_Down: case GDK_KP_Down:
+			case GDK_KEY_Down: case GDK_KEY_KP_Down:
 				y += 1;
 				break;
 			default:
@@ -163,7 +163,7 @@
 			stop_signal = TRUE;
 			switch (event->keyval)
 				{
-				case GDK_Menu:
+				case GDK_KEY_Menu:
 					layout_image_menu_popup(lw);
 					break;
 				default:
--- a/src/logwindow.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/logwindow.c	Thu Aug 02 20:04:16 2012 +0200
@@ -57,7 +57,7 @@
 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);
 	return FALSE;
 }
--- a/src/pan-view.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/pan-view.c	Thu Aug 02 20:04:16 2012 +0200
@@ -1227,28 +1227,28 @@
 		stop_signal = TRUE;
 		switch (event->keyval)
 			{
-			case GDK_Left: case GDK_KP_Left:
+			case GDK_KEY_Left: case GDK_KEY_KP_Left:
 				x -= 1;
 				break;
-			case GDK_Right: case GDK_KP_Right:
+			case GDK_KEY_Right: case GDK_KEY_KP_Right:
 				x += 1;
 				break;
-			case GDK_Up: case GDK_KP_Up:
+			case GDK_KEY_Up: case GDK_KEY_KP_Up:
 				y -= 1;
 				break;
-			case GDK_Down: case GDK_KP_Down:
+			case GDK_KEY_Down: case GDK_KEY_KP_Down:
 				y += 1;
 				break;
-			case GDK_Page_Up: case GDK_KP_Page_Up:
+			case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
 				pixbuf_renderer_scroll(pr, 0, 0 - pr->vis_height / 2);
 				break;
-			case GDK_Page_Down: case GDK_KP_Page_Down:
+			case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
 				pixbuf_renderer_scroll(pr, 0, pr->vis_height / 2);
 				break;
-			case GDK_Home: case GDK_KP_Home:
+			case GDK_KEY_Home: case GDK_KEY_KP_Home:
 				pixbuf_renderer_scroll(pr, 0 - pr->vis_width / 2, 0);
 				break;
-			case GDK_End: case GDK_KP_End:
+			case GDK_KEY_End: case GDK_KEY_KP_End:
 				pixbuf_renderer_scroll(pr, pr->vis_width / 2, 0);
 				break;
 			default:
@@ -1348,7 +1348,7 @@
 		stop_signal = TRUE;
 		switch (event->keyval)
 			{
-			case GDK_Escape:
+			case GDK_KEY_Escape:
 				if (pw->fs)
 					{
 					pan_fullscreen_toggle(pw, TRUE);
@@ -1370,13 +1370,13 @@
 			stop_signal = TRUE;
 			switch (event->keyval)
 				{
-				case '+': case '=': case GDK_KP_Add:
+				case '+': case '=': case GDK_KEY_KP_Add:
 					pixbuf_renderer_zoom_adjust(pr, ZOOM_INCREMENT);
 					break;
-				case '-': case GDK_KP_Subtract:
+				case '-': case GDK_KEY_KP_Subtract:
 					pixbuf_renderer_zoom_adjust(pr, -ZOOM_INCREMENT);
 					break;
-				case 'Z': case 'z': case GDK_KP_Divide: case '1':
+				case 'Z': case 'z': case GDK_KEY_KP_Divide: case '1':
 					pixbuf_renderer_zoom_set(pr, 1.0);
 					break;
 				case '2':
@@ -1399,7 +1399,7 @@
 					break;
 				case 'F': case 'f':
 				case 'V': case 'v':
-				case GDK_F11:
+				case GDK_KEY_F11:
 					pan_fullscreen_toggle(pw, FALSE);
 					break;
 				case 'I': case 'i':
@@ -1407,10 +1407,10 @@
 					pan_overlay_toggle(pw);
 #endif
 					break;
-				case GDK_Delete: case GDK_KP_Delete:
+				case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
 					break;
-				case GDK_Menu:
-				case GDK_F10:
+				case GDK_KEY_Menu:
+				case GDK_KEY_F10:
 					menu = pan_popup_menu(pw);
 					gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
 						       pan_window_menu_pos_cb, pw, 0, GDK_CURRENT_TIME);
--- a/src/search.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/search.c	Thu Aug 02 20:04:16 2012 +0200
@@ -1276,7 +1276,7 @@
 					gtk_tree_selection_select_all(selection);
 					}
 				break;
-			case GDK_Delete: case GDK_KP_Delete:
+			case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
 				search_result_clear(sd);
 				break;
 			default:
@@ -1295,7 +1295,7 @@
 		stop_signal = TRUE;
 		switch (event->keyval)
 			{
-			case GDK_Return: case GDK_KP_Enter:
+			case GDK_KEY_Return: case GDK_KEY_KP_Enter:
 				if (mfd) layout_set_fd(NULL, mfd->fd);
 				break;
 			case 'V': case 'v':
@@ -1307,14 +1307,14 @@
 				filelist_free(list);
 				}
 				break;
-			case GDK_Delete: case GDK_KP_Delete:
+			case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
 				search_result_remove_selection(sd);
 				break;
 			case 'C': case 'c':
 				search_result_collection_from_selection(sd);
 				break;
-			case GDK_Menu:
-			case GDK_F10:
+			case GDK_KEY_Menu:
+			case GDK_KEY_F10:
 				{
 				GtkWidget *menu;
 
--- a/src/ui_bookmark.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/ui_bookmark.c	Thu Aug 02 20:04:16 2012 +0200
@@ -439,20 +439,20 @@
 
 	switch (event->keyval)
 		{
-		case GDK_F10:
+		case GDK_KEY_F10:
 			if (!(event->state & GDK_CONTROL_MASK)) return FALSE;
-		case GDK_Menu:
+		case GDK_KEY_Menu:
 			bookmark_menu_popup(bm, button, 0, event->time, TRUE);
 			return TRUE;
 			break;
-		case GDK_Up:
+		case GDK_KEY_Up:
 			if (event->state & GDK_SHIFT_MASK)
 				{
 				bookmark_move(bm, button, -1);
 				return TRUE;
 				}
 			break;
-		case GDK_Down:
+		case GDK_KEY_Down:
 			if (event->state & GDK_SHIFT_MASK)
 				{
 				bookmark_move(bm, button, 1);
--- a/src/ui_misc.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/ui_misc.c	Thu Aug 02 20:04:16 2012 +0200
@@ -967,14 +967,14 @@
 
 	switch (event->keyval)
 		{
-		case GDK_Return:
-		case GDK_KP_Enter:
-		case GDK_Tab:
-		case GDK_ISO_Left_Tab:
+		case GDK_KEY_Return:
+		case GDK_KEY_KP_Enter:
+		case GDK_KEY_Tab:
+		case GDK_KEY_ISO_Left_Tab:
 			date_selection_popup_sync(ds);
 			date_selection_popup_hide(ds);
 			break;
-		case GDK_Escape:
+		case GDK_KEY_Escape:
 			date_selection_popup_hide(ds);
 			break;
 		default:
--- a/src/ui_pathsel.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/ui_pathsel.c	Thu Aug 02 20:04:16 2012 +0200
@@ -695,9 +695,9 @@
 
 	switch (event->keyval)
 		{
-		case GDK_F10:
+		case GDK_KEY_F10:
 			if (!(event->state & GDK_CONTROL_MASK)) return FALSE;
-		case GDK_Menu:
+		case GDK_KEY_Menu:
 			dest_view_store_selection(dd, GTK_TREE_VIEW(view));
 			dest_popup_menu(dd, GTK_TREE_VIEW(view), 0, event->time, TRUE);
 			return TRUE;
@@ -710,7 +710,7 @@
 				return TRUE;
 				}
 			break;
-		case GDK_Delete:
+		case GDK_KEY_Delete:
 			dest_view_store_selection(dd, GTK_TREE_VIEW(view));
 			dest_view_delete(dd, GTK_TREE_VIEW(view));
 			return TRUE;
--- a/src/ui_tabcomp.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/ui_tabcomp.c	Thu Aug 02 20:04:16 2012 +0200
@@ -236,8 +236,8 @@
 {
 	TabCompData *td = data;
 
-	if (event->keyval == GDK_Tab ||
-	    event->keyval == GDK_BackSpace ||
+	if (event->keyval == GDK_KEY_Tab ||
+	    event->keyval == GDK_KEY_BackSpace ||
 	    (event->keyval >= 0x20 && event->keyval <= 0xFF) )
 		{
 		if (event->keyval >= 0x20 && event->keyval <= 0xFF)
@@ -615,7 +615,7 @@
 
 	switch (event->keyval)
 		{
-		case GDK_Tab:
+		case GDK_KEY_Tab:
 			if (!(event->state & GDK_CONTROL_MASK))
 				{
 				if (tab_completion_do(td))
@@ -625,7 +625,7 @@
 				stop_signal = TRUE;
 				}
 			break;
-		case GDK_Return: case GDK_KP_Enter:
+		case GDK_KEY_Return: case GDK_KEY_KP_Enter:
 			if (td->fd_button &&
 			    (event->state & GDK_CONTROL_MASK))
 				{
--- a/src/ui_tree_edit.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/ui_tree_edit.c	Thu Aug 02 20:04:16 2012 +0200
@@ -104,21 +104,21 @@
 
 	switch (event->keyval)
 		{
-		case GDK_Return:
-		case GDK_KP_Enter:
-		case GDK_Tab: 		/* ok, we are going to intercept the focus change
+		case GDK_KEY_Return:
+		case GDK_KEY_KP_Enter:
+		case GDK_KEY_Tab: 		/* ok, we are going to intercept the focus change
 					   from keyboard and act like return was hit */
-		case GDK_ISO_Left_Tab:
-		case GDK_Up:
-		case GDK_Down:
-		case GDK_KP_Up:
-		case GDK_KP_Down:
-		case GDK_KP_Left:
-		case GDK_KP_Right:
+		case GDK_KEY_ISO_Left_Tab:
+		case GDK_KEY_Up:
+		case GDK_KEY_Down:
+		case GDK_KEY_KP_Up:
+		case GDK_KEY_KP_Down:
+		case GDK_KEY_KP_Left:
+		case GDK_KEY_KP_Right:
 			tree_edit_do(ted);
 			tree_edit_close(ted);
 			break;
-		case GDK_Escape:
+		case GDK_KEY_Escape:
 			tree_edit_close(ted);
 			break;
 		default:
--- a/src/ui_utildlg.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/ui_utildlg.c	Thu Aug 02 20:04:16 2012 +0200
@@ -63,9 +63,9 @@
 	GenericDialog *gd = data;
 
 #if GTK_CHECK_VERSION(2,20,0)
-	if (event->keyval == GDK_Return && gtk_widget_has_focus(widget)
+	if (event->keyval == GDK_KEY_Return && gtk_widget_has_focus(widget)
 #else
-	if (event->keyval == GDK_Return && GTK_WIDGET_HAS_FOCUS(widget)
+	if (event->keyval == GDK_KEY_Return && GTK_WIDGET_HAS_FOCUS(widget)
 #endif
 	    && gd->default_cb)
 		{
@@ -91,7 +91,7 @@
 {
 	GenericDialog *gd = data;
 
-	if (event->keyval == GDK_Escape)
+	if (event->keyval == GDK_KEY_Escape)
 		{
 		if (gd->cancel_cb) gd->cancel_cb(gd, gd->data);
 		if (gd->auto_close) generic_dialog_click_cb(widget, data);
--- a/src/view_dir_list.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/view_dir_list.c	Thu Aug 02 20:04:16 2012 +0200
@@ -361,7 +361,7 @@
 	ViewDir *vd = data;
 	GtkTreePath *tpath;
 
-	if (event->keyval != GDK_Menu) return FALSE;
+	if (event->keyval != GDK_KEY_Menu) return FALSE;
 
 	gtk_tree_view_get_cursor(GTK_TREE_VIEW(vd->view), &tpath, NULL);
 	if (tpath)
--- a/src/view_dir_tree.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/view_dir_tree.c	Thu Aug 02 20:04:16 2012 +0200
@@ -780,7 +780,7 @@
 
 	switch (event->keyval)
 		{
-		case GDK_Menu:
+		case GDK_KEY_Menu:
 			vd->click_fd = fd;
 			vd_color_set(vd, vd->click_fd, TRUE);
 
@@ -789,9 +789,9 @@
 
 			return TRUE;
 			break;
-		case GDK_plus:
-		case GDK_Right:
-		case GDK_KP_Add:
+		case GDK_KEY_plus:
+		case GDK_KEY_Right:
+		case GDK_KEY_KP_Add:
 			if (fd)
 				{
 				vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->dir_fd);
--- a/src/view_file_icon.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/view_file_icon.c	Thu Aug 02 20:04:16 2012 +0200
@@ -1300,33 +1300,33 @@
 	stop_signal = TRUE;
 	switch (event->keyval)
 		{
-		case GDK_Left: case GDK_KP_Left:
+		case GDK_KEY_Left: case GDK_KEY_KP_Left:
 			focus_col = -1;
 			break;
-		case GDK_Right: case GDK_KP_Right:
+		case GDK_KEY_Right: case GDK_KEY_KP_Right:
 			focus_col = 1;
 			break;
-		case GDK_Up: case GDK_KP_Up:
+		case GDK_KEY_Up: case GDK_KEY_KP_Up:
 			focus_row = -1;
 			break;
-		case GDK_Down: case GDK_KP_Down:
+		case GDK_KEY_Down: case GDK_KEY_KP_Down:
 			focus_row = 1;
 			break;
-		case GDK_Page_Up: case GDK_KP_Page_Up:
+		case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
 			focus_row = -page_height(vf);
 			break;
-		case GDK_Page_Down: case GDK_KP_Page_Down:
+		case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
 			focus_row = page_height(vf);
 			break;
-		case GDK_Home: case GDK_KP_Home:
+		case GDK_KEY_Home: case GDK_KEY_KP_Home:
 			focus_row = -VFICON(vf)->focus_row;
 			focus_col = -VFICON(vf)->focus_column;
 			break;
-		case GDK_End: case GDK_KP_End:
+		case GDK_KEY_End: case GDK_KEY_KP_End:
 			focus_row = VFICON(vf)->rows - 1 - VFICON(vf)->focus_row;
 			focus_col = VFICON(vf)->columns - 1 - VFICON(vf)->focus_column;
 			break;
-		case GDK_space:
+		case GDK_KEY_space:
 			id = vficon_find_data(vf, VFICON(vf)->focus_row, VFICON(vf)->focus_column, NULL);
 			if (id)
 				{
@@ -1354,7 +1354,7 @@
 					}
 				}
 			break;
-		case GDK_Menu:
+		case GDK_KEY_Menu:
 			id = vficon_find_data(vf, VFICON(vf)->focus_row, VFICON(vf)->focus_column, NULL);
 			VFICON(vf)->click_id = id;
 
--- a/src/view_file_list.c	Thu Aug 02 00:15:16 2012 +0200
+++ b/src/view_file_list.c	Thu Aug 02 20:04:16 2012 +0200
@@ -548,7 +548,7 @@
 	ViewFile *vf = data;
 	GtkTreePath *tpath;
 
-	if (event->keyval != GDK_Menu) return FALSE;
+	if (event->keyval != GDK_KEY_Menu) return FALSE;
 
 	gtk_tree_view_get_cursor(GTK_TREE_VIEW(vf->listview), &tpath, NULL);
 	if (tpath)