Merge lp:~unity-api-team/indicator-network/lp1393488-15.04 into lp:indicator-network/15.04

[Antti Kaijanmäki]

fix flighmode switch bouncing on krillin.

[Jussi Pakkanen (jpakkane)]

Yup.

review: Approve

=== modified file 'src/indicator/quick-access-section.cpp'
--- src/indicator/quick-access-section.cpp	2014-10-29 18:12:05 +0000
+++ src/indicator/quick-access-section.cpp	2014-12-09 14:57:16 +0000
@@ -76,19 +76,23 @@
         });
     });
     m_flightModeSwitch->activated().connect([this](){
-        if (m_flightModeSwitch->state().get()) {
-            try {
-                m_manager->enableFlightMode();
-            } catch (const std::exception &e) {
-                std::cerr << e.what() << std::endl;
-            }
-        } else {
-            try {
-                m_manager->disableFlightMode();
-            } catch (const std::exception &e) {
-                std::cerr << e.what() << std::endl;
-            }
-        }
+        bool state = m_flightModeSwitch->state().get();
+        auto manager = m_manager;
+        GMainLoopDispatch([manager, state](){
+            if (state) {
+                try {
+                    manager->enableFlightMode();
+                } catch (const std::exception &e) {
+                    std::cerr << e.what() << std::endl;
+                }
+            } else {
+                try {
+                    manager->disableFlightMode();
+                } catch (const std::exception &e) {
+                    std::cerr << e.what() << std::endl;
+                }
+            }
+        }, G_PRIORITY_LOW, true);
     });
 
     m_actionGroupMerger->add(*m_flightModeSwitch);
 
=== modified file 'src/menumodel-cpp/gio-helpers/util.cpp'
--- src/menumodel-cpp/gio-helpers/util.cpp	2014-10-29 19:11:05 +0000
+++ src/menumodel-cpp/gio-helpers/util.cpp	2014-12-09 14:57:16 +0000
@@ -36,11 +36,12 @@
     return G_SOURCE_REMOVE;
 }
 
-GMainLoopDispatch::GMainLoopDispatch(Func func)
+GMainLoopDispatch::GMainLoopDispatch(Func func, int priority, bool force_delayed)
 {
     std::unique_lock<std::mutex> lock(_lock);
 
-    if (g_main_context_acquire(g_main_context_default())) {
+    if (!force_delayed &&
+         g_main_context_acquire(g_main_context_default())) {
         // already running inside GMainLoop..
         // free the lock and dispatch immediately.
         lock.unlock();
@@ -49,7 +50,7 @@
     } else {
         std::function<void()> *funcPtr = new std::function<void()>(func);
         if (_funcs.empty()) {
-            g_idle_add_full(G_PRIORITY_HIGH,
+            g_idle_add_full(priority,
                             GSourceFunc(GMainLoopDispatch::dispatch_cb),
                             NULL,
                             NULL);
 
=== modified file 'src/menumodel-cpp/gio-helpers/util.h'
--- src/menumodel-cpp/gio-helpers/util.h	2014-10-31 13:50:05 +0000
+++ src/menumodel-cpp/gio-helpers/util.h	2014-12-09 14:57:16 +0000
@@ -77,7 +77,7 @@
     static std::list<Func *> _funcs;
 
     //GMainLoopDispatch() = delete;
-    GMainLoopDispatch(Func func);
+    GMainLoopDispatch(Func func, int priority=G_PRIORITY_HIGH, bool force_delayed=false);
 };
 
 struct GObjectDeleter {