summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbuj <[email protected]>2020-12-20 21:27:33 +0100
committerraveit65 <[email protected]>2021-01-07 18:14:36 +0100
commit25403b779f27d4e84640bb592c6b231ad3869ae3 (patch)
treeacd6df23c16fbc76631d128e266cddbcaac749fb
parent9e9508b5a32b1353dd095eccc376512893e81b7e (diff)
downloadmate-settings-daemon-master.tar.bz2
mate-settings-daemon-master.tar.xz
Remove warning -WshadowHEADmaster
-rw-r--r--plugins/clipboard/msd-clipboard-manager.c3
-rw-r--r--plugins/housekeeping/msd-disk-space.c2
-rw-r--r--plugins/keyboard/msd-keyboard-xkb.c6
-rw-r--r--plugins/mouse/msd-locate-pointer.c3
4 files changed, 8 insertions, 6 deletions
diff --git a/plugins/clipboard/msd-clipboard-manager.c b/plugins/clipboard/msd-clipboard-manager.c
index fb5ddba..d99f04f 100644
--- a/plugins/clipboard/msd-clipboard-manager.c
+++ b/plugins/clipboard/msd-clipboard-manager.c
@@ -404,7 +404,6 @@ convert_clipboard_manager (MsdClipboardManager *manager,
int format;
unsigned long nitems;
unsigned long remaining;
- Atom *targets = NULL;
display = gdk_display_get_default ();
@@ -415,6 +414,8 @@ convert_clipboard_manager (MsdClipboardManager *manager,
*/
finish_selection_request (manager, xev, False);
} else {
+ Atom *targets = NULL;
+
gdk_x11_display_error_trap_push (display);
clipboard_manager_watch_cb (manager,
diff --git a/plugins/housekeeping/msd-disk-space.c b/plugins/housekeeping/msd-disk-space.c
index f37aab5..14b67a1 100644
--- a/plugins/housekeeping/msd-disk-space.c
+++ b/plugins/housekeeping/msd-disk-space.c
@@ -635,7 +635,7 @@ msd_ldsm_get_config (void)
}
static void
-msd_ldsm_update_config (GSettings *settings G_GNUC_UNUSED,
+msd_ldsm_update_config (GSettings *gsettings G_GNUC_UNUSED,
gchar *key G_GNUC_UNUSED,
gpointer user_data G_GNUC_UNUSED)
{
diff --git a/plugins/keyboard/msd-keyboard-xkb.c b/plugins/keyboard/msd-keyboard-xkb.c
index 52cc5c9..c120503 100644
--- a/plugins/keyboard/msd-keyboard-xkb.c
+++ b/plugins/keyboard/msd-keyboard-xkb.c
@@ -259,7 +259,9 @@ popup_menu_set_group (GtkMenuItem *item G_GNUC_UNUSED,
}
static void
-status_icon_popup_menu_cb (GtkStatusIcon * icon, guint button, guint time)
+status_icon_popup_menu_cb (GtkStatusIcon *status_icon,
+ guint button,
+ guint time)
{
GtkWidget *toplevel;
GdkScreen *screen;
@@ -330,7 +332,7 @@ status_icon_popup_menu_cb (GtkStatusIcon * icon, guint button, guint time)
gtk_menu_popup (popup_menu, NULL, NULL,
gtk_status_icon_position_menu,
- (gpointer) icon, button, time);
+ (gpointer) status_icon, button, time);
}
static void
diff --git a/plugins/mouse/msd-locate-pointer.c b/plugins/mouse/msd-locate-pointer.c
index 6009404..060e675 100644
--- a/plugins/mouse/msd-locate-pointer.c
+++ b/plugins/mouse/msd-locate-pointer.c
@@ -48,8 +48,6 @@ struct MsdLocatePointerData
gdouble progress;
};
-static MsdLocatePointerData *data = NULL;
-
static void
locate_pointer_paint (MsdLocatePointerData *data,
cairo_t *cr,
@@ -414,6 +412,7 @@ void
msd_locate_pointer (GdkDisplay *display)
{
GdkScreen *screen = gdk_display_get_default_screen (display);
+ static MsdLocatePointerData *data = NULL;
if (data == NULL)
{