summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/caja-bookmarks-window.c4
-rw-r--r--src/caja-location-entry.c28
-rw-r--r--src/caja-navigation-bar.c2
-rw-r--r--src/caja-places-sidebar.c16
-rw-r--r--src/caja-query-editor.c2
-rw-r--r--src/caja-search-bar.c6
-rw-r--r--src/caja-side-pane.c8
-rw-r--r--src/caja-spatial-window.c4
-rw-r--r--src/caja-window.c8
-rw-r--r--src/caja-zoom-control.c12
-rw-r--r--src/file-manager/fm-directory-view.c6
-rw-r--r--src/file-manager/fm-list-view.c16
-rw-r--r--src/file-manager/fm-properties-window.c2
13 files changed, 57 insertions, 57 deletions
diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c
index aaf0aee1..86c80bc5 100644
--- a/src/caja-bookmarks-window.c
+++ b/src/caja-bookmarks-window.c
@@ -749,7 +749,7 @@ on_key_pressed (GtkTreeView *view,
GdkEventKey *event,
gpointer user_data)
{
- if (event->keyval == GDK_Delete || event->keyval == GDK_KP_Delete)
+ if (event->keyval == GDK_KEY_Delete || event->keyval == GDK_KEY_KP_Delete)
{
bookmarks_delete_bookmark ();
return TRUE;
@@ -1082,7 +1082,7 @@ handle_close_accelerator (GtkWindow *window,
g_assert (event != NULL);
g_assert (user_data == NULL);
- if (event->state & GDK_CONTROL_MASK && event->keyval == GDK_w) {
+ if (event->state & GDK_CONTROL_MASK && event->keyval == GDK_KEY_w) {
gtk_widget_hide (GTK_WIDGET (window));
return TRUE;
}
diff --git a/src/caja-location-entry.c b/src/caja-location-entry.c
index fac59e44..f23f1a9f 100644
--- a/src/caja-location-entry.c
+++ b/src/caja-location-entry.c
@@ -133,19 +133,19 @@ entry_would_have_inserted_characters (const GdkEventKey *event)
{
switch (event->keyval)
{
- case GDK_BackSpace:
- case GDK_Clear:
- case GDK_Insert:
- case GDK_Delete:
- case GDK_Home:
- case GDK_End:
- case GDK_KP_Home:
- case GDK_KP_End:
- case GDK_Left:
- case GDK_Right:
- case GDK_KP_Left:
- case GDK_KP_Right:
- case GDK_Return:
+ case GDK_KEY_BackSpace:
+ case GDK_KEY_Clear:
+ case GDK_KEY_Insert:
+ case GDK_KEY_Delete:
+ case GDK_KEY_Home:
+ case GDK_KEY_End:
+ case GDK_KEY_KP_Home:
+ case GDK_KEY_KP_End:
+ case GDK_KEY_Left:
+ case GDK_KEY_Right:
+ case GDK_KEY_KP_Left:
+ case GDK_KEY_KP_Right:
+ case GDK_KEY_Return:
return FALSE;
default:
if (event->keyval >= 0x20 && event->keyval <= 0xFF)
@@ -235,7 +235,7 @@ editable_event_after_callback (GtkEntry *entry,
* likely an auto-completion. We ignore shift / control since
* they can validly be used to extend the selection.
*/
- if ((keyevent->keyval == GDK_Right || keyevent->keyval == GDK_End) &&
+ if ((keyevent->keyval == GDK_KEY_Right || keyevent->keyval == GDK_KEY_End) &&
!(keyevent->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) &&
gtk_editable_get_selection_bounds (editable, NULL, NULL))
{
diff --git a/src/caja-navigation-bar.c b/src/caja-navigation-bar.c
index 45434e89..c71d6503 100644
--- a/src/caja-navigation-bar.c
+++ b/src/caja-navigation-bar.c
@@ -93,7 +93,7 @@ caja_navigation_bar_class_init (CajaNavigationBarClass *klass)
klass->cancel = NULL;
binding_set = gtk_binding_set_by_class (klass);
- gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, "cancel", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, "cancel", 0);
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, caja_navigation_bar, get_location);
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, caja_navigation_bar, set_location);
diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c
index eb05ba37..c12c6200 100644
--- a/src/caja-places-sidebar.c
+++ b/src/caja-places-sidebar.c
@@ -2577,10 +2577,10 @@ bookmarks_key_press_event_cb (GtkWidget *widget,
modifiers = gtk_accelerator_get_default_mod_mask ();
- if (event->keyval == GDK_Return ||
- event->keyval == GDK_KP_Enter ||
- event->keyval == GDK_ISO_Enter ||
- event->keyval == GDK_space)
+ if (event->keyval == GDK_KEY_Return ||
+ event->keyval == GDK_KEY_KP_Enter ||
+ event->keyval == GDK_KEY_ISO_Enter ||
+ event->keyval == GDK_KEY_space)
{
if ((event->state & modifiers) == GDK_SHIFT_MASK)
flags = CAJA_WINDOW_OPEN_FLAG_NEW_TAB;
@@ -2596,21 +2596,21 @@ bookmarks_key_press_event_cb (GtkWidget *widget,
return TRUE;
}
- if (event->keyval == GDK_Down &&
+ if (event->keyval == GDK_KEY_Down &&
(event->state & modifiers) == GDK_MOD1_MASK)
{
return eject_or_unmount_selection (sidebar);
}
- if ((event->keyval == GDK_Delete
- || event->keyval == GDK_KP_Delete)
+ if ((event->keyval == GDK_KEY_Delete
+ || event->keyval == GDK_KEY_KP_Delete)
&& (event->state & modifiers) == 0)
{
remove_selected_bookmarks (sidebar);
return TRUE;
}
- if ((event->keyval == GDK_F2)
+ if ((event->keyval == GDK_KEY_F2)
&& (event->state & modifiers) == 0)
{
rename_selected_bookmark (sidebar);
diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c
index 44425df3..7beb13d0 100644
--- a/src/caja-query-editor.c
+++ b/src/caja-query-editor.c
@@ -210,7 +210,7 @@ caja_query_editor_class_init (CajaQueryEditorClass *class)
G_TYPE_NONE, 0);
binding_set = gtk_binding_set_by_class (class);
- gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, "cancel", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, "cancel", 0);
}
static void
diff --git a/src/caja-search-bar.c b/src/caja-search-bar.c
index 86bd1f0a..4ff4ef4b 100644
--- a/src/caja-search-bar.c
+++ b/src/caja-search-bar.c
@@ -102,7 +102,7 @@ caja_search_bar_class_init (CajaSearchBarClass *class)
G_TYPE_NONE, 0);
binding_set = gtk_binding_set_by_class (class);
- gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, "cancel", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, "cancel", 0);
}
static gboolean
@@ -198,7 +198,7 @@ caja_search_bar_borrow_entry (CajaSearchBar *bar)
bar->details->entry_borrowed = TRUE;
binding_set = gtk_binding_set_by_class (G_OBJECT_GET_CLASS (bar));
- gtk_binding_entry_remove (binding_set, GDK_Escape, 0);
+ gtk_binding_entry_remove (binding_set, GDK_KEY_Escape, 0);
return bar->details->entry;
}
@@ -210,7 +210,7 @@ caja_search_bar_return_entry (CajaSearchBar *bar)
bar->details->entry_borrowed = FALSE;
binding_set = gtk_binding_set_by_class (G_OBJECT_GET_CLASS (bar));
- gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, "cancel", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, "cancel", 0);
}
GtkWidget *
diff --git a/src/caja-side-pane.c b/src/caja-side-pane.c
index 0566e81d..a5d6544e 100644
--- a/src/caja-side-pane.c
+++ b/src/caja-side-pane.c
@@ -274,10 +274,10 @@ select_button_key_press_callback (GtkWidget *widget,
side_pane = CAJA_SIDE_PANE (user_data);
- if (event->keyval == GDK_space ||
- event->keyval == GDK_KP_Space ||
- event->keyval == GDK_Return ||
- event->keyval == GDK_KP_Enter)
+ if (event->keyval == GDK_KEY_space ||
+ event->keyval == GDK_KEY_KP_Space ||
+ event->keyval == GDK_KEY_Return ||
+ event->keyval == GDK_KEY_KP_Enter)
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
gtk_menu_popup (GTK_MENU (side_pane->details->menu),
diff --git a/src/caja-spatial-window.c b/src/caja-spatial-window.c
index 24a7b647..612de13e 100644
--- a/src/caja-spatial-window.c
+++ b/src/caja-spatial-window.c
@@ -1135,10 +1135,10 @@ caja_spatial_window_class_init (CajaSpatialWindowClass *klass)
G_OBJECT_CLASS (klass)->finalize = caja_spatial_window_finalize;
binding_set = gtk_binding_set_by_class (klass);
- gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_SHIFT_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_SHIFT_MASK,
"go_up", 1,
G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_Up, GDK_SHIFT_MASK | GDK_MOD1_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, GDK_SHIFT_MASK | GDK_MOD1_MASK,
"go_up", 1,
G_TYPE_BOOLEAN, TRUE);
diff --git a/src/caja-window.c b/src/caja-window.c
index 55a83e52..9dcf3863 100644
--- a/src/caja-window.c
+++ b/src/caja-window.c
@@ -1134,7 +1134,7 @@ add_view_as_menu_item (CajaWindow *window,
g_snprintf (accel_path, sizeof (accel_path), "<Caja-Window>/%s", action_name);
accel_keyval = gdk_keyval_from_name (accel);
- g_assert (accel_keyval != GDK_VoidSymbol);
+ g_assert (accel_keyval != GDK_KEY_VoidSymbol);
gtk_accel_map_add_entry (accel_path, accel_keyval, GDK_CONTROL_MASK);
gtk_action_set_accel_path (GTK_ACTION (action), accel_path);
@@ -2155,12 +2155,12 @@ caja_window_class_init (CajaWindowClass *class)
G_TYPE_NONE, 0);
binding_set = gtk_binding_set_by_class (class);
- gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, 0,
"go_up", 1,
G_TYPE_BOOLEAN, FALSE);
- gtk_binding_entry_add_signal (binding_set, GDK_F5, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_F5, 0,
"reload", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_slash, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, 0,
"prompt-for-location", 1,
G_TYPE_STRING, "/");
diff --git a/src/caja-zoom-control.c b/src/caja-zoom-control.c
index 8ba974c4..5dc79518 100644
--- a/src/caja-zoom-control.c
+++ b/src/caja-zoom-control.c
@@ -723,32 +723,32 @@ caja_zoom_control_class_init (CajaZoomControlClass *class)
binding_set = gtk_binding_set_by_class (class);
gtk_binding_entry_add_signal (binding_set,
- GDK_KP_Subtract, 0,
+ GDK_KEY_KP_Subtract, 0,
"change_value",
1, GTK_TYPE_SCROLL_TYPE,
GTK_SCROLL_STEP_DOWN);
gtk_binding_entry_add_signal (binding_set,
- GDK_minus, 0,
+ GDK_KEY_minus, 0,
"change_value",
1, GTK_TYPE_SCROLL_TYPE,
GTK_SCROLL_STEP_DOWN);
gtk_binding_entry_add_signal (binding_set,
- GDK_KP_Equal, 0,
+ GDK_KEY_KP_Equal, 0,
"zoom_to_default",
0);
gtk_binding_entry_add_signal (binding_set,
- GDK_KP_Equal, 0,
+ GDK_KEY_KP_Equal, 0,
"zoom_to_default",
0);
gtk_binding_entry_add_signal (binding_set,
- GDK_KP_Add, 0,
+ GDK_KEY_KP_Add, 0,
"change_value",
1, GTK_TYPE_SCROLL_TYPE,
GTK_SCROLL_STEP_UP);
gtk_binding_entry_add_signal (binding_set,
- GDK_plus, 0,
+ GDK_KEY_plus, 0,
"change_value",
1, GTK_TYPE_SCROLL_TYPE,
GTK_SCROLL_STEP_UP);
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 51737db5..6ed863bb 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -10955,11 +10955,11 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass)
G_TYPE_BOOLEAN, 0);
binding_set = gtk_binding_set_by_class (klass);
- gtk_binding_entry_add_signal (binding_set, GDK_Delete, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, 0,
"trash", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, 0,
"trash", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, GDK_SHIFT_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK,
"delete", 0);
klass->trash = real_trash;
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 10586bd3..e9fdd88b 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -1108,14 +1108,14 @@ key_press_callback (GtkWidget *widget, GdkEventKey *event, gpointer callback_dat
switch (event->keyval)
{
- case GDK_F10:
+ case GDK_KEY_F10:
if (event->state & GDK_CONTROL_MASK)
{
fm_directory_view_pop_up_background_context_menu (view, &button_event);
handled = TRUE;
}
break;
- case GDK_Right:
+ case GDK_KEY_Right:
gtk_tree_view_get_cursor (tree_view, &path, NULL);
if (path)
{
@@ -1124,7 +1124,7 @@ key_press_callback (GtkWidget *widget, GdkEventKey *event, gpointer callback_dat
}
handled = TRUE;
break;
- case GDK_Left:
+ case GDK_KEY_Left:
gtk_tree_view_get_cursor (tree_view, &path, NULL);
if (path)
{
@@ -1133,7 +1133,7 @@ key_press_callback (GtkWidget *widget, GdkEventKey *event, gpointer callback_dat
}
handled = TRUE;
break;
- case GDK_space:
+ case GDK_KEY_space:
if (event->state & GDK_CONTROL_MASK)
{
handled = FALSE;
@@ -1154,8 +1154,8 @@ key_press_callback (GtkWidget *widget, GdkEventKey *event, gpointer callback_dat
}
handled = TRUE;
break;
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
if ((event->state & GDK_SHIFT_MASK) != 0)
{
activate_selected_items_alternate (FM_LIST_VIEW (view), NULL, TRUE);
@@ -1166,7 +1166,7 @@ key_press_callback (GtkWidget *widget, GdkEventKey *event, gpointer callback_dat
}
handled = TRUE;
break;
- case GDK_v:
+ case GDK_KEY_v:
/* Eat Control + v to not enable type ahead */
if ((event->state & GDK_CONTROL_MASK) != 0)
{
@@ -1641,7 +1641,7 @@ create_and_set_up_tree_view (FMListView *view)
/* Don't handle backspace key. It's used to open the parent folder. */
binding_set = gtk_binding_set_by_class (GTK_WIDGET_GET_CLASS (view->details->tree_view));
- gtk_binding_entry_remove (binding_set, GDK_BackSpace, 0);
+ gtk_binding_entry_remove (binding_set, GDK_KEY_BackSpace, 0);
view->details->drag_dest =
caja_tree_view_drag_dest_new (view->details->tree_view);
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 98e52b8f..bb9f06cd 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -5799,7 +5799,7 @@ fm_properties_window_class_init (FMPropertiesWindowClass *class)
GTK_DIALOG_CLASS (class)->response = real_response;
binding_set = gtk_binding_set_by_class (class);
- gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0,
"close", 0);
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-01 04:24:33 +0000