cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't override option names.

Browse Source
This commit is contained in:
ajacoutot 2012-09-30 16:01:38 +00:00
parent 26cbd53e76
commit 2db2504b43
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/gnome/session/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.216 2012/09/28 07:34:24 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.217 2012/09/30 16:01:38 ajacoutot Exp $
COMMENT= GNOME session
GNOME_PROJECT= gnome-session
GNOME_VERSION= 3.6.0
REVISION= 0
CATEGORIES= x11

40
x11/gnome/session/patches/patch-tools_gnome-session-quit_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-tools_gnome-session-quit_c,v 1.2 2012/09/30 08:27:02 ajacoutot Exp $
$OpenBSD: patch-tools_gnome-session-quit_c,v 1.3 2012/09/30 16:01:38 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=685121
--- tools/gnome-session-quit.c.orig Fri Sep 28 09:26:07 2012
+++ tools/gnome-session-quit.c Fri Sep 28 09:28:54 2012
--- tools/gnome-session-quit.c.orig Tue Jul 17 03:40:05 2012
+++ tools/gnome-session-quit.c Sun Sep 30 17:54:45 2012
@@ -43,18 +43,18 @@ enum {
GSM_LOGOUT_MODE_FORCE
};
@ -13,11 +13,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685121
-static gboolean reboot = FALSE;
-static gboolean no_prompt = FALSE;
-static gboolean force = FALSE;
+static gboolean gs_logout = FALSE;
+static gboolean gs_power_off = FALSE;
+static gboolean gs_reboot = FALSE;
+static gboolean gs_no_prompt = FALSE;
+static gboolean gs_force = FALSE;
+static gboolean opt_logout = FALSE;
+static gboolean opt_power_off = FALSE;
+static gboolean opt_reboot = FALSE;
+static gboolean opt_no_prompt = FALSE;
+static gboolean opt_force = FALSE;
static GOptionEntry options[] = {
- {"logout", '\0', 0, G_OPTION_ARG_NONE, &logout, N_("Log out"), NULL},
@ -25,11 +25,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685121
- {"reboot", '\0', 0, G_OPTION_ARG_NONE, &reboot, N_("Reboot"), NULL},
- {"force", '\0', 0, G_OPTION_ARG_NONE, &force, N_("Ignoring any existing inhibitors"), NULL},
- {"no-prompt", '\0', 0, G_OPTION_ARG_NONE, &no_prompt, N_("Don't prompt for user confirmation"), NULL},
+ {"gs_logout", '\0', 0, G_OPTION_ARG_NONE, &gs_logout, N_("Log out"), NULL},
+ {"gs_power-off", '\0', 0, G_OPTION_ARG_NONE, &gs_power_off, N_("Power off"), NULL},
+ {"gs_reboot", '\0', 0, G_OPTION_ARG_NONE, &gs_reboot, N_("Reboot"), NULL},
+ {"gs_force", '\0', 0, G_OPTION_ARG_NONE, &gs_force, N_("Ignoring any existing inhibitors"), NULL},
+ {"gs_no-prompt", '\0', 0, G_OPTION_ARG_NONE, &gs_no_prompt, N_("Don't prompt for user confirmation"), NULL},
+ {"logout", '\0', 0, G_OPTION_ARG_NONE, &opt_logout, N_("Log out"), NULL},
+ {"power-off", '\0', 0, G_OPTION_ARG_NONE, &opt_power_off, N_("Power off"), NULL},
+ {"reboot", '\0', 0, G_OPTION_ARG_NONE, &opt_reboot, N_("Reboot"), NULL},
+ {"force", '\0', 0, G_OPTION_ARG_NONE, &opt_force, N_("Ignoring any existing inhibitors"), NULL},
+ {"no-prompt", '\0', 0, G_OPTION_ARG_NONE, &opt_no_prompt, N_("Don't prompt for user confirmation"), NULL},
{NULL}
};
@ -38,31 +38,31 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685121
conflicting_options = 0;
- if (logout)
+ if (gs_logout)
+ if (opt_logout)
conflicting_options++;
- if (power_off)
+ if (gs_power_off)
+ if (opt_power_off)
conflicting_options++;
- if (reboot)
+ if (gs_reboot)
+ if (opt_reboot)
conflicting_options++;
if (conflicting_options > 1)
display_error (_("Program called with conflicting options"));
- if (power_off) {
+ if (gs_power_off) {
+ if (opt_power_off) {
do_power_off ("Shutdown");
- } else if (reboot) {
+ } else if (gs_reboot) {
+ } else if (opt_reboot) {
do_power_off ("Reboot");
} else {
/* default to logout */
- if (force)
+ if (gs_force)
+ if (opt_force)
do_logout (GSM_LOGOUT_MODE_FORCE);
- else if (no_prompt)
+ else if (gs_no_prompt)
+ else if (opt_no_prompt)
do_logout (GSM_LOGOUT_MODE_NO_CONFIRMATION);
else
do_logout (GSM_LOGOUT_MODE_NORMAL);