Keep ID and display name separate for Mir servers, so that the log name doesn't look...

diff --git a/src/mir-server.c b/src/mir-server.c
index cf9c3553572e264b6307cbd4e720d2776706d20e..7d5572fa6375abd7728880d215456243403ce82f 100644 (file)
--- a/src/mir-server.c
+++ b/src/mir-server.c
@@ -53,26 +53,12 @@ mir_server_set_parent_socket (MirServer *server, const gchar *parent_socket)
     server->priv->parent_socket = g_strdup (parent_socket);
 }
 
-static void
-update_name (MirServer *server)
-{
-    gchar *name;
-
-    if (server->priv->id)
-        name = g_strdup_printf ("mir-%s", server->priv->id);
-    else
-        name = g_strdup ("mir");
-    display_server_set_name (DISPLAY_SERVER (server), name);
-    g_free (name);
-}
-
 void
 mir_server_set_id (MirServer *server, const gchar *id)
 {
     g_return_if_fail (server != NULL);
     g_free (server->priv->id);
     server->priv->id = g_strdup (id);
-    update_name (server);
 }
 
 const gchar *
@@ -125,7 +111,7 @@ mir_server_init (MirServer *server)
 {
     server->priv = G_TYPE_INSTANCE_GET_PRIVATE (server, MIR_SERVER_TYPE, MirServerPrivate);
     server->priv->vt = -1;
-    update_name (server);
+    display_server_set_name (DISPLAY_SERVER (server), "mir");
 }
 
 static void

diff --git a/src/seat-unity.c b/src/seat-unity.c
index b1439f319c63efcb5f024d847a4165357310cce5..742b11adbf9ad19fce0148d941a44457e0a7d394 100644 (file)
--- a/src/seat-unity.c
+++ b/src/seat-unity.c
@@ -508,9 +508,15 @@ create_mir_server (Seat *seat, gboolean is_greeter)
 
         // If we're a greeter, mark our ID that way, so USC can treat it specially
         id = g_strdup_printf ("%s%d", is_greeter ? "greeter-" : "", SEAT_UNITY (seat)->priv->next_id);
-        SEAT_UNITY (seat)->priv->next_id++;
         mir_server_set_id (mir_server, id);
         g_free (id);
+
+        // Now set display name for logging and internal use
+        id = g_strdup_printf ("mir-%s", SEAT_UNITY (seat)->priv->next_id);
+        display_server_set_name (DISPLAY_SERVER (mir_server), id);
+        g_free (id);
+
+        SEAT_UNITY (seat)->priv->next_id++;
     }   
 
     return DISPLAY_SERVER (mir_server);