diff --git a/src/directories.cc b/src/directories.cc
index edf3ea7..00332cc 100644
--- a/src/directories.cc
+++ b/src/directories.cc
@@ -9,7 +9,13 @@
 using namespace std; //TODO: remove
 
 namespace sigc {
-  SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
+  template <typename Functor>
+  struct functor_trait<Functor, false> {
+    typedef decltype (::sigc::mem_fun(std::declval<Functor&>(),
+                                      &Functor::operator())) _intermediate;
+    typedef typename _intermediate::result_type result_type;
+    typedef Functor functor_type;
+  };
 }
 
 Directories::Directories() : stop_update_thread(false) {
diff --git a/src/entrybox.cc b/src/entrybox.cc
index e6f5350..df79ed4 100644
--- a/src/entrybox.cc
+++ b/src/entrybox.cc
@@ -1,7 +1,13 @@
 #include "entrybox.h"
 
 namespace sigc {
-  SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
+  template <typename Functor>
+  struct functor_trait<Functor, false> {
+    typedef decltype (::sigc::mem_fun(std::declval<Functor&>(),
+                                      &Functor::operator())) _intermediate;
+    typedef typename _intermediate::result_type result_type;
+    typedef Functor functor_type;
+  };
 }
 
 std::unordered_map<std::string, std::vector<std::string> > EntryBox::entry_histories;
diff --git a/src/notebook.cc b/src/notebook.cc
index f8f6feb..4462d69 100644
--- a/src/notebook.cc
+++ b/src/notebook.cc
@@ -10,7 +10,13 @@
 using namespace std; //TODO: remove
 
 namespace sigc {
-  SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
+  template <typename Functor>
+  struct functor_trait<Functor, false> {
+    typedef decltype (::sigc::mem_fun(std::declval<Functor&>(),
+                                      &Functor::operator())) _intermediate;
+    typedef typename _intermediate::result_type result_type;
+    typedef Functor functor_type;
+  };
 }
 
 Notebook::Notebook(Directories &directories) : Gtk::Notebook(), directories(directories) {
diff --git a/src/selectiondialog.cc b/src/selectiondialog.cc
index 395672d..816041a 100644
--- a/src/selectiondialog.cc
+++ b/src/selectiondialog.cc
@@ -2,7 +2,13 @@
 #include <algorithm>
 
 namespace sigc {
-  SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
+  template <typename Functor>
+  struct functor_trait<Functor, false> {
+    typedef decltype (::sigc::mem_fun(std::declval<Functor&>(),
+                                      &Functor::operator())) _intermediate;
+    typedef typename _intermediate::result_type result_type;
+    typedef Functor functor_type;
+  };
 }
 
 SelectionDialogBase::SelectionDialogBase(Gtk::TextView& text_view, Glib::RefPtr<Gtk::TextBuffer::Mark> start_mark, bool show_search_entry): text_view(text_view), 
@@ -144,7 +150,7 @@ void SelectionDialogBase::resize() {
     int window_height=std::min(row_height*(int)list_view_text.get_model()->children().size(), row_height*10);
     if(show_search_entry)
       window_height+=search_entry.get_height();
-    window->resize(row_width, window_height);
+    window->resize(row_width+1, window_height);
   }
 }
 
diff --git a/src/source.cc b/src/source.cc
index c4bf36a..41d9fbf 100644
--- a/src/source.cc
+++ b/src/source.cc
@@ -12,7 +12,13 @@
 using namespace std; //TODO: remove
 
 namespace sigc {
-  SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
+  template <typename Functor>
+  struct functor_trait<Functor, false> {
+    typedef decltype (::sigc::mem_fun(std::declval<Functor&>(),
+                                      &Functor::operator())) _intermediate;
+    typedef typename _intermediate::result_type result_type;
+    typedef Functor functor_type;
+  };
 }
 
 Glib::RefPtr<Gsv::Language> Source::guess_language(const boost::filesystem::path &file_path) {
diff --git a/src/tooltips.cc b/src/tooltips.cc
index d444502..21696ef 100644
--- a/src/tooltips.cc
+++ b/src/tooltips.cc
@@ -2,7 +2,13 @@
 #include "singletons.h"
 
 namespace sigc {
-  SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
+  template <typename Functor>
+  struct functor_trait<Functor, false> {
+    typedef decltype (::sigc::mem_fun(std::declval<Functor&>(),
+                                      &Functor::operator())) _intermediate;
+    typedef typename _intermediate::result_type result_type;
+    typedef Functor functor_type;
+  };
 }
 
 Gdk::Rectangle Tooltips::drawn_tooltips_rectangle=Gdk::Rectangle();
diff --git a/src/window.cc b/src/window.cc
index 464a977..f831b51 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -10,7 +10,13 @@
 using namespace std; //TODO: remove
 
 namespace sigc {
-  SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
+  template <typename Functor>
+  struct functor_trait<Functor, false> {
+    typedef decltype (::sigc::mem_fun(std::declval<Functor&>(),
+                                      &Functor::operator())) _intermediate;
+    typedef typename _intermediate::result_type result_type;
+    typedef Functor functor_type;
+  };
 }
 
 void Window::generate_keybindings() {