diff --git a/configure.ac b/configure.ac index 09f68cc21..eb78e6d9a 100644 --- a/configure.ac +++ b/configure.ac @@ -135,8 +135,13 @@ PKG_CHECK_MODULES(LUMIERA_COMMON_LIBS, [sigc++-2.0 >= 2.0.18]) # END Internatinalization ############## Gtk Dependancies + +# gtk+-2.0 >= 2.8 gtkmm-2.4 >= 2.8 for Debian Etch compatibility +# gtk+-2.0 >= 2.12 gtkmm-2.4 >= 2.12 for Debian Lenny compatibility + PKG_CHECK_MODULES(LUMIERA_GUI, [ - gtkmm-2.4 >= 2.8 gdl-1.0 >= 0.6.1 cairomm-1.0 >= 0.6.0 + gtk+-2.0 >= 2.8 gtkmm-2.4 >= 2.8 + gdl-1.0 >= 0.6.1 cairomm-1.0 >= 0.6.0 gavl >= 0.2.5 librsvg-2.0 >= 2.18.1]) # END Gtk Dependancies diff --git a/src/gui/widgets/timeline/timeline-track.cpp b/src/gui/widgets/timeline/timeline-track.cpp index 8dc698969..a81af1858 100644 --- a/src/gui/widgets/timeline/timeline-track.cpp +++ b/src/gui/widgets/timeline/timeline-track.cpp @@ -20,6 +20,9 @@ * *****************************************************/ +#warning This header must soon be removed when we drop Etch compatibility +#include + #include "timeline-track.hpp" #include "../../window-manager.hpp" @@ -38,8 +41,16 @@ Track::Track() : buttonBar.append(lockButton); buttonBar.set_toolbar_style(TOOLBAR_ICONS); -//buttonBar.set_icon_size(WindowManager::MenuIconSize); -//TODO uncommented for now, doesn't compile on etch. 12/15/08 ichthyo + +#if 0 + buttonBar.set_icon_size(WindowManager::MenuIconSize); +#else +#warning This code soon be removed when we drop Etch compatibility + + // Temporary bodge for etch compatibility - will be removed soon + gtk_toolbar_set_icon_size (buttonBar.gobj(), + (GtkIconSize)(int)WindowManager::MenuIconSize); +#endif headerWidget.pack_start(titleBox, PACK_SHRINK); headerWidget.pack_start(buttonBar, PACK_SHRINK);