return o;
}
-static void prompt_cb(ObPrompt *p, gint result, gpointer data)
+static gboolean prompt_cb(ObPrompt *p, gint result, gpointer data)
{
- Options *o = data;
if (result) {
-#ifndef USE_SM
+#ifdef USE_SM
+ Options *o = data;
session_request_logout(o->silent);
#else
- g_message(_("The SessionLogout actions is not available since Openbox was built without session management support"));
+ /* TRANSLATORS: Don't translate the word "SessionLogout" as it's the
+ name of the action you write in rc.xml */
+ g_message(_("The SessionLogout action is not available since Openbox was built without session management support"));
#endif
}
- g_free(o);
+ return TRUE; /* call cleanup func */
+}
+
+static void prompt_cleanup(ObPrompt *p, gpointer data)
+{
+ g_free(data);
prompt_unref(p);
}
ObPrompt *p;
ObPromptAnswer answers[] = {
{ _("Cancel"), 0 },
- { _("Log out"), 1 }
+ { _("Log Out"), 1 }
};
o2 = g_memdup(o, sizeof(Options));
p = prompt_new(_("Are you sure you want to log out?"),
- answers, 2, 0, 0, prompt_cb, o2);
+ _("Log Out"),
+ answers, 2, 0, 0, prompt_cb, prompt_cleanup, o2);
prompt_show(p, NULL, FALSE);
}
else
- prompt_cb(NULL, 1, NULL);
+ prompt_cb(NULL, 1, o);
return FALSE;
}