diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2008-02-28 06:20:50 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2008-02-28 06:20:50 +0100 |
| commit | 163950b23bf796a39870044417ca54d667b6b470 (patch) | |
| tree | d6b2a668aa738a3dd0a6e1f38524211e2b45d3b8 | |
| parent | f857b0eb99471c9123d6e641afafeab5f47700e2 (diff) | |
| parent | 573bbb08a63d2f1c1cb873a0746613cfb6fdb560 (diff) | |
Merge branch 'backport' into work
Conflicts:
Makefile.am
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | openbox/actions/execute.c | 12 | ||||
| -rw-r--r-- | openbox/actions/exit.c | 4 |
3 files changed, 10 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index ec6157b2..6e8cb232 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,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 = \ @@ -417,8 +417,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 @@ -457,6 +459,7 @@ nodist_xsessions_DATA = \ data/xsession/openbox-kde.desktop dist_noinst_DATA = \ + data/autostart.sh.in \ data/rc.xsd \ data/menu.xsd \ data/xsession/openbox.desktop.in \ diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c index fa66a484..fd9625c5 100644 --- a/openbox/actions/execute.c +++ b/openbox/actions/execute.c @@ -76,6 +76,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); } } @@ -94,20 +95,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 */ diff --git a/openbox/actions/exit.c b/openbox/actions/exit.c index f5af8a12..58a1dcb1 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?"), |