Merge branch 'backport' into work

[dana/openbox.git] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index b5b4ef4..109b215 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -124,7 +124,7 @@ void config_app_settings_copy_non_defaults(const ObAppSettings *src,
     g_assert(src != NULL);
     g_assert(dst != NULL);
 
-    copy_if(type, -1);
+    copy_if(type, (ObClientType)-1);
     copy_if(decor, -1);
     copy_if(shade, -1);
     copy_if(focus, -1);
@@ -764,7 +764,7 @@ static void parse_dock(xmlNodePtr node, gpointer d)
             config_dock_app_move_button = b;
             config_dock_app_move_modifiers = s;
         } else {
-            g_message(_("Invalid button '%s' specified in config file"), str);
+            g_message(_("Invalid button \"%s\" specified in config file"), str);
         }
         g_free(str);
     }