X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tools%2Fobxprop%2Fobxprop.c;h=83ff54a17ead35e76fb17fdc3e6b5459171339b7;hb=1e43632a3b6720611d1f4f081fd80c4f71464573;hp=44b33041a99e4e04858517e128989bb5a25398de;hpb=358056b102f633cb63ac7b9aa0cfdd25af77ddf3;p=chaz%2Fopenbox

diff --git a/tools/obxprop/obxprop.c b/tools/obxprop/obxprop.c
index 44b33041..83ff54a1 100644
--- a/tools/obxprop/obxprop.c
+++ b/tools/obxprop/obxprop.c
@@ -28,14 +28,15 @@ gint parse_hex(gchar *s) {
         if (*s >= '0' && *s <='9')
             add = *s-'0';
         else if (*s >= 'A' && *s <='F')
-            add = *s-'A';
+            add = *s-'A'+10;
         else if (*s >= 'a' && *s <='f')
-            add = *s-'a';
+            add = *s-'a'+10;
         else
             break;
 
         result *= 16;
         result += add;
+        ++s;
     }
     return result;
 }
@@ -97,9 +98,9 @@ static gboolean get_all(Display *d, Window win, Atom prop,
                 default:
                     g_assert_not_reached(); /* unhandled size */
                 }
-            *num = ret_items;
-            ret = TRUE;
         }
+        *num = ret_items;
+        ret = TRUE;
         XFree(xdata);
     }
     return ret;
@@ -253,7 +254,7 @@ void show_properties(Display *d, Window w, int argc, char **argv)
                     }
             }
             if (found)
-                g_print("%s(%s) = %s\n", name, type, val);
+                g_print("%s(%s) = %s\n", name, type, (val ? val : ""));
             g_free(val);
         }