summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbuj <[email protected]>2020-12-20 22:27:41 +0100
committerraveit65 <[email protected]>2021-01-07 18:15:20 +0100
commitdfcbc043483a1f94e5da312629351e52d3d5b3cd (patch)
treec8544df11440f4e48bda5e3039a46ed052238262
parent6398deed1db939a3bd5ae654603b5176925864af (diff)
downloadmate-session-manager-master.tar.bz2
mate-session-manager-master.tar.xz
Remove warning -WshadowHEADmaster
-rw-r--r--capplet/gsp-app-manager.c4
-rw-r--r--mate-session/gsm-manager.c10
-rw-r--r--mate-session/gsm-xsmp-server.c6
3 files changed, 10 insertions, 10 deletions
diff --git a/capplet/gsp-app-manager.c b/capplet/gsp-app-manager.c
index 7e245db..5c30dfd 100644
--- a/capplet/gsp-app-manager.c
+++ b/capplet/gsp-app-manager.c
@@ -28,8 +28,6 @@
#include "gsp-app-manager.h"
-static GspAppManager *manager = NULL;
-
typedef struct {
char *dir;
int index;
@@ -599,6 +597,8 @@ gsp_app_manager_find_app_with_basename (GspAppManager *manager,
GspAppManager *
gsp_app_manager_get (void)
{
+ static GspAppManager *manager = NULL;
+
if (manager == NULL) {
manager = g_object_new (GSP_TYPE_APP_MANAGER, NULL);
return manager;
diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
index 9b0200f..817688a 100644
--- a/mate-session/gsm-manager.c
+++ b/mate-session/gsm-manager.c
@@ -2172,13 +2172,13 @@ on_xsmp_client_register_request (GsmXSMPClient *client,
if (IS_STRING_EMPTY (*id)) {
new_id = gsm_util_generate_startup_id ();
} else {
- GsmClient *client;
+ GsmClient *sm_client;
- client = (GsmClient *)gsm_store_find (priv->clients,
- (GsmStoreFunc)_client_has_startup_id,
- *id);
+ sm_client = (GsmClient *)gsm_store_find (priv->clients,
+ (GsmStoreFunc)_client_has_startup_id,
+ *id);
/* We can't have two clients with the same id. */
- if (client != NULL) {
+ if (sm_client != NULL) {
goto out;
}
diff --git a/mate-session/gsm-xsmp-server.c b/mate-session/gsm-xsmp-server.c
index 1566aba..10eb434 100644
--- a/mate-session/gsm-xsmp-server.c
+++ b/mate-session/gsm-xsmp-server.c
@@ -509,9 +509,9 @@ update_iceauthority (GsmXsmpServer *server,
}
for (e = entries; e; e = e->next) {
- IceAuthFileEntry *auth_entry = e->data;
- IceWriteAuthFileEntry (fp, auth_entry);
- IceFreeAuthFileEntry (auth_entry);
+ IceAuthFileEntry *auth_file_entry = e->data;
+ IceWriteAuthFileEntry (fp, auth_file_entry);
+ IceFreeAuthFileEntry (auth_file_entry);
}
g_slist_free (entries);