← Back to branch summary

~ubuntu-branches/debian/stretch/colord/stretch

« back to all changes in this revision

Viewing changes to contrib/session-helper/cd-main.c

  • Committer: Package Import Robot
  • Author(s): Christopher James Halse Rogers
  • Date: 2014-01-16 17:55:36 UTC
  • mfrom: (1.2.4)
  • Revision ID: package-import@ubuntu.com-20140116175536-flaudopszcz4qbqt
Tags: 1.0.6-1
* New upstream stable release 1.0.6
* Bump Standards-Version (no changes required)

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/session-helper/cd-main.c
1488
1488
                        cd_main_emit_interaction_required (priv,
1489
1489
                                                           CD_SESSION_INTERACTION_MOVE_TO_CALIBRATION);
1490
1490
                        g_error_free (error_local);
 
1491
                        ret = TRUE;
1491
1492
                } else if (g_error_matches (error_local,
1492
1493
                                            CD_SENSOR_ERROR,
1493
1494
                                            CD_SENSOR_ERROR_REQUIRED_POSITION_SURFACE)) {
1495
1496
                        cd_main_emit_interaction_required (priv,
1496
1497
                                                           CD_SESSION_INTERACTION_MOVE_TO_SURFACE);
1497
1498
                        g_error_free (error_local);
 
1499
                        ret = TRUE;
1498
1500
                } else {
1499
1501
                        g_propagate_error (error, error_local);
1500
1502
                        goto out;
1562
1564
                goto out;
1563
1565
        }
1564
1566
 
 
1567
        /* still waiting */
 
1568
        if (priv->status == CD_SESSION_STATUS_WAITING_FOR_INTERACTION)
 
1569
                goto out;
 
1570
 
1565
1571
        /* success */
1566
1572
        cd_main_emit_finished (priv, CD_SESSION_ERROR_NONE, NULL);
1567
1573
        g_timeout_add (200, cd_main_finished_quit_cb, priv);
1975
1981
                }
1976
1982
 
1977
1983
                /* actually start the process now */
 
1984
                priv->status = CD_SESSION_STATUS_IDLE;
1978
1985
                g_idle_add (cd_main_start_calibration_cb, priv);
1979
1986
                g_dbus_method_invocation_return_value (invocation, NULL);
1980
1987
                goto out;