[gtk+] x11: Remove special casing for GdkAtoms
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] x11: Remove special casing for GdkAtoms
- Date: Wed, 15 Nov 2017 18:22:08 +0000 (UTC)
commit 41f9a174e2c6bab2bfe8af1e8168d1e0f4ab5e8e
Author: Benjamin Otte <otte redhat com>
Date: Wed Nov 15 04:07:11 2017 +0100
x11: Remove special casing for GdkAtoms
This is in preparation for the GdkAtom removal
gdk/x11/gdkproperty-x11.c | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
---
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index e413d47..21cecce 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -37,11 +37,6 @@
#include <X11/Xatom.h>
#include <string.h>
-#define N_PREDEFINED_ATOMS 69
-
-#define ATOM_TO_INDEX(atom) (GPOINTER_TO_UINT(atom))
-#define INDEX_TO_ATOM(atom) ((GdkAtom)GUINT_TO_POINTER(atom))
-
static void
insert_atom_pair (GdkDisplay *display,
GdkAtom virtual_atom,
@@ -69,9 +64,6 @@ lookup_cached_xatom (GdkDisplay *display,
{
GdkX11Display *display_x11 = GDK_X11_DISPLAY (display);
- if (ATOM_TO_INDEX (atom) < N_PREDEFINED_ATOMS)
- return ATOM_TO_INDEX (atom);
-
if (display_x11->atom_from_virtual)
return GPOINTER_TO_UINT (g_hash_table_lookup (display_x11->atom_from_virtual,
GDK_ATOM_TO_POINTER (atom)));
@@ -204,9 +196,6 @@ gdk_x11_xatom_to_atom_for_display (GdkDisplay *display,
display_x11 = GDK_X11_DISPLAY (display);
- if (xatom < N_PREDEFINED_ATOMS)
- return INDEX_TO_ATOM (xatom);
-
if (display_x11->atom_to_virtual)
virtual_atom = GDK_POINTER_TO_ATOM (g_hash_table_lookup (display_x11->atom_to_virtual,
GUINT_TO_POINTER (xatom)));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]