*.val

[app.webkitpdf] / BrowserWindow.vala

diff --git a/BrowserWindow.vala b/BrowserWindow.vala
index 05634b8..68c2cca 100644 (file)
--- a/BrowserWindow.vala
+++ b/BrowserWindow.vala
@@ -42,14 +42,32 @@ public class BrowserWindow : Object
                                
                
                this.el.resize(w,h);
-               print("loading url\n");
-               this.view.el.load_uri(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)) {
+                       var r =  new Regex ("\\.blogspot\\..*?/");
+                       blog = r.replace(blog, blog.length, 0, ".blogspot.com/ncr/");
+          }
+               
+               print("loading url %s\n",blog); 
+               this.view.el.load_uri(blog);
                
                // if we have not finished in 25 seconds
                // call printit...
-                 GLib.Timeout.add_seconds(25, () => { 
+               var cd = 25;
+                 GLib.Timeout.add_seconds(1, () => { 
+                       cd--;
+                       print("timeout 25 seconds :%d", cd);
+                       if (cd < 1) {
+                               print("calling printit - timed out");
                                _this.view.printit();
-                               return true;
+                               return true;                    
+                       }
+                       return false;
+        
                });
                
         
@@ -96,6 +114,7 @@ public class BrowserWindow : Object
 
             // my vars (def)
         public bool print_started;
+        public int load_try;
 
         // ctor
         public Xcls_view(BrowserWindow _owner )
@@ -106,42 +125,41 @@ public class BrowserWindow : Object
 
             // my vars (dec)
             this.print_started = false;
+            this.load_try = 0;
 
             // set gobject values
 
             // init method
 
             {
+                       this.load_try = 0;
+            
             #if GTK3
                         this.el.load_changed.connect( (ev ) => {
-                                       if (ev == WebKit.LoadEvent.FINISHED) {
-                                  this.printit(); 
-                               }
+                               if (ev != WebKit.LoadEvent.FINISHED) {
+                                       return;  
+                                 }
+                                 
+                           this.printit(); 
+                         
                          
                         });
             
             #else
              //listeners
-                        this.el.resource_request_starting.connect( (p0, webres, netreq ) => {
-                          print("resource req. started %s\n", netreq.uri);
+                      //  this.el.resource_request_starting.connect( (p0, webres, netreq ) => {
+                        //  print("resource req. started %s\n", netreq.uri);
                              
-                        });
+                      //  });
                         
                         this.el.load_finished.connect( ( ) => {
-                                        
+                               
+                               
                                this.printit(); 
                          
                         });
-                        
             #endif
             }
-
-            //listeners
-            this.el.load_finished.connect( ( ) => {
-                        
-                   this.printit(); 
-             
-            });
         }
 
         // user defined functions
@@ -149,10 +167,15 @@ public class BrowserWindow : Object
            print("load_finsihed\n");
            
            if (this.print_started) {
-              print("load_finsihed - already printing..\n");
+               print("load_finsihed - already printing..%d %s\n", this.load_try, this.el.uri);
+           
+              
+              
+              
               return;
           }
            
+         
             this.print_started = true; // flag to stop double call.
             
             
@@ -181,13 +204,13 @@ public class BrowserWindow : Object
         #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);
@@ -293,7 +316,6 @@ public class BrowserWindow : Object
                    
                    
         
-                       this.el.print(pe);
         
         
                    try {
@@ -317,7 +339,9 @@ public class BrowserWindow : Object
         // what size is the documet.
         
              print("making screenshot\n");
-             
+        #if GTK3
+        
+        #else     
             // fix vapi - get_snapshot add '?' to all null.
             var pixmap = _this.view.el.get_snapshot( null );
         
@@ -341,7 +365,7 @@ public class BrowserWindow : Object
             //});
             Gtk.main_quit();
              
-           
+        #endif