[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a8325de6ca55908a985eab223f8578788a9d9b12
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 26 01:39:33 2010 +0000

    2010-08-25  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            confirm dialog should show OK/Cancel instead of Yes/No for consistency
            https://bugs.webkit.org/show_bug.cgi?id=32877
    
            Change the button labels for the fallback confirmation dialog to be
            OK and Cancel.
    
            * webkit/webkitwebview.cpp:
            (webkit_web_view_script_dialog):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66070 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index aa810d7..4073840 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Gustavo Noronha Silva.
 
+        confirm dialog should show OK/Cancel instead of Yes/No for consistency
+        https://bugs.webkit.org/show_bug.cgi?id=32877
+
+        Change the button labels for the fallback confirmation dialog to be
+        OK and Cancel.
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_script_dialog):
+
+2010-08-25  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
         Cairo and EFL port shouldn't depend on glib.
         https://bugs.webkit.org/show_bug.cgi?id=44354
 
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 75edd35..76fe6cb 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -992,8 +992,8 @@ static gboolean webkit_web_view_script_dialog(WebKitWebView* webView, WebKitWebF
         break;
     case WEBKIT_SCRIPT_DIALOG_CONFIRM:
         messageType = GTK_MESSAGE_QUESTION;
-        buttons = GTK_BUTTONS_YES_NO;
-        defaultResponse = GTK_RESPONSE_YES;
+        buttons = GTK_BUTTONS_OK_CANCEL;
+        defaultResponse = GTK_RESPONSE_OK;
         break;
     case WEBKIT_SCRIPT_DIALOG_PROMPT:
         messageType = GTK_MESSAGE_QUESTION;
@@ -1023,17 +1023,11 @@ static gboolean webkit_web_view_script_dialog(WebKitWebView* webView, WebKitWebF
     gint response = gtk_dialog_run(GTK_DIALOG(dialog));
 
     switch (response) {
-    case GTK_RESPONSE_YES:
-        didConfirm = TRUE;
-        break;
     case GTK_RESPONSE_OK:
         didConfirm = TRUE;
         if (entry)
             *value = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
-        else
-            *value = 0;
         break;
-    case GTK_RESPONSE_NO:
     case GTK_RESPONSE_CANCEL:
         didConfirm = FALSE;
         break;

-- 
WebKit Debian packaging