Merge lp:~jpakkane/indicator-network/quickexit into lp:indicator-network/15.04

[Antti Kaijanmäki]

Use std::quick_exit.

[Antti Kaijanmäki (kaijanmaki)]

Approved in:
https://code.launchpad.net/~jpakkane/indicator-network/quickexit/+merge/240095

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:449
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/210/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/84/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/210/rebuild

review: Approve (continuous-integration)

=== modified file 'src/connectivity-cpp/src/manager.cpp'
--- src/connectivity-cpp/src/manager.cpp	2014-09-22 13:03:01 +0000
+++ src/connectivity-cpp/src/manager.cpp	2014-11-03 08:44:45 +0000
@@ -38,7 +38,7 @@
         // If this happens, indicator-network is in an unknown state with no clear way of
         // recovering. The only reasonable way out is a graceful exit.
         std::cerr << __PRETTY_FUNCTION__ << " Failed to connect to managerinstance: " << e.what() << std::endl;
-        exit(0);
+        std::quick_exit(0);
     }
     return mgr;
 }

=== modified file 'src/connectivity-cpp/src/platform/nmofono/manager.cpp'
--- src/connectivity-cpp/src/platform/nmofono/manager.cpp	2014-10-09 10:58:30 +0000
+++ src/connectivity-cpp/src/platform/nmofono/manager.cpp	2014-11-03 08:44:45 +0000
@@ -104,7 +104,7 @@
            // If this happens, indicator-network is in an unknown state with no clear way of
            // recovering. The only reasonable way out is a graceful exit.
            std::cerr << __PRETTY_FUNCTION__ << " Failed to run dbus service: " << e.what() << std::endl;
-           exit(0);
+           std::quick_exit(0);
         }
     }));
     location::set_name_for_thread(

=== modified file 'src/connectivity-cpp/src/platform/nmofono/wifi/link.cpp'
--- src/connectivity-cpp/src/platform/nmofono/wifi/link.cpp	2014-10-09 10:58:30 +0000
+++ src/connectivity-cpp/src/platform/nmofono/wifi/link.cpp	2014-11-03 08:44:45 +0000
@@ -183,7 +183,7 @@
         // If this happens, indicator-network is in an unknown state with no clear way of
         // recovering. The only reasonable way out is a graceful exit.
         std::cerr << __PRETTY_FUNCTION__ << " Failed to run dbus service: " << e.what() << std::endl;
-        exit(0);
+        std::quick_exit(0);
     }
 }
 
@@ -399,7 +399,7 @@
         // If this happens, indicator-network is in an unknown state with no clear way of
         // recovering. The only reasonable way out is a graceful exit.
         std::cerr << __PRETTY_FUNCTION__ << " Failed to activate connection: " << e.what() << std::endl;
-        exit(0);
+        std::quick_exit(0);
     }
 }
 

=== modified file 'src/indicator/connectivity-service/connectivity-service.cpp'
--- src/indicator/connectivity-service/connectivity-service.cpp	2014-09-12 10:51:35 +0000
+++ src/indicator/connectivity-service/connectivity-service.cpp	2014-11-03 08:44:45 +0000
@@ -126,7 +126,7 @@
         m_bus->run();
     } catch(const std::exception &e) {
         std::cerr << __PRETTY_FUNCTION__ << "dbus-cpp crashed: " << e.what() << "\n";
-        exit(0);
+        std::quick_exit(0);
     }
     }));
 

=== modified file 'src/indicator/modem-manager.cpp'
--- src/indicator/modem-manager.cpp	2014-10-15 11:31:13 +0000
+++ src/indicator/modem-manager.cpp	2014-11-03 08:44:45 +0000
@@ -60,7 +60,7 @@
                 // If this happens, indicator-network is in an unknown state with no clear way of
                 // recovering. The only reasonable way out is a graceful exit.
                 std::cerr << __PRETTY_FUNCTION__ << " Failed to run dbus service: " << e.what() << std::endl;
-                exit(0);
+                std::quick_exit(0);
             }
         }));
 
@@ -200,7 +200,7 @@
         // and reliable way to recover so die and get restarted.
         // See also https://bugs.launchpad.net/unity-notifications/+bug/1238990
         std::cerr << __PRETTY_FUNCTION__ << " sim unlocking failed: " << e.what() << "\n";
-        exit(0);
+        std::quick_exit(0);
     }
 }