Switched to gtkmm 2.4+ since gtkmm 2.0 is being removed from Debian.

[videolink.git] / videolink.cpp

diff --git a/videolink.cpp b/videolink.cpp
index ca4193370fae8d379ec326b9f5504eb9d37dfd26..ef30510149905c0ce7a4f277cbbe68a9c57be934 100644 (file)
--- a/videolink.cpp
+++ b/videolink.cpp
@@ -160,7 +160,8 @@ namespace
        add(browser_widget_);
        browser_widget_.show();
 
-       Glib::signal_idle().connect(SigC::slot(*this, &base_window::on_idle));
+       Glib::signal_idle().connect(
+           sigc::mem_fun(this, &base_window::on_idle));
     }
 
     bool base_window::on_idle()
@@ -187,7 +188,8 @@ namespace
        : base_window(frame_params),
          main_page_uri_(main_page_uri)
     {
-       signal_key_press_event().connect(SigC::slot(*this, &preview_window::on_key_press));
+       signal_key_press_event().connect(
+           sigc::mem_fun(this, &preview_window::on_key_press));
     }
 
     void preview_window::do_late_initialisation()
@@ -276,7 +278,7 @@ namespace
          finished_(false)
     {
        browser_widget_.signal_net_state().connect(
-           SigC::slot(*this, &conversion_window::on_net_state_change));
+           sigc::mem_fun(this, &conversion_window::on_net_state_change));
 
        add_menu(main_page_uri);
     }
@@ -963,7 +965,7 @@ int main(int argc, char ** argv)
        {
            preview_window window(frame_params, menu_url);
            window.show();
-           window.signal_hide().connect(SigC::slot(&Gtk::Main::quit));
+           window.signal_hide().connect(sigc::ptr_fun(Gtk::Main::quit));
            Gtk::Main::run();
            return EXIT_SUCCESS;
        }
@@ -971,7 +973,7 @@ int main(int argc, char ** argv)
        {
            conversion_window window(frame_params, menu_url, output_dir, encoder);
            window.show();
-           window.signal_hide().connect(SigC::slot(&Gtk::Main::quit));
+           window.signal_hide().connect(sigc::ptr_fun(Gtk::Main::quit));
            Gtk::Main::run();
            return window.is_finished() ? EXIT_SUCCESS  : EXIT_FAILURE;
        }