domains/chinamoneynetwork.com.js

[app.webkitpdf] / webkitpdf.vala

diff --git a/webkitpdf.vala b/webkitpdf.vala
index 09836b2..ace8a65 100644 (file)
--- a/webkitpdf.vala
+++ b/webkitpdf.vala
@@ -2,6 +2,11 @@
 /*
  sudo valac   --vapidir=. --thread  webkitpdf.vala  BrowserWindow.vala  --vapidir=./vapi \
     --pkg glib-2.0 --pkg webkit-1.0 --pkg gtk+-2.0 -o /usr/bin/webkitpdf --target-glib=2.32 
+  
+ sudo valac -D GTK3  --vapidir=. --thread  webkitpdf.vala  BrowserWindow.vala  --vapidir=./vapi \
+    --pkg glib-2.0 --pkg webkit2gtk-4.0 --pkg gtk+-3.0 -o /usr/bin/webkitpdf2 --target-glib=2.32 
+  
+  
     
 */
 public class webkitpdf {
@@ -28,34 +33,24 @@ public class webkitpdf {
     public static int main(string[] args) 
     {
         Gtk.init(ref args);
-                
+               
+               
+#if GTK3               
+       // this is a horrific hack from https://bugs.webkit.org/show_bug.cgi?id=128674
+               Environment.unset_variable("GNOME_DESKTOP_SESSION_ID");
+               Environment.unset_variable("DESKTOP_SESSION");          
+               // it should now fallb ack to http prox!?
+               
+               
+#else
                unowned string proxy = Environment.get_variable ("http_proxy");
                if (proxy != null && proxy.length > 0) {
                        var sess = WebKit.get_default_session();
                        sess.proxy_uri = new Soup.URI(proxy);
                }
-               
+#endif         
         var opt_context = new OptionContext ("webkitpdf");
        
-        
-        stdout.printf ( """Width: %d
-        Height: %d
-        URL: %s
-        Delay: %d
-        png: %s
-        inject: %s
-        PDF: %s
-        """,
-          opt_width,
-          opt_height,
-          opt_url,
-          opt_delay,
-          opt_target_png == null ? "--empty--" : opt_target_png,
-          opt_inject_js == null ? "--empty--" : opt_inject_js,
-          opt_target_pdf == null ? "--empty--" : opt_target_pdf
-        
-        );
-       
                
                try {
                        opt_context.set_help_enabled (true);
@@ -69,6 +64,25 @@ public class webkitpdf {
                 throw new OptionError.BAD_VALUE("missing pdf or png filename");
             }
             
+        
+            stdout.printf ( """Width: %d
+            Height: %d
+            URL: %s
+            Delay: %d
+            png: %s
+            inject: %s
+            PDF: %s
+            """,
+              opt_width,
+              opt_height,
+              opt_url,
+              (int) opt_delay,
+              opt_target_png == null ? "--empty--" : opt_target_png,
+              opt_inject_js.length < 1? "--empty--" : string.joinv(", ", opt_inject_js),
+              opt_target_pdf == null ? "--empty--" : opt_target_pdf
+            
+            );
+            
 
                } catch (OptionError e) {
                        stdout.printf ("error: %s\n", e.message);