[Xfce4-commits] <xfce4-clipman-plugin:master> Fix 1a5a2b: Add support for GTK 2.14

[Mike Massonnet]

Updating branch refs/heads/master
         to 622f507c052ea3ae11d50420bf278a0aa7cf9ec4 (commit)
       from 88c3e0b99ea356a04cd1d288e72a63c893c1d6d4 (commit)

commit 622f507c052ea3ae11d50420bf278a0aa7cf9ec4
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Thu Mar 15 20:14:03 2012 +0100

    Fix 1a5a2b: Add support for GTK 2.14

 panel-plugin/menu.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/menu.c b/panel-plugin/menu.c
index 4c50625..41a4f1a 100644
--- a/panel-plugin/menu.c
+++ b/panel-plugin/menu.c
@@ -199,11 +199,15 @@ cb_clear_history (ClipmanMenu *menu)
 
 
       {
-        GtkWidget *message_area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog));
+#if GTK_CHECK_VERSION(2, 22, 0)
+        GtkWidget *content_area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog));
+#else
+        GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+#endif
         GtkWidget *checkbox = gtk_check_button_new_with_label (_("Don't ask again"));
         exo_binding_new (G_OBJECT (checkbox), "active", G_OBJECT (menu), "never-confirm-history-clear");
         gtk_widget_show (checkbox);
-        gtk_container_add (GTK_CONTAINER (message_area), checkbox);
+        gtk_container_add (GTK_CONTAINER (content_area), checkbox);
 
         res = gtk_dialog_run (GTK_DIALOG (dialog));
         gtk_widget_destroy (dialog);