gtkmm-2 upgrade. Still some small bugs to iron out, but mostly functional

[lyx.git] / src / frontends / gnome / Timeout_pimpl.C

diff --git a/src/frontends/gnome/Timeout_pimpl.C b/src/frontends/gnome/Timeout_pimpl.C
index c397a628c9a1be3d5234c79d06afbb9035b888aa..f5213854e1a8e3766719ac34e5fd829afd2dadbe 100644 (file)
--- a/src/frontends/gnome/Timeout_pimpl.C
+++ b/src/frontends/gnome/Timeout_pimpl.C
@@ -13,7 +13,7 @@
 #pragma implementation
 #endif
 
-#include <gnome--/main.h>
+#include <gtkmm/main.h>
 #include "Timeout_pimpl.h"
 #include "debug.h"
 
@@ -41,8 +41,8 @@ void Timeout::Pimpl::start()
                stop();
        }
 
-       conn_ = Gnome::Main::timeout.connect(
-                        SigC::slot(this, &Timeout::Pimpl::timeoutEvent),
+       conn_ = Gtk::Main::signal_timeout().connect(
+                        SigC::slot(*this, &Timeout::Pimpl::timeoutEvent),
                         owner_->timeout_ms
                        );
        running_ = true;
@@ -56,8 +56,8 @@ void Timeout::Pimpl::stop()
 }
 
 
-gint Timeout::Pimpl::timeoutEvent()
+bool Timeout::Pimpl::timeoutEvent()
 {
        owner_->emit();
-       return 0; // discontinue emitting timeouts.
+       return false; // discontinue emitting timeouts.
 }