GTK: More GSEALing.

chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 
 #include "base/pickle.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 306 matching lines @@
 void WriteBookmarksToSelection(const std::vector<const BookmarkNode*>& nodes,
                                GtkSelectionData* selection_data,
                                guint target_type,
                                Profile* profile) {
   switch (target_type) {
     case ui::CHROME_BOOKMARK_ITEM: {
       BookmarkNodeData data(nodes);
       Pickle pickle;
       data.WriteToPickle(profile, &pickle);
 
-      gtk_selection_data_set(selection_data, selection_data->target,
+      gtk_selection_data_set(selection_data,
+                             gtk_selection_data_get_target(selection_data),
                              kBitsInAByte,
                              static_cast<const guchar*>(pickle.data()),
                              pickle.size());
       break;
     }
     case ui::NETSCAPE_URL: {
       // _NETSCAPE_URL format is URL + \n + title.
       std::string utf8_text = nodes[0]->url().spec() + "\n" +
           UTF16ToUTF8(nodes[0]->GetTitle());
       gtk_selection_data_set(selection_data,
-                             selection_data->target,
+                             gtk_selection_data_get_target(selection_data),
                              kBitsInAByte,
                              reinterpret_cast<const guchar*>(utf8_text.c_str()),
                              utf8_text.length());
       break;
     }
     case ui::TEXT_URI_LIST: {
       gchar** uris = reinterpret_cast<gchar**>(malloc(sizeof(gchar*) *
                                                (nodes.size() + 1)));
       for (size_t i = 0; i < nodes.size(); ++i) {
         // If the node is a folder, this will be empty. TODO(estade): figure out
@@ skipping 38 matching lines @@
     GtkSelectionData* selection_data,
     guint target_type,
     Profile* profile,
     gboolean* delete_selection_data,
     gboolean* dnd_success) {
   if (delete_selection_data)
     *delete_selection_data = FALSE;
   if (dnd_success)
     *dnd_success = FALSE;
 
-  if (selection_data && selection_data->length > 0) {
-    if (context && delete_selection_data && context->action == GDK_ACTION_MOVE)
-      *delete_selection_data = TRUE;
+  if (selection_data) {
+    gint length = gtk_selection_data_get_length(selection_data);
+    if (length > 0) {
+      if (context && delete_selection_data &&
+          context->action == GDK_ACTION_MOVE)
+        *delete_selection_data = TRUE;
 
-    switch (target_type) {
-      case ui::CHROME_BOOKMARK_ITEM: {
-        if (dnd_success)
-          *dnd_success = TRUE;
-        Pickle pickle(reinterpret_cast<char*>(selection_data->data),
-                      selection_data->length);
-        BookmarkNodeData drag_data;
-        drag_data.ReadFromPickle(&pickle);
-        return drag_data.GetNodes(profile);
-      }
-      default: {
-        DLOG(ERROR) << "Unsupported drag received type: " << target_type;
+      switch (target_type) {
+        case ui::CHROME_BOOKMARK_ITEM: {
+          if (dnd_success)
+            *dnd_success = TRUE;
+          Pickle pickle(reinterpret_cast<const char*>(
+              gtk_selection_data_get_data(selection_data)), length);
+          BookmarkNodeData drag_data;
+          drag_data.ReadFromPickle(&pickle);
+          return drag_data.GetNodes(profile);
+        }
+        default: {
+          DLOG(ERROR) << "Unsupported drag received type: " << target_type;
+        }
       }
     }
   }
 
   return std::vector<const BookmarkNode*>();
 }
 
 bool CreateNewBookmarkFromNamedUrl(GtkSelectionData* selection_data,
     BookmarkModel* model, const BookmarkNode* parent, int idx) {
   GURL url;
@@ skipping 21 matching lines @@
   GURL url;
   string16 title;
   if (!ui::ExtractNetscapeURL(selection_data, &url, &title))
     return false;
 
   model->AddURL(parent, idx, title, url);
   return true;
 }
 
 }  // namespace bookmark_utils