dont leave the focus indicator hanging around when dialogs are disabled

[chaz/openbox] / openbox / prop.c

diff --git a/openbox/prop.c b/openbox/prop.c
index 31e12eacf17a77cdbf914f5f6fb8662b776451d7..25495ef44cae6366f46c7f345145c6270a124c6e 100644 (file)
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    prop.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
@@ -140,11 +140,9 @@ void prop_startup()
     prop_atoms.net_wm_bottomright = 2;
     prop_atoms.net_wm_bottomleft = 3;
 
-    CREATE(kde_net_system_tray_windows, "_KDE_NET_SYSTEM_TRAY_WINDOWS");
-    CREATE(kde_net_wm_system_tray_window_for,
-          "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR");
-    CREATE(kde_net_wm_window_type_override,
-          "_KDE_NET_WM_WINDOW_TYPE_OVERRIDE");
+    CREATE(kde_net_wm_frame_strut, "_KDE_NET_WM_FRAME_STRUT");
+    CREATE(kde_wm_change_state, "_KDE_WM_CHANGE_STATE");
+    CREATE(kde_net_wm_window_type_override,"_KDE_NET_WM_WINDOW_TYPE_OVERRIDE");
 
     CREATE(kwm_win_icon, "KWM_WIN_ICON");
   
@@ -152,7 +150,7 @@ void prop_startup()
     CREATE(esetrootid, "ESETROOT_PMAP_ID");
 
     CREATE(openbox_pid, "_OPENBOX_PID");
-    CREATE(openbox_premax, "_OPENBOX_PREMAX");
+    CREATE(ob_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED");
 }
 
 #include <X11/Xutil.h>
@@ -291,12 +289,16 @@ gboolean prop_get_string_locale(Window win, Atom prop, char **ret)
 {
     char **list;
     int nstr;
+    char *s;
 
     if (get_stringlist(win, prop, &list, &nstr) && nstr) {
-        *ret = g_convert(list[0], strlen(list[0]), "UTF-8", "ISO-8859-1",
-                         NULL, NULL, NULL);
+        s = g_convert(list[0], strlen(list[0]), "UTF-8", "ISO-8859-1",
+                      NULL, NULL, NULL);
         XFreeStringList(list);
-        if (*ret) return TRUE;
+        if (s) {
+            *ret = s;
+            return TRUE;
+        }
     }
     return FALSE;
 }