Support for Gtk2

Author: hamishmack

vcsgui/src/VCSGui/Git/Log.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 -----------------------------------------------------------------------------
 --
 -- Module      :  VCSGui.Git.Log
@@ -49,7 +50,11 @@ showLogGUI = do
     askForNewBranchname = do
         dialog <- Gtk.dialogNew
         Gtk.dialogAddButton dialog "gtk-ok" Gtk.ResponseOk
+#if MIN_VERSION_gtk(0,13,0) || defined(MIN_VERSION_gtk3)
         upper <- Gtk.dialogGetContentArea dialog
+#else
+        upper <- Gtk.dialogGetUpper dialog
+#endif
 
         inputBranch <- Gtk.entryNew
         lblBranch <- Gtk.labelNew $ Just "Enter a new branchname (empty for anonym branch):"

vcsgui/vcsgui.cabal

@@ -42,9 +42,10 @@ library
                vcswrapper ==0.0.2,
                process >=1.0.1.5 && <1.3
     if flag(gtk3)
-      build-depends: gtk3 >=0.12.4.1 && <0.13
+      build-depends: gtk3 >=0.12.4 && <0.13
+      cpp-options:   -DMIN_VERSION_gtk=MIN_VERSION_gtk3
     else
-      build-depends: gtk >=0.12.4.1 && <0.13
+      build-depends: gtk >=0.12.4 && <0.13
     exposed-modules: VCSGui.Common VCSGui.Git VCSGui.Svn VCSGui.Mercurial
     exposed: True
     buildable: True
@@ -71,9 +72,10 @@ executable vcsgui
                vcswrapper ==0.0.2,
                process >=1.0.1.5 && <1.3
     if flag(gtk3)
-      build-depends: gtk3 >=0.12.4.1 && <0.13
+      build-depends: gtk3 >=0.12.4 && <0.13
+      cpp-options:   -DMIN_VERSION_gtk=MIN_VERSION_gtk3
     else
-      build-depends: gtk >=0.12.4.1 && <0.13
+      build-depends: gtk >=0.12.4 && <0.13
     if os(osx)
         ghc-options: -optl-headerpad_max_install_names
     buildable: True
@@ -99,9 +101,10 @@ executable vcsgui-askpass
                vcswrapper ==0.0.2,
                process >=1.0.1.5 && <1.3
     if flag(gtk3)
-      build-depends: gtk3 >=0.12.4.1 && <0.13
+      build-depends: gtk3 >=0.12.4 && <0.13
+      cpp-options:   -DMIN_VERSION_gtk=MIN_VERSION_gtk3
     else
-      build-depends: gtk >=0.12.4.1 && <0.13
+      build-depends: gtk >=0.12.4 && <0.13
     if os(osx)
         ghc-options: -optl-headerpad_max_install_names
     buildable: True