merge with trunk

(bzr r13922.1.18)

2 files changed, 5 insertions, 2 deletions

diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index 5c708cf9a..5cab3a2b2 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -1026,7 +1026,10 @@ int Script::execute (const std::list<std::string> &in_command,
         return 0;
     }
 
-    _main_loop = Glib::MainLoop::create(false);
+    // Create a new MainContext for the loop so that the original context sources are not run here,
+    // this enforces that only the file_listeners should be read in this new MainLoop
+    Glib::RefPtr<Glib::MainContext> _main_context = Glib::MainContext::create();
+    _main_loop = Glib::MainLoop::create(_main_context, false);
 
     file_listener fileerr;
     fileout.init(stdout_pipe, _main_loop);
diff --git a/src/extension/implementation/script.h b/src/extension/implementation/script.h
index 6a7d0c3b8..4cf33c989 100644
--- a/src/extension/implementation/script.h
+++ b/src/extension/implementation/script.h
@@ -90,7 +90,7 @@ private:
         void init (int fd, Glib::RefPtr<Glib::MainLoop> main) {
             _channel = Glib::IOChannel::create_from_fd(fd);
             _channel->set_encoding();
-            _conn = Glib::signal_io().connect(sigc::mem_fun(*this, &file_listener::read), _channel, Glib::IO_IN | Glib::IO_HUP | Glib::IO_ERR);
+            _conn = main->get_context()->signal_io().connect(sigc::mem_fun(*this, &file_listener::read), _channel, Glib::IO_IN | Glib::IO_HUP | Glib::IO_ERR);
             _main_loop = main;
 
             return;