diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
| commit | 54d44a9bd04cfbed8426614fc69c027a46f41a14 (patch) | |
| tree | 34bdf65a6e8d5d6d4016154345d1d803ba0da379 /gtk/gtkclipboard.c | |
| parent | b3b22c31b997fb85b3319b392a1a69407703184c (diff) | |
| parent | 67194ed77b153eb5a7eb6c596f3c20e274b7787a (diff) | |
| download | gtk+-native-layout.tar.gz | |
Merge branch 'master' into native-layoutnative-layout
Conflicts:
gtk/gtkplug.c
gtk/gtkscrolledwindow.c
Diffstat (limited to 'gtk/gtkclipboard.c')
| -rw-r--r-- | gtk/gtkclipboard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c index 5e34975d7b..86caed4af1 100644 --- a/gtk/gtkclipboard.c +++ b/gtk/gtkclipboard.c @@ -413,7 +413,7 @@ clipboard_get_timestamp (GtkClipboard *clipboard) if (timestamp == GDK_CURRENT_TIME) { #ifdef GDK_WINDOWING_X11 - timestamp = gdk_x11_get_server_time (clipboard_widget->window); + timestamp = gdk_x11_get_server_time (gtk_widget_get_window (clipboard_widget)); #elif defined GDK_WINDOWING_WIN32 timestamp = GetMessageTime (); #endif @@ -2025,7 +2025,7 @@ gtk_clipboard_store (GtkClipboard *clipboard) clipboard); gdk_display_store_clipboard (clipboard->display, - clipboard_widget->window, + gtk_widget_get_window (clipboard_widget), clipboard_get_timestamp (clipboard), clipboard->storable_targets, clipboard->n_storable_targets); |