evolution r35600 - in trunk: mail plugins/exchange-operations

[mbarnes svn gnome org]

Author: mbarnes
Date: Fri Jun  6 01:50:42 2008
New Revision: 35600
URL: http://svn.gnome.org/viewvc/evolution?rev=35600&view=rev

Log:
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!



Modified:
   trunk/mail/ChangeLog
   trunk/mail/message-tag-followup.c
   trunk/plugins/exchange-operations/ChangeLog
   trunk/plugins/exchange-operations/exchange-permissions-dialog.c

Modified: trunk/mail/message-tag-followup.c
==============================================================================
--- trunk/mail/message-tag-followup.c	(original)
+++ trunk/mail/message-tag-followup.c	Fri Jun  6 01:50:42 2008
@@ -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>

Modified: trunk/plugins/exchange-operations/exchange-permissions-dialog.c
==============================================================================
--- trunk/plugins/exchange-operations/exchange-permissions-dialog.c	(original)
+++ trunk/plugins/exchange-operations/exchange-permissions-dialog.c	Fri Jun  6 01:50:42 2008
@@ -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;