UI::UI (string namestr, int *argc, char ***argv)
: AbstractUI<UIRequest> (namestr)
+ , _receiver (*this)
+
{
theMain = new Main (argc, argv);
which is assumed to have called this.
*/
- run_loop_thread = Thread::self();
+ run_loop_thread = Threads::Thread::self();
/* store "this" as the UI-for-thread of this thread, same argument
as for previous line.
errors->set_title (title.get_string());
errors->dismiss_button().set_name ("ErrorLogCloseButton");
- errors->signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), (Window *) errors));
+ errors->signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), (Window *) errors));
errors->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
//load_rcfile (rcfile);
bool
UI::caller_is_ui_thread ()
{
- return Thread::self() == run_loop_thread;
+ return Threads::Thread::self() == run_loop_thread;
}
int
void
UI::run (Receiver &old_receiver)
{
- listen_to (error);
- listen_to (info);
- listen_to (warning);
- listen_to (fatal);
+ _receiver.listen_to (error);
+ _receiver.listen_to (info);
+ _receiver.listen_to (warning);
+ _receiver.listen_to (fatal);
/* stop the old receiver (text/console) once we hit the first idle */
theMain->run ();
_active = false;
stopping ();
- hangup ();
+ _receiver.hangup ();
return;
}
if (!abbrev.empty()) {
replace_all (abbrev, "<", "");
replace_all (abbrev, ">", "-");
- msg.append("\n\nKey: ").append (abbrev);
+ msg.append(_("\n\nKey: ")).append (abbrev);
}
}
}
handle_fatal (str);
} else {
- display_message (prefix, prefix_len, ptag, mtag, str);
-
- if (!errors->is_visible() && chn != Transmitter::Info) {
- show_errors ();
+ if (!ptag || !mtag) {
+ /* oops, message sent before we set up tags - don't crash */
+ cerr << prefix << str << endl;
+ } else {
+ display_message (prefix, prefix_len, ptag, mtag, str);
+
+ if (!errors->is_visible() && chn != Transmitter::Info) {
+ show_errors ();
+ }
}
}