[gnome-applets] Patch from Milan Bouchet-Valat to fix compilation against gtk3

[Kjartan Maraas <kmaraas src gnome org>]

commit 561a932ce4e59361f54ec434eb24ef89309119b8
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Sat Jan 8 21:55:26 2011 +0100

    Patch from Milan Bouchet-Valat to fix compilation against gtk3

 charpick/charpick.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/charpick/charpick.c b/charpick/charpick.c
index 15ccfa0..78137f3 100644
--- a/charpick/charpick.c
+++ b/charpick/charpick.c
@@ -338,14 +338,16 @@ get_menu_pos (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
 {
 	charpick_data *curr_data = data;
 	GtkRequisition  reqmenu;
+	GdkWindow *window;
 	gint tempx, tempy, width, height;
 	gint screen_width, screen_height;
-	
+
 	gtk_widget_size_request (GTK_WIDGET (menu), &reqmenu);
-	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);
-     			      
+	window = gtk_widget_get_window (curr_data->applet);
+	gdk_window_get_origin (window, &tempx, &tempy);
+	width = gdk_window_get_width (window);
+	height = gdk_window_get_height (window);
+
      	switch (panel_applet_get_orient (PANEL_APPLET (curr_data->applet))) {
      	case PANEL_APPLET_ORIENT_DOWN:
         	tempy += height;