diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-10-20 00:37:16 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-10-20 00:37:16 +0800 |
| commit | e8ca3cd4b5d6c2046d31dba135fc9bfe4261f079 (patch) | |
| tree | c54a9b188acacb45ce008e584e446872e6ff1556 /x11 | |
| parent | 46c32e3408b4fd1ae8eee02c2ca1672b3b1b2ab8 (diff) | |
| download | marcuscom-ports-e8ca3cd4b5d6c2046d31dba135fc9bfe4261f079.tar marcuscom-ports-e8ca3cd4b5d6c2046d31dba135fc9bfe4261f079.tar.gz marcuscom-ports-e8ca3cd4b5d6c2046d31dba135fc9bfe4261f079.tar.bz2 marcuscom-ports-e8ca3cd4b5d6c2046d31dba135fc9bfe4261f079.tar.lz marcuscom-ports-e8ca3cd4b5d6c2046d31dba135fc9bfe4261f079.tar.xz marcuscom-ports-e8ca3cd4b5d6c2046d31dba135fc9bfe4261f079.tar.zst marcuscom-ports-e8ca3cd4b5d6c2046d31dba135fc9bfe4261f079.zip | |
Fix the build:
--------------------
* tools/gnome-session-save.c: (main): rename kill variable to
kill_session to avoid conflict with kill(2). Fixes: #554202.
--------------------
Obtained from: its SVN
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11685 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-session/files/patch-tools_gnome-session-save.c | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/x11/gnome-session/files/patch-tools_gnome-session-save.c b/x11/gnome-session/files/patch-tools_gnome-session-save.c new file mode 100644 index 000000000..764fb3119 --- /dev/null +++ b/x11/gnome-session/files/patch-tools_gnome-session-save.c @@ -0,0 +1,38 @@ +--- tools/gnome-session-save.c 2008/09/01 16:49:20 5029 ++++ tools/gnome-session-save.c 2008/09/29 15:16:06 5128 +@@ -45,7 +45,7 @@ + + /* True if killing. This is deprecated, but we keep it for compatibility + * reasons. */ +-static gboolean kill = FALSE; ++static gboolean kill_session = FALSE; + + /* The real options that should be used now. They are not ambiguous. */ + static gboolean logout = FALSE; +@@ -67,7 +67,7 @@ + {"force-logout", '\0', 0, G_OPTION_ARG_NONE, &force_logout, N_("Log out, ignoring any existing inhibitors"), NULL}, + {"logout-dialog", '\0', 0, G_OPTION_ARG_NONE, &logout_dialog, N_("Show logout dialog"), NULL}, + {"shutdown-dialog", '\0', 0, G_OPTION_ARG_NONE, &shutdown_dialog, N_("Show shutdown dialog"), NULL}, +- {"kill", '\0', 0, G_OPTION_ARG_NONE, &kill, N_("Kill session"), NULL}, ++ {"kill", '\0', 0, G_OPTION_ARG_NONE, &kill_session, N_("Kill session"), NULL}, + {"gui", '\0', 0, G_OPTION_ARG_NONE, &show_error_dialogs, N_("Use dialog boxes for errors"), NULL}, + {"silent", '\0', 0, G_OPTION_ARG_NONE, &no_interaction, N_("Do not require confirmation"), NULL}, + {NULL} +@@ -259,7 +259,7 @@ + } + + conflicting_options = 0; +- if (kill) ++ if (kill_session) + conflicting_options++; + if (logout) + conflicting_options++; +@@ -272,7 +272,7 @@ + if (conflicting_options > 1) + display_error (_("Program called with conflicting options")); + +- if (kill) { ++ if (kill_session) { + if (no_interaction) + logout = TRUE; + else |