2007-12-22 Alp Toker <alp@atoker.com>
authoralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Dec 2007 23:54:16 +0000 (23:54 +0000)
committeralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Dec 2007 23:54:16 +0000 (23:54 +0000)
        GTK+ build fix

        GTK_TARGET_OTHER_APP is not available in older GTK+ versions. Pass
        empty target flags for now.

        Check GTK+, not GLib versions, since they are different.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28964 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/gtk/PasteboardGtk.cpp
WebKit/gtk/ChangeLog
WebKit/gtk/WebView/webkitwebview.cpp

index 26ff6da..a515aa7 100644 (file)
@@ -1,3 +1,15 @@
+2007-12-22  Alp Toker  <alp@atoker.com>
+
+        GTK+ build fix
+
+        GTK_TARGET_OTHER_APP is not available in older GTK+ versions. Pass
+        empty target flags for now.
+
+        Check GTK+, not GLib versions, since they are different.
+
+        * platform/gtk/PasteboardGtk.cpp:
+        (WebCore::Pasteboard::documentFragment):
+
 2007-12-22  Luca Bruno  <lethalman88@gmail.com>
 
         Reviewed by Alp Toker.
index c500a6d..0223d03 100644 (file)
@@ -155,7 +155,7 @@ bool Pasteboard::canSmartReplace()
 PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame* frame, PassRefPtr<Range> context,
                                                           bool allowPlainText, bool& chosePlainText)
 {
-#if GLIB_CHECK_VERSION(2,10,0)
+#if GTK_CHECK_VERSION(2,10,0)
     GdkAtom textHtml = gdk_atom_intern_static_string("text/html");
 #else
     GdkAtom textHtml = gdk_atom_intern("text/html", false);
index faa35c8..400a32a 100644 (file)
@@ -1,3 +1,14 @@
+2007-12-22  Alp Toker  <alp@atoker.com>
+
+        GTK+ build fix
+
+        GTK_TARGET_OTHER_APP is not available in older GTK+ versions. Pass
+        empty target flags for now.
+
+        Check GTK+, not GLib versions, since they are different.
+
+        * WebView/webkitwebview.cpp:
+
 2007-12-22  Luca Bruno  <lethalman88@gmail.com>
 
         Reviewed by Alp Toker.
index 5af3b0c..190ba26 100644 (file)
@@ -888,19 +888,19 @@ static void webkit_web_view_init(WebKitWebView* webView)
     webViewData->mainFrame = WEBKIT_WEB_FRAME(webkit_web_frame_new(webView));
     webViewData->editable = false;
 
-#if GLIB_CHECK_VERSION(2,10,0)
+#if GTK_CHECK_VERSION(2,10,0)
     GdkAtom textHtml = gdk_atom_intern_static_string("text/html");
 #else
     GdkAtom textHtml = gdk_atom_intern("text/html", false);
 #endif
     /* Targets for copy */
     webViewData->copy_target_list = gtk_target_list_new(NULL, 0);
-    gtk_target_list_add(webViewData->copy_target_list, textHtml, GTK_TARGET_OTHER_APP, WEBKIT_WEB_VIEW_TARGET_INFO_HTML);
+    gtk_target_list_add(webViewData->copy_target_list, textHtml, 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML);
     gtk_target_list_add_text_targets(webViewData->copy_target_list, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT);
 
     /* Targets for pasting */
     webViewData->paste_target_list = gtk_target_list_new(NULL, 0);
-    gtk_target_list_add(webViewData->paste_target_list, textHtml, GTK_TARGET_OTHER_APP, WEBKIT_WEB_VIEW_TARGET_INFO_HTML);
+    gtk_target_list_add(webViewData->paste_target_list, textHtml, 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML);
     gtk_target_list_add_text_targets(webViewData->paste_target_list, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT);
 
 }