diff options
| author | rbuj <[email protected]> | 2020-12-21 09:03:14 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2021-01-07 18:16:31 +0100 |
| commit | 01bdaecbc1fcaabdcd30d00ea0001464e631f690 (patch) | |
| tree | 97582c73d91184a1ebe61d30af1dfc1b38cc0120 /src | |
| parent | 47b82dac66ee49d7b97827a28b3966503c8898bc (diff) | |
| download | mate-screensaver-01bdaecbc1fcaabdcd30d00ea0001464e631f690.tar.bz2 mate-screensaver-01bdaecbc1fcaabdcd30d00ea0001464e631f690.tar.xz | |
Remove warning -Wshadow
Diffstat (limited to 'src')
| -rw-r--r-- | src/mate-screensaver-dialog.c | 10 | ||||
| -rw-r--r-- | src/mate-screensaver-preferences.c | 15 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/mate-screensaver-dialog.c b/src/mate-screensaver-dialog.c index 06ea62a..03ca5bf 100644 --- a/src/mate-screensaver-dialog.c +++ b/src/mate-screensaver-dialog.c @@ -429,7 +429,8 @@ static gboolean popup_dialog_idle(gpointer data) If the executable is setuid root, then these initializations are run as root, before discarding privileges. */ -static gboolean privileged_initialization(int* argc, char** argv, gboolean verbose) +static gboolean +privileged_initialization (int* argc, char** argv) { gboolean ret; char* nolock_reason; @@ -471,7 +472,8 @@ static gboolean privileged_initialization(int* argc, char** argv, gboolean verbo * * Figure out what locking mechanisms are supported. */ -static gboolean lock_initialization (int* argc, char** argv, char** nolock_reason, gboolean verbose) +static gboolean +lock_initialization (int* argc, char** argv, char** nolock_reason) { if (nolock_reason != NULL) { @@ -560,7 +562,7 @@ int main(int argc, char** argv) gs_profile_start(NULL); - if (!privileged_initialization(&argc, argv, verbose)) + if (!privileged_initialization (&argc, argv)) { response_lock_init_failed(); exit(1); @@ -585,7 +587,7 @@ int main(int argc, char** argv) exit(1); } - if (!lock_initialization(&argc, argv, &nolock_reason, verbose)) + if (!lock_initialization(&argc, argv, &nolock_reason)) { if (nolock_reason != NULL) { diff --git a/src/mate-screensaver-preferences.c b/src/mate-screensaver-preferences.c index e2d1371..44e0c7b 100644 --- a/src/mate-screensaver-preferences.c +++ b/src/mate-screensaver-preferences.c @@ -192,7 +192,7 @@ config_get_theme (gboolean *is_writable) } static gchar ** -get_all_theme_ids (GSThemeManager *theme_manager) +get_all_theme_ids (void) { gchar **ids = NULL; GSList *entries; @@ -228,7 +228,7 @@ config_set_theme (const char *theme_id) mode = GS_MODE_RANDOM; /* set the themes key to contain all available screensavers */ - strv = get_all_theme_ids (theme_manager); + strv = get_all_theme_ids (); } else { @@ -297,8 +297,7 @@ config_set_lock (gboolean lock) } static void -job_set_theme (GSJob *job, - const char *theme) +job_set_theme (const char *theme) { GSThemeInfo *info; const char *command; @@ -362,13 +361,13 @@ preview_set_theme (GtkWidget *widget, { gchar **themes; - themes = get_all_theme_ids (theme_manager); + themes = get_all_theme_ids (); if (themes != NULL) { gint32 i; i = g_random_int_range (0, g_strv_length (themes)); - job_set_theme (job, themes[i]); + job_set_theme (themes[i]); g_strfreev (themes); gs_job_start (job); @@ -376,7 +375,7 @@ preview_set_theme (GtkWidget *widget, } else { - job_set_theme (job, theme); + job_set_theme (theme); gs_job_start (job); } } @@ -1757,7 +1756,7 @@ init_capplet (void) mode = g_settings_get_enum (screensaver_settings, KEY_MODE); if (mode == GS_MODE_RANDOM) { gchar **list; - list = get_all_theme_ids (theme_manager); + list = get_all_theme_ids (); g_settings_set_strv (screensaver_settings, KEY_THEMES, (const gchar * const*) list); g_strfreev (list); } |