diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/message-tag-followup.c | 10 | ||||
| -rw-r--r-- | plugins/exchange-operations/ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/exchange-operations/exchange-permissions-dialog.c | 2 |
4 files changed, 11 insertions, 12 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index ded70d8136..11d5c120ca 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2008-06-05 Matthew Barnes <mbarnes@redhat.com> + + * message-tag-followup.c: + Never undefine DISABLE_DEPRECATED macros in source code. + Yes, it will break the build if it's defined. That's the point! + 2008-06-02 Jacob Brown <jeblinux@gmail.com> ** Fix for bug #529464 diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index db5e23acf6..f321df2bf7 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -26,18 +26,8 @@ #include <stdlib.h> #include <string.h> -#ifdef GTK_DISABLE_DEPRECATED -/* Gtk2's GtkCombo widget uses the deprecated GtkList widget, so - there's no way to use GtkCombo and still build if - GTK_DISABLE_DEPRECATED is defined. Yay Gtk! */ -#undef GTK_DISABLE_DEPRECATED #include <gtk/gtkcombo.h> #include <gtk/gtklist.h> -#define GTK_ENABLE_DEPRECATED -#else -#include <gtk/gtkcombo.h> -#include <gtk/gtklist.h> -#endif /* !GTK_DISABLE_DEPRECATED */ #include <gtk/gtkentry.h> #include <gtk/gtktogglebutton.h> diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index c89ec9325d..0ff415ce36 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,8 @@ +2008-06-05 Matthew Barnes <mbarnes@redhat.com> + + * exchange-permissions-dialog.c: + Here too. + 2008-06-04 Matthew Barnes <mbarnes@redhat.com> * exchange-delegates-user.c: diff --git a/plugins/exchange-operations/exchange-permissions-dialog.c b/plugins/exchange-operations/exchange-permissions-dialog.c index d798ce8505..179cc3d62a 100644 --- a/plugins/exchange-operations/exchange-permissions-dialog.c +++ b/plugins/exchange-operations/exchange-permissions-dialog.c @@ -51,8 +51,6 @@ #include <gtk/gtktreeview.h> #include <gtk/gtk.h> -#undef GTK_DISABLE_DEPRECATED - struct _ExchangePermissionsDialogPrivate { ExchangeAccount *account; char *base_uri, *folder_path; |