summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libs/client/DeprecatedLoader.cpp2
-rw-r--r--src/libs/client/Store.cpp4
-rw-r--r--src/libs/gui/App.cpp17
-rw-r--r--src/libs/gui/App.hpp1
4 files changed, 19 insertions, 5 deletions
diff --git a/src/libs/client/DeprecatedLoader.cpp b/src/libs/client/DeprecatedLoader.cpp
index b193c86f..ffe9da14 100644
--- a/src/libs/client/DeprecatedLoader.cpp
+++ b/src/libs/client/DeprecatedLoader.cpp
@@ -221,7 +221,7 @@ DeprecatedLoader::load_patch(const Glib::ustring& filename,
poly = 1;
// Create it, if we're not merging
- if (!existing) {
+ if (!existing && path != "/") {
_engine->create_patch(path, poly);
for (GraphObject::Variables::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i)
_engine->set_variable(path, i->first, i->second);
diff --git a/src/libs/client/Store.cpp b/src/libs/client/Store.cpp
index 60c03049..b679b01a 100644
--- a/src/libs/client/Store.cpp
+++ b/src/libs/client/Store.cpp
@@ -33,8 +33,8 @@ namespace Client {
Store::Store(SharedPtr<EngineInterface> engine, SharedPtr<SigClientInterface> emitter)
-: _engine(engine)
-, _emitter(emitter)
+ : _engine(engine)
+ , _emitter(emitter)
{
emitter->signal_object_destroyed.connect(sigc::mem_fun(this, &Store::destruction_event));
emitter->signal_object_renamed.connect(sigc::mem_fun(this, &Store::rename_event));
diff --git a/src/libs/gui/App.cpp b/src/libs/gui/App.cpp
index 46737d01..8b3013ad 100644
--- a/src/libs/gui/App.cpp
+++ b/src/libs/gui/App.cpp
@@ -186,6 +186,9 @@ App::attach(SharedPtr<EngineInterface> engine, SharedPtr<SigClientInterface> cli
_loader = SharedPtr<ThreadedLoader>(new ThreadedLoader(engine));
_patch_tree_window->init(*_store);
+
+ _client->signal_response_error.connect(sigc::mem_fun(this, &App::error_response));
+ _client->signal_error.connect(sigc::mem_fun(this, &App::error_message));
}
@@ -205,11 +208,21 @@ App::detach()
void
+App::error_response(int32_t id, const string& str)
+{
+ error_message(str);
+}
+
+
+void
App::error_message(const string& str)
{
_messages_window->post(str);
- _messages_window->show();
- _messages_window->raise();
+
+ if (!_messages_window->is_visible())
+ _messages_window->present();
+
+ _messages_window->set_urgency_hint(true);
}
diff --git a/src/libs/gui/App.hpp b/src/libs/gui/App.hpp
index bfe58f53..6bb7083b 100644
--- a/src/libs/gui/App.hpp
+++ b/src/libs/gui/App.hpp
@@ -136,6 +136,7 @@ protected:
App(Ingen::Shared::World* world);
bool animate();
+ void error_response(int32_t id, const string& str);
static void* icon_destroyed(void* data);