[gnome-applets] Make charpick compile with -DGSEAL_ENABLE and bump GTK+ to 2.14.0. See bug 612473.

[Andre Klapper <aklapper src gnome org>]

commit 551d6dd3e388a0d8ab49fda35cac5eb5db54b528
Author: Andre Klapper <a9016009 gmx de>
Date:   Thu Apr 8 02:04:14 2010 +0200

    Make charpick compile with -DGSEAL_ENABLE and bump GTK+ to 2.14.0. See bug 612473.

 charpick/charpick.c   |   10 +++++++---
 charpick/properties.c |    8 ++++----
 configure.in          |    2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/charpick/charpick.c b/charpick/charpick.c
index fc708e2..ad16a58 100644
--- a/charpick/charpick.c
+++ b/charpick/charpick.c
@@ -342,9 +342,9 @@ get_menu_pos (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
 	gint screen_width, screen_height;
 	
 	gtk_widget_size_request (GTK_WIDGET (menu), &reqmenu);
-	gdk_window_get_origin (GTK_WIDGET (curr_data->applet)->window, &tempx, &tempy);
-     	gdk_window_get_geometry (GTK_WIDGET (curr_data->applet)->window, NULL, NULL,
-     			      &width, &height, NULL);
+	gdk_window_get_origin (GDK_WINDOW (gtk_widget_get_window(curr_data->applet)), &tempx, &tempy);
+     	gdk_window_get_geometry (GDK_WINDOW (gtk_widget_get_window(curr_data->applet)), NULL, NULL,
+     				 &width, &height, NULL);
      			      
      	switch (panel_applet_get_orient (PANEL_APPLET (curr_data->applet))) {
      	case PANEL_APPLET_ORIENT_DOWN:
@@ -369,7 +369,11 @@ get_menu_pos (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
 static void
 chooser_button_clicked (GtkButton *button, charpick_data *curr_data)
 {
+#if GTK_CHECK_VERSION(2,18,0)
 	if (GTK_WIDGET_VISIBLE (curr_data->menu))
+#else
+	if (gtk_widget_get_visible (curr_data->menu))
+#endif
 		gtk_menu_popdown (GTK_MENU (curr_data->menu));
 	else {
 		gtk_menu_set_screen (GTK_MENU (curr_data->menu),
diff --git a/charpick/properties.c b/charpick/properties.c
index 02f51fd..6538e28 100644
--- a/charpick/properties.c
+++ b/charpick/properties.c
@@ -103,9 +103,9 @@ add_edit_dialog_create (charpick_data *curr_data, gchar *string, gchar *title)
 
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
+	gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (dialog))), 2);
 
-	dbox = GTK_DIALOG (dialog)->vbox;
+	dbox = gtk_dialog_get_content_area(GTK_DIALOG (dialog));
 	
 	vbox = gtk_vbox_new (FALSE, 12);
 	gtk_box_pack_start (GTK_BOX (dbox), vbox, TRUE, TRUE, 0);
@@ -443,7 +443,7 @@ static void default_chars_frame_create(charpick_data *curr_data)
   GtkWidget *scrolled;
   GtkWidget *button;
 
-  dbox = GTK_DIALOG (dialog)->vbox;
+  dbox = gtk_dialog_get_content_area(GTK_DIALOG (dialog));
 
   vbox = gtk_vbox_new (FALSE, 18);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
@@ -549,7 +549,7 @@ show_preferences_dialog (BonoboUIComponent *uic,
 			 gtk_widget_get_screen (curr_data->applet));
   gtk_window_set_default_size (GTK_WINDOW (curr_data->propwindow), 350, 350);
   gtk_container_set_border_width (GTK_CONTAINER (curr_data->propwindow), 5);
-  gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (curr_data->propwindow)->vbox), 2);
+  gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (curr_data->propwindow))), 2);
   gtk_dialog_set_default_response (GTK_DIALOG (curr_data->propwindow), GTK_RESPONSE_CLOSE);
   gtk_dialog_set_has_separator (GTK_DIALOG (curr_data->propwindow), FALSE);
 
diff --git a/configure.in b/configure.in
index aab32f8..6200313 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ AC_CONFIG_MACRO_DIR(m4)
 dnl ***************************************************************************
 dnl *** Minimum library versions for GNOME-APPLETS                          ***
 dnl ***************************************************************************
-GTK_REQUIRED=2.13.0
+GTK_REQUIRED=2.14.0
 GLIB_REQUIRED=2.22.0
 GIO_REQUIRED=2.15.3
 GCONF_REQUIRED=2.8.0