diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2014-08-21 19:41:48 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2014-09-01 19:17:53 +0200 |
| commit | f48b3cce024b04df08ef5fa3d8360688e1f910b7 (patch) | |
| tree | a6bb6fa35be79a9bcca432ee4394eb833f88362b /gtk/gtkclipboard.c | |
| parent | 77447990728d171c53cf228acf9b99c2d8d132f0 (diff) | |
| download | gtk+-f48b3cce024b04df08ef5fa3d8360688e1f910b7.tar.gz | |
wayland: Replace clipboard implementation
The wayland specific clipboard functions have been replaced by something
more similar to the hooking the win32 backend does, which allows for just
using the default GtkClipboard code in GTK+. As a consequence, the
wayland-specific GtkClipboard implementation is now gone.
https://bugzilla.gnome.org/show_bug.cgi?id=697855
Diffstat (limited to 'gtk/gtkclipboard.c')
| -rw-r--r-- | gtk/gtkclipboard.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c index 682634695e..302f7f73f1 100644 --- a/gtk/gtkclipboard.c +++ b/gtk/gtkclipboard.c @@ -23,9 +23,6 @@ #include "gtkclipboard.h" #include "gtkclipboardprivate.h" -#ifdef GDK_WINDOWING_WAYLAND -#include "gtkclipboard-waylandprivate.h" -#endif #include "gtkinvisible.h" #include "gtkmain.h" #include "gtkmarshalers.h" @@ -1917,12 +1914,7 @@ clipboard_peek (GdkDisplay *display, if (!tmp_list && !only_if_exists) { -#ifdef GDK_WINDOWING_WAYLAND - if (GDK_IS_WAYLAND_DISPLAY (display)) - clipboard = g_object_new (GTK_TYPE_CLIPBOARD_WAYLAND, NULL); - else -#endif - clipboard = g_object_new (GTK_TYPE_CLIPBOARD, NULL); + clipboard = g_object_new (GTK_TYPE_CLIPBOARD, NULL); clipboard->selection = selection; clipboard->display = display; |