r4275@bucket (orig r265): kcr | 2008-01-21 02:57:32 -0500

[1ts-debian.git] / zephyr / zwgc / X_driver.c

diff --git a/zephyr/zwgc/X_driver.c b/zephyr/zwgc/X_driver.c
index 2577966595fd25520f669c07fde76a9e3f84dc20..e969eb742b2354e28d4d83f91f1fa875a0a3bc99 100644 (file)
--- a/zephyr/zwgc/X_driver.c
+++ b/zephyr/zwgc/X_driver.c
@@ -38,6 +38,7 @@ static const char rcsid_X_driver_c[] = "$Id$";
 #include "X_gram.h"
 #include "xselect.h"
 #include "unsigned_long_dictionary.h"
+#include "zephyr.h"
 
 char *app_instance;
 
@@ -294,7 +295,8 @@ open_display_and_load_resources(int *pargc,
     /*
      * Get XENVIRONMENT resources, if they exist, and merge
      */
-    if (filename = getenv("XENVIRONMENT"))
+    filename = getenv("XENVIRONMENT");
+    if (filename)
     {
        temp_db3 = XrmGetFileDatabase(filename);
        XrmMergeDatabases(temp_db3, &temp_db1);
@@ -354,9 +356,11 @@ X_driver_init(char *drivername,
     /*
      * For now, set some useful variables using resources:
      */
-    if (sync=get_bool_resource("synchronous", "Synchronous", 0))
-      XSynchronize(dpy,sync);
-    if (temp = get_string_resource("geometry", "Geometry"))
+    sync = get_bool_resource("synchronous", "Synchronous", 0);
+    if (sync)
+      XSynchronize(dpy, sync);
+    temp = get_string_resource("geometry", "Geometry");
+    if (temp)
       var_set_variable("default_X_geometry", temp);
 
     temp=strrchr(argv[0],'/');