diff options
| author | Benjamin Otte <otte@redhat.com> | 2013-04-15 15:40:55 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2013-04-15 15:43:27 +0200 |
| commit | aa9e974c866e32c5573da3d364c72dd5e016d47a (patch) | |
| tree | 88d43c63fdeba8dd54bd216e0bc77d08c33373a9 /gdk/broadway | |
| parent | a489f69e009644717aad8df74397b669f5f3fbb2 (diff) | |
| download | gtk+-aa9e974c866e32c5573da3d364c72dd5e016d47a.tar.gz | |
gdk: Make atoms handled generically
This is another step towards making GdkDisplayManager backend-agnostic.
Most of the backends profit from this as their atom implementations
where generic anyway - x11 needed that to allow multiple X displays and
broadway, quartz and wayland don't have the concept of displays.
The X11 backend still did things, so I only #if 0'd some code but did
not actually update anything.
Diffstat (limited to 'gdk/broadway')
| -rw-r--r-- | gdk/broadway/gdkdisplaymanager-broadway.c | 2 | ||||
| -rw-r--r-- | gdk/broadway/gdkprivate-broadway.h | 9 | ||||
| -rw-r--r-- | gdk/broadway/gdkproperty-broadway.c | 28 |
3 files changed, 0 insertions, 39 deletions
diff --git a/gdk/broadway/gdkdisplaymanager-broadway.c b/gdk/broadway/gdkdisplaymanager-broadway.c index 468d4fc6d6..0cefe07fe3 100644 --- a/gdk/broadway/gdkdisplaymanager-broadway.c +++ b/gdk/broadway/gdkdisplaymanager-broadway.c @@ -127,8 +127,6 @@ gdk_broadway_display_manager_class_init (GdkBroadwayDisplayManagerClass *class) object_class->finalize = gdk_broadway_display_manager_finalize; manager_class->open_display = gdk_broadway_display_manager_open_display; - manager_class->atom_intern = _gdk_broadway_display_manager_atom_intern; - manager_class->get_atom_name = _gdk_broadway_display_manager_get_atom_name; manager_class->lookup_keyval = gdk_broadway_display_manager_lookup_keyval; manager_class->get_keyval_name = gdk_broadway_display_manager_get_keyval_name; } diff --git a/gdk/broadway/gdkprivate-broadway.h b/gdk/broadway/gdkprivate-broadway.h index b631e04178..89997e3e7b 100644 --- a/gdk/broadway/gdkprivate-broadway.h +++ b/gdk/broadway/gdkprivate-broadway.h @@ -42,15 +42,6 @@ void _gdk_broadway_resync_windows (void); void _gdk_broadway_windowing_init (void); -gchar * _gdk_broadway_display_manager_get_atom_name (GdkDisplayManager *manager, - GdkAtom atom); -GdkAtom _gdk_broadway_display_manager_atom_intern_static_string (GdkDisplayManager *manager, - const gchar *atom_name); -GdkAtom _gdk_broadway_display_manager_atom_intern (GdkDisplayManager *manager, - const gchar *atom_name, - gboolean only_if_exists); - - void _gdk_broadway_window_register_dnd (GdkWindow *window); GdkDragContext * _gdk_broadway_window_drag_begin (GdkWindow *window, GdkDevice *device, diff --git a/gdk/broadway/gdkproperty-broadway.c b/gdk/broadway/gdkproperty-broadway.c index 3e8b62b923..85bb8be8e5 100644 --- a/gdk/broadway/gdkproperty-broadway.c +++ b/gdk/broadway/gdkproperty-broadway.c @@ -35,34 +35,6 @@ #include <string.h> -GdkAtom -_gdk_broadway_display_manager_atom_intern (GdkDisplayManager *manager, - const gchar *atom_name, - gboolean only_if_exists) -{ - return _GDK_MAKE_ATOM (g_quark_from_string (atom_name)); -} - -GdkAtom -_gdk_broadway_display_manager_atom_intern_static_string (GdkDisplayManager *manager, - const gchar *atom_name) -{ - return _GDK_MAKE_ATOM (g_quark_from_static_string (atom_name)); -} - -static const char * -get_atom_name (GdkAtom atom) -{ - return g_quark_to_string (GPOINTER_TO_UINT(atom)); -} - -gchar * -_gdk_broadway_display_manager_get_atom_name (GdkDisplayManager *manager, - GdkAtom atom) -{ - return g_strdup (get_atom_name (atom)); -} - gboolean _gdk_broadway_window_get_property (GdkWindow *window, GdkAtom property, |