Attachment 15967 Details for Bug 14870 – 3.1 Patch for [S60]: Title area displayed in Security Confirmation querries even though there is no title TSWID: ELTA-75H9ZB

[patch] 3.1 Patch for [S60]: Title area displayed in Security Confirmation querries even though there is no title TSWID: ELTA-75H9ZB

31Dialog.patch (text/plain), 3.86 KB, created by Amanda Song on 2007-08-14 12:51:49 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Amanda Song

Created: 2007-08-14 12:51:49 PDT

Size: 3.86 KB

patch

obsolete

>Index: WebKit/ChangeLog
>===================================================================
>--- WebKit/ChangeLog	(revision 24849)
>+++ WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,21 @@
>+2007-08-03  asong  <set EMAIL_ADDRESS environment variable>
>+
>+        Reviewed by NOBODY (OOPS!).
>+        DESC: [S60]: Title area displayed in Security Confirmation querries even though there is no title TSWID: ELTA-75H9ZB
>+        http://bugs.webkit.org/show_bug.cgi?id=14870
>+
>+        * BrowserView/src/FormDataLoginStore.cpp: Add KEmtpyTitle Literal
>+
>+        (CFormDataLoginStore::SaveDialogL): Pass the new literal to DialogConfirm method
>+
>+        * BrowserView/src/HttpLoaderEventToUiListener.cpp:Add KEmtpyTitle Literal
>+
>+        (CHttpLoaderEventToUiListener::AboutToLoadPage): Pass the new literal to DialogConfirm method
>+        (CHttpLoaderEventToUiListener::GetUserAuthenticationDataL): Pass the new literal to DialogConfirm method
>+
>+        * ResourceLoader/src/AboutTransaction.cpp:
>+        (CAboutTransaction::DoSubmitL):
>+
> 2007-08-02  yadavall  <sriram.yadavalli@nokia.com>
> 
>         Reviewed by Zalan Bujtas (zbujtas@gmail.com).
>Index: WebKit/BrowserView/src/FormDataLoginStore.cpp
>===================================================================
>--- WebKit/BrowserView/src/FormDataLoginStore.cpp	(revision 24842)
>+++ WebKit/BrowserView/src/FormDataLoginStore.cpp	(working copy)
>@@ -61,6 +61,7 @@
> 
> _LIT (KLoginName1,"user");
> _LIT (KLoginName2,"login");
>+_LIT (KEmptyTitle,"");
> 
> const TUint KBlockListInitSize = 10;
> const TUint KLoginListInitSize = 20;
>@@ -548,13 +549,13 @@ TLoginDataSaveDialogType CFormDataLoginS
>     HBufC* saveQuery = StringLoader::LoadLC(R_BROWSER_FORM_AUTOFILL_SAVE);
>     HBufC* blockQuery = StringLoader::LoadLC(R_BROWSER_FORM_AUTOFILL_ASK_LATER);
> 
>-    if (iDialogProvider->DialogConfirmL(_L(" "),*saveQuery,*leftkey,*rightkey))
>+    if (iDialogProvider->DialogConfirmL(KEmptyTitle,*saveQuery,*leftkey,*rightkey))
>       {
>       selected = ELoginDataSaveYes;
>       }
>     else
>       {
>-      if (!iDialogProvider->DialogConfirmL(_L(" "),*blockQuery,*leftkey,*rightkey))
>+      if (!iDialogProvider->DialogConfirmL(KEmptyTitle,*blockQuery,*leftkey,*rightkey))
>         {
>         selected = ELoginDataSaveNever;
>         BlockL(aUrl);
>Index: WebKit/BrowserView/src/HttpLoaderEventToUiListener.cpp
>===================================================================
>--- WebKit/BrowserView/src/HttpLoaderEventToUiListener.cpp	(revision 24842)
>+++ WebKit/BrowserView/src/HttpLoaderEventToUiListener.cpp	(working copy)
>@@ -51,6 +51,8 @@
> #include "WebKitControl.h"
> #include "BrCtl.h"
> #include "HttpLoaderEventToUiListener.h"
>+
>+_LIT (KEmptyTitle,"");
> // ============================= LOCAL FUNCTIONS ===============================
> 
> 
>@@ -378,7 +380,7 @@ TInt CHttpLoaderEventToUiListener::About
>         rightMessage = StringLoader::LoadLC(R_TEXT_SOFTKEY_NO);
> 
>         MBrCtlDialogsProvider* dialogsProvider = iBrCtl->BrCtlDialogsProvider();
>-        TRAPD(err, result = dialogsProvider->DialogConfirmL(_L(" "),
>+        TRAPD(err, result = dialogsProvider->DialogConfirmL(KEmptyTitle,
>                                                             *message,
>                                                             *leftMessage,
>                                                             *rightMessage));
>@@ -467,7 +469,7 @@ void CHttpLoaderEventToUiListener::GetUs
>         // Display the basic authentication dialog
>         if (message && okMsg && cancelMsg)
>             {
>-            bRet = dialogsProvider->DialogConfirmL(_L(" "), *message, *okMsg, *cancelMsg);
>+            bRet = dialogsProvider->DialogConfirmL(KEmptyTitle, *message, *okMsg, *cancelMsg);
>             }
>         // Clean up the basic authentication dialog memory
>         CleanupStack::PopAndDestroy(3); // message, okMsg, cancelMsg

Flags:

Sachin.Padma: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 14870: 15816 | 15821 | 15966 | 15967