Mercurial > pidgin.yaz
diff pidgin/pidgin.h @ 29514:c095f1795112
propagate from branch 'im.pidgin.pidgin' (head b4458fccbc3c9ab0c1c9105eb68c47ffa7c62e5a)
to branch 'im.pidgin.pidgin.next.minor' (head cd1a0979952f0ac0ffd107cbe8cac0d52f4d718f)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 04 Oct 2009 18:02:15 +0000 |
| parents | 2dcff225172e |
| children |
line wrap: on
line diff
--- a/pidgin/pidgin.h Sun Oct 04 18:01:35 2009 +0000 +++ b/pidgin/pidgin.h Sun Oct 04 18:02:15 2009 +0000 @@ -57,33 +57,6 @@ #endif /* - * This is backwards-compatibility code for older versions of GTK+ (< 2.4.x) - * It defines the new wrap behavior (unknown in earlier versions) - * as the old (slightly buggy) wrap behavior. - * It also includes our back-ported GtkExpander - */ -/** @cond */ -#if (!GTK_CHECK_VERSION(2,4,0)) -# define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD -# include "gtkexpander.h" -#endif -/** @endcond */ - -/* - * We include the sources for GtkComboBox and GtkCellView because - * they don't exist in older versions of GTK+, and we use them - * in a few places. - */ -#if !GTK_CHECK_VERSION(2,6,0) -# include "gtkcellview.h" -# include "gtkcellviewmenuitem.h" -# include "pidgincombobox.h" -# if !GTK_CHECK_VERSION(2,4,0) -# include "gtkcelllayout.h" -# endif /* Less than GTK+ 2.4 */ -#endif /* Less than GTK+ 2.6 */ - -/* * Spacings between components, as defined by the * GNOME Human Interface Guidelines. */