← Back to branch summary

~gagern/lightdm/preferred-users

« back to all changes in this revision

Viewing changes to tests/src/unity-system-compositor.c

  • Committer: Robert Ancell
  • Date: 2013-12-11 03:28:54 UTC
  • mto: (1818.1.52 trunk)
  • mto: This revision was merged to the branch mainline in revision 1820.
  • Revision ID: robert.ancell@canonical.com-20131211032854-2oz96msi64de8wy1
Support Mir sessions in xlocal seats by starting a unity system compositor for each session

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/src/unity-system-compositor.c
141
141
    GString *status_text;
142
142
    gboolean test = FALSE;
143
143
    int vt_number = -1;
 
144
    const gchar *file = NULL;
144
145
 
145
146
#if !defined(GLIB_VERSION_2_36)
146
147
    g_type_init ();
174
175
        }
175
176
        else if (strcmp (arg, "--file") == 0)
176
177
        {
177
 
            /*file = argv[i+1];*/
 
178
            file = argv[i+1];
178
179
            i++;
179
180
        }
180
181
        else if (strcmp (arg, "--test") == 0)
186
187
    g_io_add_watch (g_io_channel_unix_new (from_dm_fd), G_IO_IN, read_message_cb, NULL);
187
188
 
188
189
    status_text = g_string_new ("UNITY-SYSTEM-COMPOSITOR START");
 
190
    if (file)
 
191
        g_string_append_printf (status_text, " FILE=%s", file);
189
192
    if (vt_number >= 0)
190
193
        g_string_append_printf (status_text, " VT=%d", vt_number);
191
194
    if (g_getenv ("XDG_VTNR"))