From 7eb86e42c84b8ba14b0b357fdaa94a6454d0f5d7 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Tue, 2 Dec 2003 00:17:19 +0000 Subject: remove GTK_DISABLED_DEPRECATED so that we can build with gtk-2.3. 2003-12-01 Larry Ewing * gui/component/Makefile.am (INCLUDES): remove GTK_DISABLED_DEPRECATED so that we can build with gtk-2.3. svn path=/trunk/; revision=23553 --- addressbook/ChangeLog | 6 ++++++ addressbook/gui/component/Makefile.am | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 9944021a1d..b78e343fbb 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,8 @@ +2003-12-01 Larry Ewing + + * gui/component/Makefile.am (INCLUDES): remove + GTK_DISABLED_DEPRECATED so that we can build with gtk-2.3. + 2003-12-01 Rodney Dawes * gui/component/GNOME_Evolution_Addressbook.server.in.in: @@ -152,6 +157,7 @@ (addressbook_model_set_uri): Use addressbook_load_source (). However, this needs a bit more work to get source UIDs instead of URIs. +>>>>>>> 1.1484 2003-11-26 JP Rosevear * gui/widgets/Makefile.am: turn on deprecated gtk and libgnomeui diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 82f8bd3410..9583e53c8c 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -21,7 +21,6 @@ INCLUDES = \ -DPREFIX=\""$(prefix)"\" \ $(LDAP_CFLAGS) \ -DG_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ -DLIBGNOME_DISABLE_DEPRECATED \ -DLIBGNOMEUI_DISABLE_DEPRECATED \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -- cgit