aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2008-06-06 09:50:42 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-06-06 09:50:42 +0800
commit77a5d97f7092dc485a0c8d38343f7c5928caa97d (patch)
tree4ed9016f4b46335205e16228a81cb019b209dd04
parent7c1158d5451e080e8d6cfb602c1dde0b2ca4229c (diff)
downloadgsoc2013-evolution-77a5d97f7092dc485a0c8d38343f7c5928caa97d.tar.gz
gsoc2013-evolution-77a5d97f7092dc485a0c8d38343f7c5928caa97d.tar.zst
gsoc2013-evolution-77a5d97f7092dc485a0c8d38343f7c5928caa97d.zip
Never undefine DISABLE_DEPRECATED macros in source code. Yes, it will
2008-06-05 Matthew Barnes <mbarnes@redhat.com> * mail/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! svn path=/trunk/; revision=35600
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/message-tag-followup.c10
-rw-r--r--plugins/exchange-operations/ChangeLog5
-rw-r--r--plugins/exchange-operations/exchange-permissions-dialog.c2
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;