From 92f23264c78f759052fd6d1376961382c55699e4 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 27 Feb 2008 22:14:11 -0500 Subject: change the yes/no buttons to Exit/Cancel for the exit prompt --- openbox/actions/exit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openbox/actions/exit.c b/openbox/actions/exit.c index 8430729b..19b78e9c 100644 --- a/openbox/actions/exit.c +++ b/openbox/actions/exit.c @@ -43,8 +43,8 @@ static gboolean run_func(ObActionsData *data, gpointer options) if (o->prompt) { ObPrompt *p; ObPromptAnswer answers[] = { - { _("No"), 0 }, - { _("Yes"), 1 } + { _("Cancel"), 0 }, + { _("Exit"), 1 } }; p = prompt_new(_("Are you sure you want to exit Openbox?"), -- cgit v1.2.3 From 1018b836c4d7e94efa8f74b4a34e1a93b9b51a20 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 27 Feb 2008 22:19:59 -0500 Subject: clean up the execute action code, and free the prompt option string --- openbox/actions/execute.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c index 4197109f..eb1b461d 100644 --- a/openbox/actions/execute.c +++ b/openbox/actions/execute.c @@ -79,6 +79,7 @@ static void free_func(gpointer options) g_free(o->sn_name); g_free(o->sn_icon); g_free(o->sn_wmclass); + g_free(o->prompt); g_free(o); } } @@ -97,20 +98,13 @@ static Options* dup_options(Options *in) static gboolean run_func(ObActionsData *data, gpointer options); -static void prompt_cb(ObPrompt *p, gint result, gpointer data) +static void prompt_cb(ObPrompt *p, gint result, gpointer options) { - Options *options = data; - if (result) run_func(NULL, options); prompt_unref(p); - - g_free(options->cmd); - g_free(options->sn_name); - g_free(options->sn_icon); - g_free(options->sn_wmclass); - g_free(options); + free_func(options); } /* Always return FALSE because its not interactive */ -- cgit v1.2.3 From 40c014faf10021b75d30c52d8ccdd3b93b2da4d4 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 27 Feb 2008 22:44:22 -0500 Subject: include the xdg-autostart script in the dist targz --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index fa8f65d3..fe704cb5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,7 +32,7 @@ bin_PROGRAMS = \ openbox/openbox \ tools/gnome-panel-control/gnome-panel-control -secretbin_SCRIPTS = \ +dist_secretbin_SCRIPTS = \ tools/xdg-autostart/xdg-autostart nodist_bin_SCRIPTS = \ -- cgit v1.2.3 From 573bbb08a63d2f1c1cb873a0746613cfb6fdb560 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 27 Feb 2008 22:46:44 -0500 Subject: add the autostart.sh.in to the dist targz instead of the autostart.sh --- Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index fe704cb5..0b7e5878 100644 --- a/Makefile.am +++ b/Makefile.am @@ -405,8 +405,10 @@ nodist_pkgconfig_DATA = \ dist_pixmap_DATA = \ data/openbox.png +nodist_rc_DATA = \ + data/autostart.sh + dist_rc_DATA = \ - data/autostart.sh \ data/rc.xml \ data/menu.xml @@ -446,6 +448,7 @@ nodist_xsessions_DATA = \ dist_noinst_DATA = \ version.h.in \ + data/autostart.sh.in \ data/rc.xsd \ data/menu.xsd \ data/xsession/openbox.desktop.in \ -- cgit v1.2.3