Revert "Merged master into gtk3, fixed three conflicts."

This reverts commit c857bba95e.

rtgui/lensgeom.cc

@@ -44,11 +44,6 @@ LensGeometry::LensGeometry () : FoldableToolPanel(this, "lensgeom", M("TP_LENSGE
     show_all ();
 }
 
-LensGeometry::~LensGeometry ()
-{
-    g_idle_remove_by_data(this);
-}
-
 void LensGeometry::read (const ProcParams* pp, const ParamsEdited* pedited)
 {
 
@@ -119,30 +114,3 @@ void LensGeometry::setBatchMode (bool batchMode)
     ToolPanel::setBatchMode (batchMode);
     removeIfThere (this, autoCrop);
 }
-
-void LensGeometry::disableAutoFillIfActive ()
-{
-    g_idle_add(doDisableAutoFillIfActive, this);
-}
-
-int LensGeometry::doDisableAutoFillIfActive (void* data)
-{
-    GThreadLock lock; // Is this really needed?
-
-    LensGeometry* const instance = static_cast<LensGeometry*>(data);
-
-    if (!instance->batchMode) {
-        if (instance->fill->get_active()) {
-            instance->fillConn.block (true);
-            instance->fill->set_active(false);
-
-            if (instance->listener) {
-                instance->listener->panelChanged (EvTransAutoFill, M("GENERAL_DISABLED"));
-            }
-
-            instance->fillConn.block (false);
-        }
-    }
-
-    return 0;
-}