← Back to branch summary

~ubuntu-branches/debian/sid/openbox/sid

« back to all changes in this revision

Viewing changes to openbox/actions/exit.c

  • Committer: Bazaar Package Importer
  • Author(s): Nico Golde
  • Date: 2010-04-23 16:26:22 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20100423162622-glbe2jvey10sdiff
Tags: 3.4.11.1-1
http://bugs.debian.org/570441
http://bugs.debian.org/566685
http://bugs.debian.org/564292
* New upstream release (Closes: #570441).
  - removed wrong use of test command in openbox-gnome-session leading
    to misbehaviour with gnome sessions (Closes: #566685).
* Add obxprop to the installed files (Closes: #564292).
* Removed 04_escape_session_names.dpatch/03_nextprev-xinerama.dpatch
  completely from debian/, wasn't used anymore anyway.
* Bump standards version, no changes needed.
* Update install files for libobparser/libobrender and links in openbox-dev
  as the shared library minor version changed.
* Update install paths of openbox-dev files to reflect upstream changes
  and install all header files rather than pick them manually.
* Switch to regular paragraphs from asterisks in NEWS file.
* Change short description of openbox-dev to differ from openbox.
* Switch to dpkg-source 3.0 (quilt) format
  - switch from dpatch to quilt patches.
* Adding ${misc:Depends} to openbox-dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openbox/actions/exit.c
10
10
 
11
11
static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
12
12
static gboolean run_func(ObActionsData *data, gpointer options);
 
13
static void free_func(gpointer options);
13
14
 
14
15
void action_exit_startup(void)
15
16
{
16
 
    actions_register("Exit", setup_func, NULL, run_func, NULL, NULL);
17
 
    actions_register("SessionLogout", setup_func, NULL, run_func, NULL, NULL);
 
17
    actions_register("Exit", setup_func, free_func, run_func, NULL, NULL);
 
18
    actions_register("SessionLogout", setup_func, free_func, run_func, NULL, NULL);
18
19
}
19
20
 
20
21
static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
31
32
    return o;
32
33
}
33
34
 
 
35
static void free_func(gpointer options)
 
36
{
 
37
    if (options)
 
38
        g_free(options);
 
39
}
 
40
 
34
41
static void do_exit(void)
35
42
{
36
43
    if (session_connected())