[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[christian at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 469815b26db7a10f38506e775b1c4252cf1d012c
Author: christian at webkit.org <christian at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 19 18:08:28 2009 +0000

    2009-12-19  Christian Dywan  <christian at twotoasts.de>
    
            Reviewed by Gustavo Noronha Silva.
    
            Don't use an icon for all spelling guess menu items.
    
            * platform/gtk/ContextMenuItemGtk.cpp:
            (WebCore::gtkStockIDFromContextMenuAction):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52386 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cb97fbb..ef3a6e3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-19  Christian Dywan  <christian at twotoasts.de>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Don't use an icon for all spelling guess menu items.
+
+        * platform/gtk/ContextMenuItemGtk.cpp:
+        (WebCore::gtkStockIDFromContextMenuAction):
+
 2009-12-19  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Unreviewed build fix. Missing \.
diff --git a/WebCore/platform/gtk/ContextMenuItemGtk.cpp b/WebCore/platform/gtk/ContextMenuItemGtk.cpp
index aaec206..cb2e003 100644
--- a/WebCore/platform/gtk/ContextMenuItemGtk.cpp
+++ b/WebCore/platform/gtk/ContextMenuItemGtk.cpp
@@ -59,7 +59,7 @@ static const char* gtkStockIDFromContextMenuAction(const ContextMenuAction& acti
     case ContextMenuItemTagSelectAll:
         return GTK_STOCK_SELECT_ALL;
     case ContextMenuItemTagSpellingGuess:
-        return GTK_STOCK_INFO;
+        return NULL;
     case ContextMenuItemTagIgnoreSpelling:
         return GTK_STOCK_NO;
     case ContextMenuItemTagLearnSpelling:

-- 
WebKit Debian packaging