Changeset 41428 in webkit
- Timestamp:
- Mar 4, 2009 12:57:38 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r41401 r41428 1 2009-03-02 Xan Lopez <xan@gnome.org> 2 3 Reviewed by Mark Rowe. 4 5 https://bugs.webkit.org/show_bug.cgi?id=24287 6 [GTK] Move auth dialog feature to WebKit/ 7 8 Add WebKitSoupAuthDialog files to build. 9 10 * GNUmakefile.am: 11 1 12 2009-03-03 Gustavo Noronha Silva <gns@gnome.org> 2 13 -
trunk/GNUmakefile.am
r41401 r41428 182 182 $(COVERAGE_CFLAGS) \ 183 183 $(HILDON_CFLAGS) \ 184 $(GEOCLUE_CFLAGS) \ 185 $(GNOMEKEYRING_CFLAGS) 184 $(GEOCLUE_CFLAGS) 186 185 187 186 libWebCore_la_CPPFLAGS = \ … … 212 211 $(PNG_LIBS) \ 213 212 $(GEOCLUE_LIBS) \ 214 $(GNOMEKEYRING_LIBS) \215 213 -lpthread 216 214 … … 238 236 239 237 libwebkit_1_0_la_CFLAGS = \ 240 $(libWebCore_la_CFLAGS) 238 $(libWebCore_la_CFLAGS) \ 239 $(GNOMEKEYRING_CFLAGS) 241 240 242 241 libwebkit_1_0_la_CPPFLAGS = \ … … 251 250 252 251 libwebkit_1_0_la_LIBADD = \ 253 libWebCore.la 252 libWebCore.la \ 253 $(GNOMEKEYRING_LIBS) 254 254 255 255 # … … 307 307 WebKit/gtk/webkit/webkitdownload.h \ 308 308 WebKit/gtk/webkit/webkitnetworkrequest.h \ 309 WebKit/gtk/webkit/webkitsoupauthdialog.h \ 309 310 WebKit/gtk/webkit/webkitversion.h \ 310 311 WebKit/gtk/webkit/webkitwebbackforwardlist.h \ … … 342 343 WebKit/gtk/webkit/webkitprivate.cpp \ 343 344 WebKit/gtk/webkit/webkitprivate.h \ 345 WebKit/gtk/webkit/webkitsoupauthdialog.c \ 344 346 WebKit/gtk/webkit/webkitversion.cpp \ 345 347 WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ -
trunk/WebCore/ChangeLog
r41427 r41428 1 2009-03-02 Xan Lopez <xan@gnome.org> 2 3 Reviewed by Mark Rowe. 4 5 https://bugs.webkit.org/show_bug.cgi?id=24287 6 [GTK] Move auth dialog feature to WebKit/ 7 8 Remove WebKitSoupAuthDialog files from build and stop using it. 9 10 * GNUmakefile.am: 11 * platform/network/soup/ResourceHandleSoup.cpp: 12 (WebCore::ensureSessionIsInitialized): 13 * platform/network/soup/webkit-soup-auth-dialog.c: Removed. 14 * platform/network/soup/webkit-soup-auth-dialog.h: Removed. 15 1 16 2009-03-04 Simon Fraser <simon.fraser@apple.com> 2 17 -
trunk/WebCore/GNUmakefile.am
r41357 r41428 1818 1818 WebCore/platform/network/soup/ResourceHandleSoup.cpp \ 1819 1819 WebCore/platform/network/soup/ResourceRequest.h \ 1820 WebCore/platform/network/soup/ResourceResponse.h \ 1821 WebCore/platform/network/soup/webkit-soup-auth-dialog.c \ 1822 WebCore/platform/network/soup/webkit-soup-auth-dialog.h 1820 WebCore/platform/network/soup/ResourceResponse.h 1823 1821 1824 1822 if USE_GNOMEKEYRING -
trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp
r41401 r41428 42 42 #include "ResourceResponse.h" 43 43 #include "TextEncoding.h" 44 #include "webkit-soup-auth-dialog.h"45 44 46 45 #include <errno.h> … … 374 373 } 375 374 376 static GtkWidget* currentToplevelCallback(WebKitSoupAuthDialog* feature, SoupMessage* message, gpointer userData)377 {378 gpointer messageData = g_object_get_data(G_OBJECT(message), "resourceHandle");379 if (!messageData)380 return NULL;381 382 ResourceHandle* handle = static_cast<ResourceHandle*>(messageData);383 if (!handle)384 return NULL;385 386 ResourceHandleInternal* d = handle->getInternal();387 if (!d)388 return NULL;389 390 Frame* frame = d->m_frame;391 if (!frame)392 return NULL;393 394 GtkWidget* toplevel = gtk_widget_get_toplevel(GTK_WIDGET(frame->page()->chrome()->platformWindow()));395 if (GTK_WIDGET_TOPLEVEL(toplevel))396 return toplevel;397 else398 return NULL;399 }400 401 375 static void ensureSessionIsInitialized(SoupSession* session) 402 376 { … … 409 383 else 410 384 setDefaultCookieJar(jar); 411 412 SoupSessionFeature* authDialog = static_cast<SoupSessionFeature*>(g_object_new(WEBKIT_TYPE_SOUP_AUTH_DIALOG, NULL));413 g_signal_connect(authDialog, "current-toplevel", G_CALLBACK(currentToplevelCallback), NULL);414 soup_session_add_feature(session, authDialog);415 g_object_unref(authDialog);416 385 417 386 const char* webkit_debug = g_getenv("WEBKIT_DEBUG"); -
trunk/WebKit/gtk/ChangeLog
r41401 r41428 1 2009-03-02 Xan Lopez <xan@gnome.org> 2 3 Reviewed by Mark Rowe. 4 5 https://bugs.webkit.org/show_bug.cgi?id=24287 6 [GTK] Move auth dialog feature to WebKit/ 7 8 Add WebKitSoupAuthDialog and add it to the session in webkit_init. 9 10 * webkit/webkitprivate.cpp: 11 (currentToplevelCallback): 12 (webkit_init): 13 * webkit/webkitsoupauthdialog.c: Added. 14 (webkit_soup_auth_dialog_class_init): 15 (webkit_soup_auth_dialog_init): 16 (webkit_soup_auth_dialog_session_feature_init): 17 (free_authData): 18 (set_password_callback): 19 (response_callback): 20 (table_add_entry): 21 (show_auth_dialog): 22 (find_password_callback): 23 (session_authenticate): 24 (attach): 25 * webkit/webkitsoupauthdialog.h: Added. 26 1 27 2009-03-03 Gustavo Noronha Silva <gns@gnome.org> 2 28 -
trunk/WebKit/gtk/webkit/webkit.h
r41401 r41428 26 26 #include <webkit/webkitdownload.h> 27 27 #include <webkit/webkitnetworkrequest.h> 28 #include <webkit/webkitsoupauthdialog.h> 28 29 #include <webkit/webkitwebframe.h> 29 30 #include <webkit/webkitwebsettings.h> -
trunk/WebKit/gtk/webkit/webkitprivate.cpp
r39575 r41428 21 21 #include "config.h" 22 22 23 #include "webkitsoupauthdialog.h" 23 24 #include "webkitprivate.h" 24 25 #include "ChromeClientGtk.h" 26 #include "Frame.h" 25 27 #include "FrameLoader.h" 26 28 #include "FrameLoaderClientGtk.h" … … 31 33 #include "Pasteboard.h" 32 34 #include "PasteboardHelperGtk.h" 35 #include "ResourceHandle.h" 36 #include "ResourceHandleClient.h" 37 #include "ResourceHandleInternal.h" 33 38 #include <runtime/InitializeThreading.h> 34 39 … … 97 102 } /** end namespace WebKit */ 98 103 104 static GtkWidget* currentToplevelCallback(WebKitSoupAuthDialog* feature, SoupMessage* message, gpointer userData) 105 { 106 gpointer messageData = g_object_get_data(G_OBJECT(message), "resourceHandle"); 107 if (!messageData) 108 return NULL; 109 110 ResourceHandle* handle = static_cast<ResourceHandle*>(messageData); 111 if (!handle) 112 return NULL; 113 114 ResourceHandleInternal* d = handle->getInternal(); 115 if (!d) 116 return NULL; 117 118 WebCore::Frame* frame = d->m_frame; 119 if (!frame) 120 return NULL; 121 122 GtkWidget* toplevel = gtk_widget_get_toplevel(GTK_WIDGET(frame->page()->chrome()->platformWindow())); 123 if (GTK_WIDGET_TOPLEVEL(toplevel)) 124 return toplevel; 125 else 126 return NULL; 127 } 128 99 129 void webkit_init() 100 130 { … … 122 152 123 153 Pasteboard::generalPasteboard()->setHelper(new WebKit::PasteboardHelperGtk()); 154 155 SoupSession* session = webkit_get_default_session(); 156 SoupSessionFeature* authDialog = static_cast<SoupSessionFeature*>(g_object_new(WEBKIT_TYPE_SOUP_AUTH_DIALOG, NULL)); 157 g_signal_connect(authDialog, "current-toplevel", G_CALLBACK(currentToplevelCallback), NULL); 158 soup_session_add_feature(session, authDialog); 159 g_object_unref(authDialog); 124 160 } -
trunk/WebKit/gtk/webkit/webkitsoupauthdialog.c
r41427 r41428 1 1 /* 2 * Copyright (C) 2009 Igalia S.L. , Author: Xan Lopez <xlopez@igalia.com>2 * Copyright (C) 2009 Igalia S.L. 3 3 * 4 4 * This library is free software; you can redistribute it and/or … … 27 27 28 28 #include "webkitmarshal.h" 29 #include "webkit -soup-auth-dialog.h"29 #include "webkitsoupauthdialog.h" 30 30 31 31 static void webkit_soup_auth_dialog_session_feature_init(SoupSessionFeatureInterface* feature_interface, gpointer interface_data); … … 213 213 214 214 if (toplevel) 215 gtk_window_set_transient_for(window, toplevel);215 gtk_window_set_transient_for(window, GTK_WINDOW(toplevel)); 216 216 217 217 /* Build contents */ -
trunk/WebKit/gtk/webkit/webkitsoupauthdialog.h
r41427 r41428 1 1 /* 2 * Copyright (C) 2009 Igalia S.L. , Author: Xan Lopez <xlopez@igalia.com>2 * Copyright (C) 2009 Igalia S.L. 3 3 * 4 4 * This library is free software; you can redistribute it and/or … … 19 19 20 20 #include <gtk/gtk.h> 21 #include <libsoup/soup.h> 21 22 22 23 #ifndef WEBKIT_SOUP_AUTH_DIALOG_H
Note: See TracChangeset
for help on using the changeset viewer.