Fix #7287 - upgrade to newer webkit
[app.webkitpdf] / BrowserWindow.vala
index 55f24b6..d92c1f9 100644 (file)
@@ -114,8 +114,8 @@ public class BrowserWindow : Object
 
 
             // my vars (def)
-        public string cookie_file;
         public bool print_started;
+        public string cookie_file;
         public int load_try;
 
         // ctor
@@ -136,6 +136,9 @@ public class BrowserWindow : Object
             {
                        this.load_try = 0;
             
+            
+            
+            
             #if GTK3
                         this.el.load_changed.connect( (ev ) => {
                                if (ev != WebKit.LoadEvent.FINISHED) {
@@ -222,13 +225,13 @@ public class BrowserWindow : Object
                        if (webkitpdf.opt_cookies != null) {
                                print("setting cookie %s\n",webkitpdf.opt_cookies);
             
-                               var uri = new Soup.URI (webkitpdf.opt_url);
+                               var uri =   GLib.Uri.parse (webkitpdf.opt_url, GLib.UriFlags.NONE);
                                
                                string[] cookies = webkitpdf.opt_cookies.split ("=", 2);
             
                                if(cookies.length > 1 ) {
-                                                    
-                               #if GTK3        
+                       
+            #if GTK3   
                                        var context = WebKit.WebContext.get_default();           
                                        var cookie_manager = context.get_cookie_manager();
                                        cookie_manager.set_accept_policy(WebKit.CookieAcceptPolicy.NEVER);
@@ -247,7 +250,7 @@ public class BrowserWindow : Object
                                        } catch (Error e) {
                                            stdout.printf ("Error: %s\n", e.message);
                                        }               
-                               #else
+            #else
                                        var cookie_jar = new Soup.CookieJar();          
                                        var cookie = new Soup.Cookie (cookies[0], cookies[1], uri.get_host(), "/", -1);
                                        if(uri.get_scheme() =="https") {
@@ -256,7 +259,7 @@ public class BrowserWindow : Object
                                        cookie_jar.set_accept_policy(Soup.CookieJarAcceptPolicy.NEVER);                          
                                        cookie_jar.add_cookie(cookie);                      
                                        WebKit.get_default_session().add_feature(cookie_jar);
-                               #endif
+            #endif
                                                                                                            
                                }
             
@@ -265,98 +268,6 @@ public class BrowserWindow : Object
         }
 
         // user defined functions
-        public void printit () {
-           print("load_finsihed\n");
-           
-           if (this.print_started) {
-               print("load_finsihed - already printing..%d %s\n", this.load_try, this.el.uri);
-           
-              
-              
-              
-              return;
-          }
-           
-         
-            this.print_started = true; // flag to stop double call.
-            
-            
-               // inject any javascript if needed..
-               if (webkitpdf.opt_inject_js != null) {
-               
-                       print("injecting javascript files \n");
-                       foreach(var inject_js in  webkitpdf.opt_inject_js) {
-                       print("inject? %s\n", inject_js);
-                               string str;
-                               try {
-                                       FileUtils.get_contents( inject_js, out str);
-                               } catch(FileError e) {
-                                       print("Failed to inject %s\n",  inject_js);
-                                       continue;
-                               }
-        #if GTK3
-                               GLib.MainLoop mainloop = new GLib.MainLoop();
-                               this.el.run_javascript.begin(str, null, (obj,res) => {
-                                       mainloop.quit();
-                               });
-                               mainloop.run();
-                               
-        #else                  
-                               this.el.execute_script(str);
-        #endif
-                       }
-               }
-                 
-               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);
-                       
-                                
-                               this.printpdf();
-                                return false;
-                       }, GLib.Priority.DEFAULT);
-                       return;
-               }
-                       
-        
-        #if GTK3
-               GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { 
-                               print("delay done URL: %s\n", this.el.uri);
-                               this.printpng();        
-                               return false;
-                       }, GLib.Priority.DEFAULT);
-                       return;
-        #else
-                       
-            GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { 
-           
-                       
-                       // ----------------- JPEG 
-                       // resize the window...
-                       // window.document.documentElement.scrollHeight
-                       var scroll_height = (int) _this.view.el.get_dom_document().document_element.scroll_height;
-                       print("Scroll height %d\n", scroll_height);
-                       if (scroll_height> 1024 || webkitpdf.opt_width > 0  || webkitpdf.opt_height > 0  ) {
-                               var w = webkitpdf.opt_width > 0 ?  webkitpdf.opt_width  : 1200;
-                               var h = int.min(scroll_height, 6000);
-                               _this.scrolled_window.el.set_size_request( w, h); 
-                               _this.el.resize (w+50, h+50);
-                               print("Resize to %d, %d\n", w,h);
-                           GLib.Timeout.add_seconds(webkitpdf.opt_delay > 0 ? webkitpdf.opt_delay : 1 , () => { 
-                                       this.printpng();
-                                       return false;
-                                 }, GLib.Priority.DEFAULT);
-                           return false;
-                       }
-                       this.printpng();                
-                       return false;
-                 }, GLib.Priority.DEFAULT);
-        
-        
-        #endif    
-            
-        }
         public bool printpdf () {
         
         
@@ -505,6 +416,98 @@ public class BrowserWindow : Object
                 stdout.printf ("Error: %s\n", e.message);
             }
         
+        }
+        public void printit () {
+           print("load_finsihed\n");
+           
+           if (this.print_started) {
+               print("load_finsihed - already printing..%d %s\n", this.load_try, this.el.uri);
+           
+              
+              
+              
+              return;
+          }
+           
+         
+            this.print_started = true; // flag to stop double call.
+            
+            
+               // inject any javascript if needed..
+               if (webkitpdf.opt_inject_js != null) {
+               
+                       print("injecting javascript files \n");
+                       foreach(var inject_js in  webkitpdf.opt_inject_js) {
+                       print("inject? %s\n", inject_js);
+                               string str;
+                               try {
+                                       FileUtils.get_contents( inject_js, out str);
+                               } catch(FileError e) {
+                                       print("Failed to inject %s\n",  inject_js);
+                                       continue;
+                               }
+        #if GTK3
+                               GLib.MainLoop mainloop = new GLib.MainLoop();
+                               this.el.run_javascript.begin(str, null, (obj,res) => {
+                                       mainloop.quit();
+                               });
+                               mainloop.run();
+                               
+        #else                  
+                               this.el.execute_script(str);
+        #endif
+                       }
+               }
+                 
+               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);
+                       
+                                
+                               this.printpdf();
+                                return false;
+                       }, GLib.Priority.DEFAULT);
+                       return;
+               }
+                       
+        
+        #if GTK3
+               GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { 
+                               print("delay done URL: %s\n", this.el.uri);
+                               this.printpng();        
+                               return false;
+                       }, GLib.Priority.DEFAULT);
+                       return;
+        #else
+                       
+            GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { 
+           
+                       
+                       // ----------------- JPEG 
+                       // resize the window...
+                       // window.document.documentElement.scrollHeight
+                       var scroll_height = (int) _this.view.el.get_dom_document().document_element.scroll_height;
+                       print("Scroll height %d\n", scroll_height);
+                       if (scroll_height> 1024 || webkitpdf.opt_width > 0  || webkitpdf.opt_height > 0  ) {
+                               var w = webkitpdf.opt_width > 0 ?  webkitpdf.opt_width  : 1200;
+                               var h = int.min(scroll_height, 6000);
+                               _this.scrolled_window.el.set_size_request( w, h); 
+                               _this.el.resize (w+50, h+50);
+                               print("Resize to %d, %d\n", w,h);
+                           GLib.Timeout.add_seconds(webkitpdf.opt_delay > 0 ? webkitpdf.opt_delay : 1 , () => { 
+                                       this.printpng();
+                                       return false;
+                                 }, GLib.Priority.DEFAULT);
+                           return false;
+                       }
+                       this.printpng();                
+                       return false;
+                 }, GLib.Priority.DEFAULT);
+        
+        
+        #endif    
+            
         }
     }