X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=BrowserWindow.vala;h=7cfbdcd5891c05a32bcb03846e670746f6e45a27;hb=0e5193e6109c8f251dcb4b9f0e9ee07ff6dd664e;hp=28a1d5a184b902009933b3c74e40f8d50de33b1e;hpb=d383888316927688a6899bd87b1287ec0e86e378;p=app.webkitpdf

diff --git a/BrowserWindow.vala b/BrowserWindow.vala
index 28a1d5a..7cfbdcd 100644
--- a/BrowserWindow.vala
+++ b/BrowserWindow.vala
@@ -37,40 +37,38 @@ 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 GTK3		
+            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";
-                }                
+                
                 try {            
                     FileIOStream iostream;		              
                     File file = File.new_tmp ("cookie-XXXXXX.txt", out iostream);
@@ -79,19 +77,19 @@ 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 ("%s\tTRUE\t/\t%s\t2147483647\t%s\t%s".printf(uri.get_host(),scheme == "http" ? "FALSE" : "TRUE",cookies[0],cookies[1]));		              
 		              cookie_manager.set_persistent_storage(file.get_path(), WebKit.CookiePersistentStorage.TEXT);		              
 	             } catch (Error e) {
 		              stdout.printf ("Error: %s\n", e.message);
 	             } 		
-#else
+            #else
                 var sess = WebKit.get_default_session();
                 var cookie_jar = new Soup.CookieJar();			    
                 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	                			    			    
+            #endif
+            	                			    			    
             }
             
 
@@ -107,10 +105,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;
         
@@ -176,6 +174,7 @@ public class BrowserWindow : Object
             // set gobject values
 
             // init method
+            
 
             {
                   this.load_try = 0;
@@ -318,7 +317,7 @@ public class BrowserWindow : Object
             pe.set_page_setup(psetup);
             pe.finished.connect( () => {
                print("print completed\n");
-               
+                this.delete_cookiefile(); 
                 Gtk.main_quit();
             		
             });
@@ -348,6 +347,7 @@ public class BrowserWindow : Object
             */;
              pe.done.connect(() => {
                print("print completed\n");
+               this.delete_cookiefile(); 
                 Gtk.main_quit();
             		
             });
@@ -420,7 +420,19 @@ public class BrowserWindow : Object
         }
         
         public void delete_cookiefile () {
-            print("deleting tmp file %s\n",_this.cookie_file);
+        	   // _this -> owner BrowserWindow
+        	   // cookie_file is created by BrowserWindow
+        	   if(_this.cookie_file.length >0 ){
+        	       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);
+	             }
+        	   }            
         }
     }