[gedit/wip/3.10.4-osx: 8/13] Rename wait variable to wait to avoid compiler warnings
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit/wip/3.10.4-osx: 8/13] Rename wait variable to wait to avoid compiler warnings
- Date: Sat, 22 Mar 2014 08:49:04 +0000 (UTC)
commit bd5fbca4c5f917186aa655d3febb367263682bf7
Author: Jesse van den Kieboom <jessevdk gmail com>
Date: Sat Mar 22 09:45:24 2014 +0100
Rename wait variable to wait to avoid compiler warnings
gedit/gedit-app.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index 89a227a..88c3f61 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -95,7 +95,7 @@ static gchar *encoding_charset = NULL;
static gboolean new_window = FALSE;
static gboolean new_document = FALSE;
static gchar *geometry = NULL;
-static gboolean wait = FALSE;
+static gboolean owait = FALSE;
static gboolean standalone = FALSE;
static gchar **remaining_args = NULL;
static const GeditEncoding *encoding = NULL;
@@ -161,7 +161,7 @@ static const GOptionEntry options[] =
/* Wait for closing documents */
{
"wait", 'w', 0, G_OPTION_ARG_NONE,
- &wait,
+ &owait,
N_("Open files and block process until files are closed"),
NULL
},
@@ -753,7 +753,7 @@ clear_options (void)
new_window = FALSE;
new_document = FALSE;
geometry = NULL;
- wait = FALSE;
+ owait = FALSE;
standalone = FALSE;
remaining_args = NULL;
encoding = NULL;
@@ -816,7 +816,7 @@ gedit_app_command_line (GApplication *application,
}
else
{
- if (wait)
+ if (owait)
{
command_line = cl;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]