← Back to branch summary

~ubuntu-branches/ubuntu/karmic/webkit/karmic-proposed

« back to all changes in this revision

Viewing changes to WebCore/platform/gtk/PasteboardGtk.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2009-05-15 18:30:58 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090515183058-50q5exjo9b1kxy9s
Tags: 1.1.7-1
http://bugs.debian.org/526683
* New upstream release
* debian/libwebkit-1.0-2.symbols:
- updated with the new symbols in 1.1.7
* debian/libwebkit-dev.install, debian/libwebkit-dev.links,
  debian/rules:
- Build, and ship gtk-doc documentation (Closes: #526683)
* debian/copyright:
- updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/platform/gtk/PasteboardGtk.cpp
162
162
                                                          bool allowPlainText, bool& chosePlainText)
163
163
{
164
164
    GdkAtom textHtml = gdk_atom_intern_static_string("text/html");
165
 
    GtkClipboard* clipboard = m_helper->getClipboard(frame);
 
165
    GtkClipboard* clipboard = m_helper->getCurrentTarget(frame);
166
166
    chosePlainText = false;
167
167
 
168
168
    if (GtkSelectionData* data = gtk_clipboard_wait_for_contents(clipboard, textHtml)) {
195
195
 
196
196
String Pasteboard::plainText(Frame* frame)
197
197
{
198
 
    GtkClipboard* clipboard = m_helper->getClipboard(frame);
 
198
    GtkClipboard* clipboard = m_helper->getCurrentTarget(frame);
199
199
 
200
200
    gchar* utf8 = gtk_clipboard_wait_for_text(clipboard);
201
201