[evolution-exchange] Drop backward-compatibility cruft.

[Matthew Barnes <mbarnes src gnome org>]

commit e75a50819d3eb30409c58ab6b38da144f0892adb
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Jan 26 13:15:13 2011 -0500

    Drop backward-compatibility cruft.

 eplugin/Makefile.am                    |    3 +--
 eplugin/exchange-delegates-user.c      |    5 -----
 eplugin/exchange-delegates.c           |    4 ----
 eplugin/exchange-folder-size-display.c |    3 ---
 eplugin/exchange-folder-subscription.c |   22 +---------------------
 eplugin/exchange-permissions-dialog.c  |    6 ------
 eplugin/exchange-send-options.c        |    4 ----
 eplugin/gtk-compat.h                   |   27 ---------------------------
 8 files changed, 2 insertions(+), 72 deletions(-)
---
diff --git a/eplugin/Makefile.am b/eplugin/Makefile.am
index 41e6691..b9b2b45 100644
--- a/eplugin/Makefile.am
+++ b/eplugin/Makefile.am
@@ -57,8 +57,7 @@ liborg_gnome_exchange_operations_la_SOURCES = \
 	exchange-folder.c \
 	exchange-mail-send-options.c \
 	exchange-send-options.c \
-	exchange-send-options.h \
-	gtk-compat.h
+	exchange-send-options.h
 
 liborg_gnome_exchange_operations_la_LIBADD = \
 	$(top_builddir)/server/storage/libexchange-storage.la \
diff --git a/eplugin/exchange-delegates-user.c b/eplugin/exchange-delegates-user.c
index 60411e9..133446f 100644
--- a/eplugin/exchange-delegates-user.c
+++ b/eplugin/exchange-delegates-user.c
@@ -44,8 +44,6 @@
 
 #include <string.h>
 
-#include "gtk-compat.h"
-
 #define EXCHANGE_DELEGATES_USER_CUSTOM    -3
 /* Can't use E2K_PERMISSIONS_ROLE_CUSTOM, because it's -1, which
  * means "end of list" to e_dialog_combo_box_get/set
@@ -240,9 +238,6 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		GTK_STOCK_OK, GTK_RESPONSE_OK,
 		NULL);
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (delegate_permissions, "has-separator", FALSE, NULL);
-#endif
 
 	if (parent_window)
 		gtk_window_set_transient_for (GTK_WINDOW (delegate_permissions), GTK_WINDOW (parent_window));
diff --git a/eplugin/exchange-delegates.c b/eplugin/exchange-delegates.c
index 7873e7c..37f6f77 100644
--- a/eplugin/exchange-delegates.c
+++ b/eplugin/exchange-delegates.c
@@ -930,10 +930,6 @@ exchange_delegates (ExchangeAccount *account, GtkWidget *parent)
 		GTK_STOCK_OK, GTK_RESPONSE_OK,
 		NULL);
 
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (delegates->dialog, "has-separator", FALSE, NULL);
-#endif
-
 	dialog_vbox1 = gtk_dialog_get_content_area (GTK_DIALOG (delegates->dialog));
 	gtk_widget_show (dialog_vbox1);
 
diff --git a/eplugin/exchange-folder-size-display.c b/eplugin/exchange-folder-size-display.c
index eeba822..9ef7d1c 100644
--- a/eplugin/exchange-folder-size-display.c
+++ b/eplugin/exchange-folder-size-display.c
@@ -138,9 +138,6 @@ exchange_folder_size_display (GtkListStore *model, GtkWidget *parent)
 		GTK_DIALOG_DESTROY_WITH_PARENT,
 		GTK_STOCK_OK, GTK_RESPONSE_OK,
 		NULL);
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (folder_tree, "has-separator", FALSE, NULL);
-#endif
 	gtk_window_set_position (GTK_WINDOW (folder_tree), GTK_WIN_POS_CENTER_ON_PARENT);
 	gtk_window_set_default_size (GTK_WINDOW (folder_tree), 250, 300);
 	if (parent)
diff --git a/eplugin/exchange-folder-subscription.c b/eplugin/exchange-folder-subscription.c
index 644d9b5..7393f85 100644
--- a/eplugin/exchange-folder-subscription.c
+++ b/eplugin/exchange-folder-subscription.c
@@ -38,7 +38,6 @@
 #include "exchange-config-listener.h"
 #include "exchange-folder-subscription.h"
 #include "exchange-operations.h"
-#include "gtk-compat.h"
 
 static void
 user_response (ENameSelectorDialog *name_selector_dialog, gint response, gpointer data)
@@ -310,9 +309,6 @@ create_folder_subscription_dialog (ExchangeAccount *account, const gchar *fname)
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		GTK_STOCK_OK, GTK_RESPONSE_OK,
 		NULL);
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (dialog, "has-separator", FALSE, NULL);
-#endif
 
 	dialog_vbox1 = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 	gtk_widget_show (dialog_vbox1);
@@ -349,23 +345,7 @@ create_folder_subscription_dialog (ExchangeAccount *account, const gchar *fname)
 			  (GtkAttachOptions) (GTK_FILL),
 			  (GtkAttachOptions) (0), 0, 0);
 
-#if GTK_CHECK_VERSION(2,23,0)
-	/* FIXME Rewrite this when removing the version check. */
-	{
-		GtkListStore *store;
-
-		store = gtk_list_store_new (1, G_TYPE_STRING);
-		folder_name_combo = g_object_new (
-			GTK_TYPE_COMBO_BOX,
-			"model", store,
-			"has-entry", TRUE,
-			"entry-text-column", 0,
-			NULL);
-		g_object_unref (store);
-	}
-#else
-	folder_name_combo = gtk_combo_box_entry_new_text ();
-#endif
+	folder_name_combo = gtk_combo_box_text_new_with_entry ();
 	gtk_widget_show (folder_name_combo);
 	gtk_table_attach (GTK_TABLE (table1), folder_name_combo, 1, 2, 2, 3,
 			  (GtkAttachOptions) (GTK_FILL),
diff --git a/eplugin/exchange-permissions-dialog.c b/eplugin/exchange-permissions-dialog.c
index 82b2cfb..e183d27 100644
--- a/eplugin/exchange-permissions-dialog.c
+++ b/eplugin/exchange-permissions-dialog.c
@@ -42,8 +42,6 @@
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-alert-dialog.h>
 
-#include "gtk-compat.h"
-
 struct _ExchangePermissionsDialogPrivate {
 	ExchangeAccount *account;
 	gchar *base_uri, *folder_path;
@@ -644,11 +642,7 @@ display_permissions (ExchangePermissionsDialog *dialog)
 				      perms & E2K_PERMISSION_OWNER);
 	gtk_toggle_button_set_active (dialog->priv->folder_contact_check,
 				      (perms & E2K_PERMISSION_CONTACT) &&
-#if GTK_CHECK_VERSION(2,19,7)
 				      gtk_widget_get_sensitive (GTK_WIDGET (dialog->priv->folder_contact_check)));
-#else
-				      GTK_WIDGET_SENSITIVE (dialog->priv->folder_contact_check));
-#endif
 	gtk_toggle_button_set_active (dialog->priv->folder_visible_check,
 				      perms & E2K_PERMISSION_FOLDER_VISIBLE);
 
diff --git a/eplugin/exchange-send-options.c b/eplugin/exchange-send-options.c
index ad937b1..7357755 100644
--- a/eplugin/exchange-send-options.c
+++ b/eplugin/exchange-send-options.c
@@ -32,7 +32,6 @@
 #include <e-util/e-alert-dialog.h>
 
 #include "exchange-send-options.h"
-#include "gtk-compat.h"
 
 G_DEFINE_TYPE (ExchangeSendOptionsDialog, exchange_sendoptions_dialog, G_TYPE_OBJECT)
 
@@ -342,9 +341,6 @@ exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod, GtkWidget *pare
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		GTK_STOCK_OK, GTK_RESPONSE_OK,
 		NULL);
-#if !GTK_CHECK_VERSION(2,90,7)
-	g_object_set (send_options, "has-separator", FALSE, NULL);
-#endif
 	gtk_window_set_type_hint (GTK_WINDOW (send_options), GDK_WINDOW_TYPE_HINT_DIALOG);
 
 	send_options_vbox = gtk_dialog_get_content_area (GTK_DIALOG (send_options));