X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=9cf07a37ac12b0b1af9e6146d89280ed30903c41;hb=80a6f06c0a3d6de2c7d94066c5a9764b97a600af;hp=c8ffe0c67ca66b178466c656a4e19a05c91f3428;hpb=1de9c1901cf7e95ace3f934f97ceff7cf77801a9;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index c8ffe0c6..9cf07a37 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    config.c for the Openbox window manager
-   Copyright (c) 2004        Mikael Magnusson
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -44,7 +44,7 @@ gboolean config_title_number;
 
 gint    config_desktops_num;
 GSList *config_desktops_names;
-gint    config_screen_firstdesk;
+guint    config_screen_firstdesk;
 
 gboolean config_resize_redraw;
 gboolean config_resize_four_corners;
@@ -133,6 +133,7 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc,
                 settings->name = name;
             else
                 settings->name = NULL;
+
             if (class_set)
                 settings->class = class;
             else
@@ -432,7 +433,7 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         config_title_layout = parse_string(doc, n);
     }
     if ((n = parse_find_node("titleNumber", node)))
-        config_theme_titlenumber = parse_bool(doc, n);
+        config_title_number = parse_bool(doc, n);
     if ((n = parse_find_node("keepBorder", node)))
         config_theme_keepborder = parse_bool(doc, n);
     if ((n = parse_find_node("hideDisabled", node)))
@@ -454,7 +455,7 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
     if ((n = parse_find_node("firstdesk", node))) {
         gint d = parse_int(doc, n);
         if (d > 0)
-            config_screen_firstdesk = d;
+            config_screen_firstdesk = (unsigned) d;
     }
     if ((n = parse_find_node("names", node))) {
         GSList *it;
@@ -717,7 +718,7 @@ static void bind_default_mouse()
             uact = OB_USER_ACTION_MOUSE_DOUBLE_CLICK; break;
         case OB_MOUSE_ACTION_MOTION:
             uact = OB_USER_ACTION_MOUSE_MOTION; break;
-        case OB_NUM_MOUSE_ACTIONS:
+        default:
             g_assert_not_reached();
         }
         mouse_bind(it->button, it->context, it->mact,