[evolution-exchange] To be buildable against gtk3



commit 6b332275df746d36394539c2c374003ad384a0cc
Author: Milan Crha <mcrha redhat com>
Date:   Tue Dec 14 15:36:00 2010 +0100

    To be buildable against gtk3

 eplugin/exchange-delegates-user.c      |    5 ++++-
 eplugin/exchange-delegates.c           |    6 +++++-
 eplugin/exchange-folder-size-display.c |    5 ++++-
 eplugin/exchange-folder-subscription.c |    5 ++++-
 eplugin/exchange-send-options.c        |    5 ++++-
 5 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/eplugin/exchange-delegates-user.c b/eplugin/exchange-delegates-user.c
index 1d31be8..60411e9 100644
--- a/eplugin/exchange-delegates-user.c
+++ b/eplugin/exchange-delegates-user.c
@@ -236,10 +236,13 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 		   that the delegatee would receive */
 		_("Delegate Permissions"),
 		NULL,
-		GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+		GTK_DIALOG_DESTROY_WITH_PARENT,
 		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 847fa6b..7873e7c 100644
--- a/eplugin/exchange-delegates.c
+++ b/eplugin/exchange-delegates.c
@@ -925,11 +925,15 @@ exchange_delegates (ExchangeAccount *account, GtkWidget *parent)
 	delegates->dialog = gtk_dialog_new_with_buttons (
 		_("Delegates"),
 		NULL,
-		GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+		GTK_DIALOG_DESTROY_WITH_PARENT,
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		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 a5ae33a..eeba822 100644
--- a/eplugin/exchange-folder-size-display.c
+++ b/eplugin/exchange-folder-size-display.c
@@ -135,9 +135,12 @@ exchange_folder_size_display (GtkListStore *model, GtkWidget *parent)
 	folder_tree = gtk_dialog_new_with_buttons (
 		_("Exchange Folder Tree"),
 		NULL,
-		GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+		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 d61a7eb..644d9b5 100644
--- a/eplugin/exchange-folder-subscription.c
+++ b/eplugin/exchange-folder-subscription.c
@@ -306,10 +306,13 @@ create_folder_subscription_dialog (ExchangeAccount *account, const gchar *fname)
 	dialog = gtk_dialog_new_with_buttons (
 		_("Subscribe to Other User's Folder"),
 		NULL,
-		GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+		GTK_DIALOG_DESTROY_WITH_PARENT,
 		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);
diff --git a/eplugin/exchange-send-options.c b/eplugin/exchange-send-options.c
index 47c6cf0..ad937b1 100644
--- a/eplugin/exchange-send-options.c
+++ b/eplugin/exchange-send-options.c
@@ -337,11 +337,14 @@ exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod, GtkWidget *pare
 	send_options = gtk_dialog_new_with_buttons (
 		_("Exchange - Send Options"),
 		NULL,
-		GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+		GTK_DIALOG_DESTROY_WITH_PARENT,
 		GTK_STOCK_HELP, GTK_RESPONSE_HELP,
 		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));



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]