add a cleanup callback to the prompt interface. when the prompt's callback returns...

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index c82e3b3ae7160d6a80c46c52d8e005b40c295372..00efd5ecea0565ccbe53d8a3fd48aa1f1f1ae2e3 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -125,7 +125,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);
@@ -778,7 +778,7 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             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);
     }