X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=BrowserWindow.vala;h=8534056fba4dc9acb330187909e620ba3c89a240;hb=d8cca175d94fa8655b7590d32255ae7c29d20c82;hp=0e45d85fca356d8c1e2bec9f986ed315ef8b5069;hpb=f51373aad1f4584ed00e33a159b3cc6b29687a96;p=app.webkitpdf

diff --git a/BrowserWindow.vala b/BrowserWindow.vala
index 0e45d85..8534056 100644
--- a/BrowserWindow.vala
+++ b/BrowserWindow.vala
@@ -4,7 +4,7 @@ public class BrowserWindow : Object
 {
     public Gtk.Window el;
     private BrowserWindow  _this;
-
+    public string cookie_file;
     public static BrowserWindow singleton()
     {
         if (_BrowserWindow == null) {
@@ -32,56 +32,55 @@ public class BrowserWindow : Object
 
         //listeners
         this.el.destroy.connect( () => {
+        	   
             Gtk.main_quit();
         });
         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/");
-          }
-         
-         var filename="";
+        }
           
-         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);
-                    filename = file.get_path ();        
+                    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] );		              
+					     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);
@@ -108,21 +107,15 @@ public class BrowserWindow : Object
             cd--;
             print("timeout 25 seconds :%d", cd);
             if (cd < 1) {
-               print("calling printit - timed out");
-               _this.view.printit();
-               return false;			
+                print("calling printit - timed out");
+                _this.view.printit();
+               
+                return false;			
             }
             return true;
         
          });
         	
-        	try {
-        		 print("deleting cookie tmp file name: %s\n", filename);
-		   
-	      } catch (Error e) {
-		       stdout.printf ("Error: %s\n", e.message);
-	      }
-
         
         });
     }
@@ -259,6 +252,7 @@ public class BrowserWindow : Object
          }
         	  
          print("calling print in %d seconds\n", (int)webkitpdf.opt_delay);
+         
          if (webkitpdf.opt_target_pdf != null) {
             GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { 
                print("delay done URL: %s\n", this.el.uri);
@@ -324,6 +318,7 @@ public class BrowserWindow : Object
             pe.set_page_setup(psetup);
             pe.finished.connect( () => {
                print("print completed\n");
+                this.delete_cookiefile(); 
                 Gtk.main_quit();
             		
             });
@@ -353,6 +348,7 @@ public class BrowserWindow : Object
             */;
              pe.done.connect(() => {
                print("print completed\n");
+               this.delete_cookiefile(); 
                 Gtk.main_quit();
             		
             });
@@ -422,6 +418,18 @@ public class BrowserWindow : Object
             
             
         
+        }
+        
+        public void delete_cookiefile () {
+            print("deleting tmp file %s\n",_this.cookie_file);
+            File file = File.new_for_path (_this.cookie_file);
+	         try {
+	             if (file.query_exists () == true) {
+	             	 file.delete ();	             
+	             }
+	         } catch (Error e) {
+		          stdout.printf ("Error: %s\n", e.message);
+	         }
         }
     }