[libwnck/wip/warnings: 6/6] fix 'declaration of xxx shadows a global declaration' warnings
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libwnck/wip/warnings: 6/6] fix 'declaration of xxx shadows a global declaration' warnings
- Date: Thu, 27 Apr 2017 08:08:26 +0000 (UTC)
commit 2afc9ba4622df6a62d62df05bfae7eed70e63f2b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Thu Apr 27 11:03:06 2017 +0300
fix 'declaration of xxx shadows a global declaration' warnings
libwnck/test-pager.c | 4 ++--
libwnck/wnckprop.c | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/libwnck/test-pager.c b/libwnck/test-pager.c
index 41c578a..316b13a 100644
--- a/libwnck/test-pager.c
+++ b/libwnck/test-pager.c
@@ -25,7 +25,7 @@ create_pager_window (GtkOrientation orientation,
gboolean show_all,
WnckPagerDisplayMode mode,
int rows,
- gboolean wrap_on_scroll)
+ gboolean wrap)
{
GtkWidget *win;
GtkWidget *pager;
@@ -54,7 +54,7 @@ create_pager_window (GtkOrientation orientation,
wnck_pager_set_orientation (WNCK_PAGER (pager), orientation);
wnck_pager_set_n_rows (WNCK_PAGER (pager), rows);
wnck_pager_set_shadow_type (WNCK_PAGER (pager), GTK_SHADOW_IN);
- wnck_pager_set_wrap_on_scroll (WNCK_PAGER (pager), wrap_on_scroll);
+ wnck_pager_set_wrap_on_scroll (WNCK_PAGER (pager), wrap);
gtk_container_add (GTK_CONTAINER (win), pager);
diff --git a/libwnck/wnckprop.c b/libwnck/wnckprop.c
index 7dcc920..c5023da 100644
--- a/libwnck/wnckprop.c
+++ b/libwnck/wnckprop.c
@@ -481,12 +481,12 @@ option_parse (const char *option_name,
static gboolean
set_mode (int new_mode,
const char *option,
- gboolean list)
+ gboolean use_list)
{
switch (mode)
{
case INVALID_MODE:
- if (list)
+ if (use_list)
g_assert_not_reached ();
mode = new_mode;
@@ -494,7 +494,7 @@ set_mode (int new_mode,
case SCREEN_READ_MODE:
if (new_mode == SCREEN_READ_MODE || new_mode == SCREEN_WRITE_MODE)
mode = new_mode;
- else if (list)
+ else if (use_list)
mode = SCREEN_LIST_MODE;
else
{
@@ -526,7 +526,7 @@ set_mode (int new_mode,
case WORKSPACE_READ_MODE:
if (new_mode == WORKSPACE_READ_MODE || new_mode == WORKSPACE_WRITE_MODE)
mode = new_mode;
- else if (list)
+ else if (use_list)
mode = WORKSPACE_LIST_MODE;
else
{
@@ -558,7 +558,7 @@ set_mode (int new_mode,
}
break;
case APPLICATION_READ_MODE:
- if (list)
+ if (use_list)
mode = APPLICATION_LIST_MODE;
else if (new_mode != APPLICATION_READ_MODE)
{
@@ -580,7 +580,7 @@ set_mode (int new_mode,
}
break;
case CLASS_GROUP_READ_MODE:
- if (list)
+ if (use_list)
mode = CLASS_GROUP_LIST_MODE;
else if (new_mode != CLASS_GROUP_READ_MODE)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]