From 265c50123eb9df0b6b9fbc3b605f493333b911c4 Mon Sep 17 00:00:00 2001
From: Brendan Taylor <whateley@gmail.com>
Date: Tue, 12 Jul 2011 22:18:46 +0000
Subject: fix tests

---
 src/type.h      | 21 +++++++++++++++++++--
 src/variables.c | 48 ++++++++++++++++++++----------------------------
 2 files changed, 39 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/type.h b/src/type.h
index 1709128..24fc97f 100644
--- a/src/type.h
+++ b/src/type.h
@@ -2,6 +2,23 @@
  * Uzbl Types
  */
 
-enum ptr_type {TYPE_INT = 1, TYPE_STR, TYPE_FLOAT,
-    TYPE_NAME, TYPE_FORMATTEDSTR // used by send_event
+enum ptr_type {
+    TYPE_INT = 1,
+    TYPE_STR,
+    TYPE_FLOAT,
+    TYPE_NAME,
+    TYPE_FORMATTEDSTR // used by send_event
 };
+
+typedef struct {
+    enum ptr_type type;
+    union {
+        int   *i;
+        float *f;
+        gchar **s;
+    } ptr;
+    int dump;
+    int writeable;
+    /*@null@*/ void (*func)(void);
+} uzbl_cmdprop;
+
diff --git a/src/variables.c b/src/variables.c
index 4a3706a..d69ac6c 100644
--- a/src/variables.c
+++ b/src/variables.c
@@ -6,18 +6,6 @@
 #include "util.h"
 #include "type.h"
 
-typedef struct {
-    enum ptr_type type;
-    union {
-        int *i;
-        float *f;
-        gchar **s;
-    } ptr;
-    int dump;
-    int writeable;
-    /*@null@*/ void (*func)(void);
-} uzbl_cmdprop;
-
 void
 send_set_var_event(const char *name, const uzbl_cmdprop *c) {
     /* check for the variable type */
@@ -180,14 +168,16 @@ uri_change_cb (WebKitWebView *web_view, GParamSpec param_spec) {
     g_object_get (web_view, "uri", &uzbl.state.uri, NULL);
     g_setenv("UZBL_URI", uzbl.state.uri, TRUE);
 
-    gdk_property_change(
-        gtk_widget_get_window (GTK_WIDGET (uzbl.gui.main_window)),
-        gdk_atom_intern_static_string("UZBL_URI"),
-        gdk_atom_intern_static_string("STRING"),
-        8,
-        GDK_PROP_MODE_REPLACE,
-        (unsigned char *)uzbl.state.uri,
-        strlen(uzbl.state.uri));
+    if(GTK_IS_WIDGET(uzbl.gui.main_window)) {
+        gdk_property_change(
+            gtk_widget_get_window (GTK_WIDGET (uzbl.gui.main_window)),
+            gdk_atom_intern_static_string("UZBL_URI"),
+            gdk_atom_intern_static_string("STRING"),
+            8,
+            GDK_PROP_MODE_REPLACE,
+            (unsigned char *)uzbl.state.uri,
+            strlen(uzbl.state.uri));
+    }
 }
 
 void
@@ -236,14 +226,16 @@ cmd_load_uri() {
         soup_uri_free(soup_uri);
     }
 
-    gdk_property_change(
-        gtk_widget_get_window (GTK_WIDGET (uzbl.gui.main_window)),
-        gdk_atom_intern_static_string("UZBL_URI"),
-        gdk_atom_intern_static_string("STRING"),
-        8,
-        GDK_PROP_MODE_REPLACE,
-        (unsigned char *)newuri,
-        strlen(newuri));
+    if(GTK_IS_WIDGET(uzbl.gui.main_window)) {
+        gdk_property_change(
+            gtk_widget_get_window (GTK_WIDGET (uzbl.gui.main_window)),
+            gdk_atom_intern_static_string("UZBL_URI"),
+            gdk_atom_intern_static_string("STRING"),
+            8,
+            GDK_PROP_MODE_REPLACE,
+            (unsigned char *)newuri,
+            strlen(newuri));
+    }
 
     webkit_web_view_load_uri (uzbl.gui.web_view, newuri);
     g_free (newuri);
-- 
cgit v1.2.3