tell what signal is going to be sent to the client when killing through the dialog

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 44e027f899a1ab9b4eaf2297feb3c955e8fe9ebc..c8c6c93b513ca130dc127eb6bec0ed19cd65999a 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -3408,9 +3408,15 @@ static void client_prompt_kill(ObClient *self)
             { _("Yes"), OB_KILL_RESULT_YES }
         };
         gchar *m;
+        const gchar *sig;
+
+        if (self->kill_level == 0)
+            sig = "terminate";
+        else
+            sig = "kill";
 
         m = g_strdup_printf
-            (_("The window \"%s\" does not seem to be responding.  Do you want to force it to exit?"), self->original_title);
+            (_("The window \"%s\" does not seem to be responding.  Do you want to force it to exit by sending the %s signal?"), self->original_title, sig);
 
         self->kill_prompt = prompt_new(m, answers,
                                        sizeof(answers)/sizeof(answers[0]),
@@ -3425,6 +3431,9 @@ static void client_prompt_kill(ObClient *self)
 
 void client_kill(ObClient *self)
 {
+    /* don't kill our own windows */
+    if (self->prompt) return;
+
     if (!self->client_machine && self->pid) {
         /* running on the local host */
         if (self->kill_level == 0) {