BrowserWindow.vala

[app.webkitpdf] / BrowserWindow.vala

diff --git a/BrowserWindow.vala b/BrowserWindow.vala
index 6c54f19..8534056 100644 (file)
--- a/BrowserWindow.vala
+++ b/BrowserWindow.vala
@@ -37,40 +37,40 @@ public class BrowserWindow : Object
         });
         this.el.show.connect( () => {
                
-         print("resizing window\n");
-         var w = webkitpdf.opt_width > 0 ?  webkitpdf.opt_width  : 1200;
-         var h = webkitpdf.opt_height > 0 ?  webkitpdf.opt_height  :  500;
+        print("resizing window\n");
+        var w = webkitpdf.opt_width > 0 ?  webkitpdf.opt_width  : 1200;
+        var h = webkitpdf.opt_height > 0 ?  webkitpdf.opt_height  :  500;
                                
                
-         this.el.resize(w,h);
+        this.el.resize(w,h);
         
-         // we have to do silly stuff with blogspot!!?!?
-         var blog = webkitpdf.opt_url;
+        // we have to do silly stuff with blogspot!!?!?
+        var blog = webkitpdf.opt_url;
         
         
-          /* Do not redirect if the domain is .com already */
-          if (/\.blogspot\.com/.match(blog)) {
+        /* Do not redirect if the domain is .com already */
+        if (/\.blogspot\.com/.match(blog)) {
             var r =  new Regex ("\\.blogspot\\..*?/");
             blog = r.replace(blog, blog.length, 0, ".blogspot.com/ncr/");
-          }
+        }
           
-         if(webkitpdf.opt_cookies != null) {
+        if(webkitpdf.opt_cookies != null) {
             print("setting cookie %s\n",webkitpdf.opt_cookies);
                
             var uri = new Soup.URI (blog);
                            
             string[] cookies = webkitpdf.opt_cookies.split ("=", 2);
 
-            if(cookies.length >=2 ) {             
+            if(cookies.length > 1 ) {             
 #if GTK3               
                 var context = WebKit.WebContext.get_default();          
                 var cookie_manager = context.get_cookie_manager();
                 cookie_manager.set_accept_policy(WebKit.CookieAcceptPolicy.NEVER);
                 string scheme = uri.get_scheme ();
-                var ssl = "FALSE";
-                if (scheme=="https") {
-                    ssl="TRUE";
-                }                
+                //var ssl = "FALSE";
+                //if (scheme=="https") {
+                //    ssl="TRUE";
+                //}                
                 try {            
                     FileIOStream iostream;                           
                     File file = File.new_tmp ("cookie-XXXXXX.txt", out iostream);
@@ -79,8 +79,8 @@ public class BrowserWindow : Object
                 
                              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] );                            
+                                            dostream.put_string (printf("%s\tTRUE\t/\t%s\t2147483647\t%s\t%s",uri.get_host(),scheme == " https" ? "FALSE" : "TRUE",cookies[0],cookies[1));
+                             //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);
@@ -107,10 +107,10 @@ public class BrowserWindow : Object
             cd--;
             print("timeout 25 seconds :%d", cd);
             if (cd < 1) {
-               print("calling printit - timed out");
-               _this.view.printit();
+                print("calling printit - timed out");
+                _this.view.printit();
                
-               return false;                   
+                return false;                  
             }
             return true;