[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[christian at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 94b739ec765f9f4233b29c88b60cce2fdc5acd89
Author: christian at webkit.org <christian at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 27 18:19:38 2009 +0000

    2009-12-27  Christian Dywan  <christian at twotoasts.de>
    
            Reviewed by Eric Seidel.
    
            [GTK] Spell Check Suggestions (Do not work)
            https://bugs.webkit.org/show_bug.cgi?id=30908
    
            * platform/gtk/ContextMenuItemGtk.cpp:
            (WebCore::ContextMenuItem::ContextMenuItem):
            (WebCore::ContextMenuItem::title):
            (WebCore::ContextMenuItem::setTitle): Implement the 'title' member
            and set the title from the native menu item.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52581 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ce4312e..e1f3dd0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-27  Christian Dywan  <christian at twotoasts.de>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] Spell Check Suggestions (Do not work)
+        https://bugs.webkit.org/show_bug.cgi?id=30908
+
+        * platform/gtk/ContextMenuItemGtk.cpp:
+        (WebCore::ContextMenuItem::ContextMenuItem):
+        (WebCore::ContextMenuItem::title):
+        (WebCore::ContextMenuItem::setTitle): Implement the 'title' member
+        and set the title from the native menu item.
+
 2009-12-27  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/platform/gtk/ContextMenuItemGtk.cpp b/WebCore/platform/gtk/ContextMenuItemGtk.cpp
index cb2e003..b2fa853 100644
--- a/WebCore/platform/gtk/ContextMenuItemGtk.cpp
+++ b/WebCore/platform/gtk/ContextMenuItemGtk.cpp
@@ -117,6 +117,12 @@ ContextMenuItem::ContextMenuItem(GtkMenuItem* item)
         m_platformDescription.checked = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(item));
     } else
         m_platformDescription.type = ActionType;
+#if GTK_CHECK_VERSION (2, 16, 0)
+    m_platformDescription.title = String::fromUTF8(gtk_menu_item_get_label(GTK_MENU_ITEM(item)));
+#else
+    GtkWidget* label = gtk_bin_get_child(GTK_BIN(item));
+    m_platformDescription.title = String::fromUTF8(gtk_label_get_label(GTK_LABEL(label)));
+#endif
 
     m_platformDescription.action = *static_cast<ContextMenuAction*>(g_object_get_data(G_OBJECT(item), WEBKIT_CONTEXT_MENU_ACTION));
 
@@ -205,13 +211,12 @@ void ContextMenuItem::setAction(ContextMenuAction action)
 
 String ContextMenuItem::title() const
 {
-    notImplemented();
-    return String();
+    return m_platformDescription.title;
 }
 
-void ContextMenuItem::setTitle(const String&)
+void ContextMenuItem::setTitle(const String& title)
 {
-    notImplemented();
+    m_platformDescription.title = title;
 }
 
 PlatformMenuDescription ContextMenuItem::platformSubMenu() const

-- 
WebKit Debian packaging