X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=BrowserWindow.vala;h=25a8a420b8548752a06b1a00f4db829cc53b3890;hb=844476985e1802ff6a09dc128c63f8b995f05ca4;hp=c79a60c393596b8c5b6f68a06e91a86504bd364f;hpb=4674e5ca44c5dd0de66b194b114b38b1957b7b4a;p=app.webkitpdf diff --git a/BrowserWindow.vala b/BrowserWindow.vala index c79a60c..25a8a42 100644 --- a/BrowserWindow.vala +++ b/BrowserWindow.vala @@ -4,7 +4,7 @@ public class BrowserWindow : Object { public Gtk.Window el; private BrowserWindow _this; - + private string cookie_file; public static BrowserWindow singleton() { if (_BrowserWindow == null) { @@ -64,21 +64,30 @@ public class BrowserWindow : Object #if GTK3 var context = WebKit.WebContext.get_default(); var cookie_manager = context.get_cookie_manager(); - cookie_manager.set_accept_policy(WebKit.CookieAcceptPolicy.ALWAYS); - string scheme = uri.get_scheme (); - try { - File file = File.new_for_path(GLib.Environment.get_user_cache_dir() + '/cookie.txt' ); - FileOutputStream ostream = file.replace (null, false, FileCreateFlags.NONE); - DataOutputStream dostream = new DataOutputStream (ostream); - dostream.put_string (uri.get_host() + "\tTRUE\t/\t2147483647\t" + cookies[0] + "\t" + cookies[1] ); - cookie_manager.set_persistent_storage(file.get_path(), WebKit.CookiePersistentStorage.TEXT); + cookie_manager.set_accept_policy(WebKit.CookieAcceptPolicy.NEVER); + string scheme = uri.get_scheme (); + var ssl = "FALSE"; + if (scheme=="https") { + ssl="TRUE"; + } + try { + FileIOStream iostream; + File file = File.new_tmp ("cookie-XXXXXX.txt", out iostream); + this.cookie_file = file.get_path (); + print("cookie tmp file name: %s\n", file.get_path ()); + + OutputStream ostream = iostream.output_stream; + DataOutputStream dostream = new DataOutputStream (ostream); + + dostream.put_string (uri.get_host() + "\tTRUE\t/\t"+ssl+"\t2147483647\t" + cookies[0] + "\t" + cookies[1] ); + cookie_manager.set_persistent_storage(file.get_path(), WebKit.CookiePersistentStorage.TEXT); } catch (Error e) { stdout.printf ("Error: %s\n", e.message); } #else var sess = WebKit.get_default_session(); var cookie_jar = new Soup.CookieJar(); - cookie_jar.set_accept_policy(Soup.CookieJarAcceptPolicy.ALWAYS); + cookie_jar.set_accept_policy(Soup.CookieJarAcceptPolicy.NEVER); cookie_jar.add_cookie(new Soup.Cookie (cookies[0], cookies[1], uri.get_host(), "/", -1)); sess.add_feature(cookie_jar); #endif @@ -99,6 +108,7 @@ public class BrowserWindow : Object if (cd < 1) { print("calling printit - timed out"); _this.view.printit(); + return false; } return true;