2 files changed, 8 insertions, 8 deletions
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);