diff options
| author | Taybin Rutkin <taybin@taybin.com> | 2006-08-16 15:58:40 +0000 |
|---|---|---|
| committer | Taybin Rutkin <taybin@taybin.com> | 2006-08-16 15:58:40 +0000 |
| commit | 279128c81e3d0756db961cdf8da770b2b92afddd (patch) | |
| tree | 67599c0e02c4da1a69aebeec4e1c9388b86391bb /libs/pbd/pbd/abstract_ui.cc | |
| parent | 3ea92ec324ed3796497b89fbfff5ea5c44e18455 (diff) | |
Merged fix from cocoa branch -r 831.
git-svn-id: svn://localhost/ardour2/trunk@832 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/pbd/pbd/abstract_ui.cc')
| -rw-r--r-- | libs/pbd/pbd/abstract_ui.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libs/pbd/pbd/abstract_ui.cc b/libs/pbd/pbd/abstract_ui.cc index 0e34787a2d..eca53916af 100644 --- a/libs/pbd/pbd/abstract_ui.cc +++ b/libs/pbd/pbd/abstract_ui.cc @@ -4,6 +4,10 @@ #include <pbd/pthread_utils.h> #include <pbd/failed_constructor.h> +#include "i18n.h" + +using namespace std; + template <typename RequestObject> AbstractUI<RequestObject>::AbstractUI (string name, bool with_signal_pipes) : BaseUI (name, with_signal_pipes) @@ -44,7 +48,7 @@ AbstractUI<RequestObject>::get_request (RequestType rt) if (rbuf == 0) { /* Cannot happen, but if it does we can't use the error reporting mechanism */ cerr << _("programming error: ") - << string_compose (X_("no %1-UI request buffer found for thread %2"), name(), pthread_name()) + << string_compose ("no %1-UI request buffer found for thread %2", name(), pthread_name()) << endl; abort (); } @@ -55,7 +59,7 @@ AbstractUI<RequestObject>::get_request (RequestType rt) if (vec.len[0] == 0) { if (vec.len[1] == 0) { - cerr << string_compose (X_("no space in %1-UI request buffer for thread %2"), name(), pthread_name()) + cerr << string_compose ("no space in %1-UI request buffer for thread %2", name(), pthread_name()) << endl; return 0; } else { @@ -131,7 +135,7 @@ AbstractUI<RequestObject>::send_request (RequestObject *req) thread isn't registered! */ cerr << _("programming error: ") - << string_compose (X_("AbstractUI::send_request() called from %1, but no request buffer exists for that thread"), pthread_name()) + << string_compose ("AbstractUI::send_request() called from %1 (%2), but no request buffer exists for that thread", name(), pthread_name()) << endl; abort (); } |