diff options
author | Larry Ewing <lewing@ximian.com> | 2003-12-02 08:17:19 +0800 |
---|---|---|
committer | Larry Ewing <lewing@src.gnome.org> | 2003-12-02 08:17:19 +0800 |
commit | 7eb86e42c84b8ba14b0b357fdaa94a6454d0f5d7 (patch) | |
tree | 717d8d9d880c7bec48aabfa7e95349559febb537 /addressbook | |
parent | b626efedcac81217607d2eb502bff3de3a3dbdbc (diff) | |
download | gsoc2013-evolution-7eb86e42c84b8ba14b0b357fdaa94a6454d0f5d7.tar gsoc2013-evolution-7eb86e42c84b8ba14b0b357fdaa94a6454d0f5d7.tar.gz gsoc2013-evolution-7eb86e42c84b8ba14b0b357fdaa94a6454d0f5d7.tar.bz2 gsoc2013-evolution-7eb86e42c84b8ba14b0b357fdaa94a6454d0f5d7.tar.lz gsoc2013-evolution-7eb86e42c84b8ba14b0b357fdaa94a6454d0f5d7.tar.xz gsoc2013-evolution-7eb86e42c84b8ba14b0b357fdaa94a6454d0f5d7.tar.zst gsoc2013-evolution-7eb86e42c84b8ba14b0b357fdaa94a6454d0f5d7.zip |
remove GTK_DISABLED_DEPRECATED so that we can build with gtk-2.3.
2003-12-01 Larry Ewing <lewing@ximian.com>
* gui/component/Makefile.am (INCLUDES): remove
GTK_DISABLED_DEPRECATED so that we can build with gtk-2.3.
svn path=/trunk/; revision=23553
Diffstat (limited to 'addressbook')
-rw-r--r-- | addressbook/ChangeLog | 6 | ||||
-rw-r--r-- | addressbook/gui/component/Makefile.am | 1 |
2 files changed, 6 insertions, 1 deletions
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 <lewing@ximian.com> + + * gui/component/Makefile.am (INCLUDES): remove + GTK_DISABLED_DEPRECATED so that we can build with gtk-2.3. + 2003-12-01 Rodney Dawes <dobey@ximian.com> * 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 <jpr@ximian.com> * 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) |