summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbuj <[email protected]>2020-12-31 09:26:32 +0100
committerraveit65 <[email protected]>2021-01-16 10:51:02 +0100
commitdd71dbb570b45cef2ea4110cd29b36ddb7ede534 (patch)
tree8d14c012fbdc7c5b60a9f24d93f17f25db224c84
parent5bcfd992f981aef751fc7f681b9789aa08b8961c (diff)
downloadcaja-extensions-dd71dbb570b45cef2ea4110cd29b36ddb7ede534.tar.bz2
caja-extensions-dd71dbb570b45cef2ea4110cd29b36ddb7ede534.tar.xz
Remove warning -Wshadow
-rw-r--r--sendto/caja-sendto-command.c8
-rw-r--r--sendto/plugins/pidgin/pidgin.c9
-rw-r--r--sendto/plugins/upnp/upnp.c4
3 files changed, 10 insertions, 11 deletions
diff --git a/sendto/caja-sendto-command.c b/sendto/caja-sendto-command.c
index 41e44ce..9f46904 100644
--- a/sendto/caja-sendto-command.c
+++ b/sendto/caja-sendto-command.c
@@ -505,13 +505,13 @@ pack_entry_changed_cb (GObject *object, GParamSpec *spec, NS_ui *ui)
}
static void
-update_button_image (GtkSettings *settings,
- GParamSpec *spec,
- GtkWidget *widget)
+update_button_image (GtkSettings *gtk_settings,
+ GParamSpec *spec,
+ GtkWidget *widget)
{
gboolean show_images;
- g_object_get (settings, "gtk-button-images", &show_images, NULL);
+ g_object_get (gtk_settings, "gtk-button-images", &show_images, NULL);
if (show_images == FALSE)
gtk_widget_hide (widget);
else
diff --git a/sendto/plugins/pidgin/pidgin.c b/sendto/plugins/pidgin/pidgin.c
index f18a11f..d4525e1 100644
--- a/sendto/plugins/pidgin/pidgin.c
+++ b/sendto/plugins/pidgin/pidgin.c
@@ -231,22 +231,21 @@ add_pidgin_contacts_to_model (GtkTreeStore *store,
g_hash_table_iter_init (&hiter, contact_hash);
while (g_hash_table_iter_next (&hiter, NULL, (gpointer)&contacts_group)) {
- gint accounts;
+ gint num_accounts;
dat = g_ptr_array_index (contacts_group, 0);
- accounts = contacts_group->len;
+ num_accounts = contacts_group->len;
gtk_tree_store_append (store, parent, NULL);
gtk_tree_store_set (store, parent, COL_ICON, NULL, COL_ALIAS, dat->alias, -1);
- gint i;
- for (i = 0; i < accounts; ++i) {
+ for (i = 0; i < num_accounts; ++i) {
dat = g_ptr_array_index (contacts_group, i);
icon = get_buddy_icon(dat->id);
- if (accounts == 1) {
+ if (num_accounts == 1) {
g_value_init(&val, GDK_TYPE_PIXBUF);
g_value_set_object (&val, (gpointer)icon);
gtk_tree_store_set_value (store, parent, COL_ICON, &val);
diff --git a/sendto/plugins/upnp/upnp.c b/sendto/plugins/upnp/upnp.c
index cfa25ff..62cb2cb 100644
--- a/sendto/plugins/upnp/upnp.c
+++ b/sendto/plugins/upnp/upnp.c
@@ -167,7 +167,7 @@ device_proxy_unavailable_cb (GUPnPControlPoint *cp,
}
static void
-on_context_available (GUPnPContextManager *context_manager,
+on_context_available (GUPnPContextManager *manager,
GUPnPContext *context,
gpointer user_data)
{
@@ -187,7 +187,7 @@ on_context_available (GUPnPContextManager *context_manager,
gssdp_resource_browser_set_active (GSSDP_RESOURCE_BROWSER (cp), TRUE);
/* Let context manager take care of the control point life cycle */
- gupnp_context_manager_manage_control_point (context_manager, cp);
+ gupnp_context_manager_manage_control_point (manager, cp);
g_object_unref (cp);
}