From 4d9b4c6fab33b8442d8d802a7ea18143b14b1e6d Mon Sep 17 00:00:00 2001 From: Rinat Ibragimov <ibragimovrinat@mail.ru> Date: Tue, 13 Jan 2015 23:38:25 +0300 Subject: [PATCH] ppb_flash_clipboard: fix gtk-3.0 incompatibilities --- src/ppb_flash_clipboard.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ppb_flash_clipboard.c b/src/ppb_flash_clipboard.c index ef74192..2e0ee17 100644 --- a/src/ppb_flash_clipboard.c +++ b/src/ppb_flash_clipboard.c @@ -270,14 +270,16 @@ clipboard_read_data_ptac(void *user_data) GtkSelectionData *sd = gtk_clipboard_wait_for_contents(clipboard, target); if (sd) { + const guchar *sd_data = gtk_selection_data_get_data(sd); + const gint sd_length = gtk_selection_data_get_length(sd); switch (p->format) { case PP_FLASH_CLIPBOARD_FORMAT_PLAINTEXT: case PP_FLASH_CLIPBOARD_FORMAT_HTML: - p->result = ppb_var_var_from_utf8((char *)sd->data, sd->length); + p->result = ppb_var_var_from_utf8((char *)sd_data, sd_length); break; default: - p->result = ppb_var_array_buffer_create(sd->length); - memcpy(ppb_var_array_buffer_map(p->result), sd->data, sd->length); + p->result = ppb_var_array_buffer_create(sd_length); + memcpy(ppb_var_array_buffer_map(p->result), sd_data, sd_length); ppb_var_array_buffer_unmap(p->result); break; }