Commit 22917637 authored by Carlos Soriano's avatar Carlos Soriano
Browse files

Merge branch 'drop-x11-xf86keysym-h' into 'master'

general: Get key values from gdk/gdkkeysyms.h, not X11/XF86keysym.h

See merge request !38
parents bb595c3a 2ea3a8cc
......@@ -3,7 +3,6 @@
#mesondefine GETTEXT_PACKAGE
#mesondefine HAVE_EXEMPI
#mesondefine HAVE_SELINUX
#mesondefine HAVE_X11_XF86KEYSYM_H
#mesondefine ENABLE_DESKTOP
#mesondefine ENABLE_PACKAGEKIT
#mesondefine LOCALEDIR
......
......@@ -81,10 +81,6 @@ if not tracker_sparql.found()
tracker_sparql = dependency ('tracker-sparql-1.0')
endif
if cc.has_header ('X11/XF86keysym.h')
conf.set10 ('HAVE_X11_XF86KEYSYM_H', true)
endif
configure_file (input: 'config.h.meson',
output: 'config.h',
configuration: conf)
......
......@@ -43,11 +43,6 @@
#include "nautilus-toolbar.h"
#include "nautilus-view.h"
#include "nautilus-tag-manager.h"
#ifdef HAVE_X11_XF86KEYSYM_H
#include <X11/XF86keysym.h>
#endif
#include <gdk/gdkx.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
......@@ -351,12 +346,9 @@ static const struct
const char *action;
} extra_view_keybindings [] =
{
#ifdef HAVE_X11_XF86KEYSYM_H
/* View actions */
{ XF86XK_ZoomIn, "zoom-in" },
{ XF86XK_ZoomOut, "zoom-out" },
#endif
{ GDK_KEY_ZoomIn, "zoom-in" },
{ GDK_KEY_ZoomOut, "zoom-out" },
};
/*
......
......@@ -46,9 +46,6 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#ifdef HAVE_X11_XF86KEYSYM_H
#include <X11/XF86keysym.h>
#endif
#include "nautilus-dnd.h"
#include "nautilus-file-utilities.h"
#include "nautilus-file-attributes.h"
......@@ -171,21 +168,19 @@ static const struct
const char *action;
} extra_window_keybindings [] =
{
#ifdef HAVE_X11_XF86KEYSYM_H
/* Window actions */
{ XF86XK_AddFavorite, "bookmark-current-location" },
{ XF86XK_Favorites, "bookmarks" },
{ XF86XK_Go, "enter-location" },
{ XF86XK_HomePage, "go-home" },
{ XF86XK_OpenURL, "enter-location" },
{ XF86XK_Refresh, "reload" },
{ XF86XK_Reload, "reload" },
{ XF86XK_Search, "search" },
{ XF86XK_Start, "go-home" },
{ XF86XK_Stop, "stop" },
{ XF86XK_Back, "back" },
{ XF86XK_Forward, "forward" },
#endif
{ GDK_KEY_AddFavorite, "bookmark-current-location" },
{ GDK_KEY_Favorites, "bookmarks" },
{ GDK_KEY_Go, "enter-location" },
{ GDK_KEY_HomePage, "go-home" },
{ GDK_KEY_OpenURL, "enter-location" },
{ GDK_KEY_Refresh, "reload" },
{ GDK_KEY_Reload, "reload" },
{ GDK_KEY_Search, "search" },
{ GDK_KEY_Start, "go-home" },
{ GDK_KEY_Stop, "stop" },
{ GDK_KEY_Back, "back" },
{ GDK_KEY_Forward, "forward" },
};
static const GtkPadActionEntry pad_actions[] = {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment