← Back to branch summary

~ubuntu-branches/debian/stretch/lightdm/stretch

« back to all changes in this revision

Viewing changes to src/process.c

  • Committer: Package Import Robot
  • Author(s): Yves-Alexis Perez
  • Date: 2013-10-20 20:45:55 UTC
  • mfrom: (1.1.17)
  • Revision ID: package-import@ubuntu.com-20131020204555-0ht6bt0lw5bof9fn
Tags: 1.8.2-1
* New upstream release.
* debian/patches:
  - 01_set-default-path, 02_default-config, 05_debianize-pam-files
    refreshed.
  - 03_quit-plymouth disabled for now, to check if problem is really fixed
    upstream.
* debian/control:
  - rename liblightdm-qt-2-0 to liblightdm-qt-3-0 to match updated soname.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/process.c
297
297
 
298
298
    g_free (self->priv->command);
299
299
    g_hash_table_unref (self->priv->env);
 
300
    if (self->priv->quit_timeout)
 
301
        g_source_remove (self->priv->quit_timeout);
300
302
    if (self->priv->watch)
301
303
        g_source_remove (self->priv->watch);
302
304
 
322
324
    pid_t pid;
323
325
    Process *process;
324
326
 
325
 
    if (read (signal_pipe[0], &signo, sizeof (int)) < 0 || 
326
 
        read (signal_pipe[0], &pid, sizeof (pid_t)) < 0)
 
327
    errno = 0;
 
328
    if (read (signal_pipe[0], &signo, sizeof (int)) != sizeof (int) || 
 
329
        read (signal_pipe[0], &pid, sizeof (pid_t)) != sizeof (pid_t))
327
330
    {
328
331
        g_warning ("Error reading from signal pipe: %s", strerror (errno));
329
332
        return TRUE;
358
361
                      G_SIGNAL_RUN_LAST,
359
362
                      G_STRUCT_OFFSET (ProcessClass, run),
360
363
                      NULL, NULL,
361
 
                      g_cclosure_marshal_VOID__VOID,
 
364
                      NULL,
362
365
                      G_TYPE_NONE, 0); 
363
366
    signals[GOT_DATA] =
364
367
        g_signal_new ("got-data",
366
369
                      G_SIGNAL_RUN_LAST,
367
370
                      G_STRUCT_OFFSET (ProcessClass, got_data),
368
371
                      NULL, NULL,
369
 
                      g_cclosure_marshal_VOID__VOID,
 
372
                      NULL,
370
373
                      G_TYPE_NONE, 0); 
371
374
    signals[GOT_SIGNAL] =
372
375
        g_signal_new ("got-signal",
374
377
                      G_SIGNAL_RUN_LAST,
375
378
                      G_STRUCT_OFFSET (ProcessClass, got_signal),
376
379
                      NULL, NULL,
377
 
                      g_cclosure_marshal_VOID__INT,
 
380
                      NULL,
378
381
                      G_TYPE_NONE, 1, G_TYPE_INT);
379
382
    signals[STOPPED] =
380
383
        g_signal_new ("stopped",
382
385
                      G_SIGNAL_RUN_LAST,
383
386
                      G_STRUCT_OFFSET (ProcessClass, stopped),
384
387
                      NULL, NULL,
385
 
                      g_cclosure_marshal_VOID__VOID,
 
388
                      NULL,
386
389
                      G_TYPE_NONE, 0);
387
390
 
388
391
    /* Catch signals and feed them to the main loop via a pipe */