[evolution/gtk3] Adapt gdk_window_get_geometry for gtk+-3.0

[Vibha Yadav <yvibha src gnome org>]

commit fde94c3951384074336473bdfb28a0eee766be7d
Author: Vibha Yadav <yvibha novell com>
Date:   Mon Dec 13 16:48:00 2010 +0530

    Adapt gdk_window_get_geometry for gtk+-3.0
    
    Depth parameter has been removed now.
    Some other random fixes for gtk+-3.0 too.

 capplet/settings/mail-decoration.c      |    2 +-
 configure.ac                            |    3 +++
 widgets/table/e-table-group-container.c |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/capplet/settings/mail-decoration.c b/capplet/settings/mail-decoration.c
index 02ccf2f..113a694 100644
--- a/capplet/settings/mail-decoration.c
+++ b/capplet/settings/mail-decoration.c
@@ -88,7 +88,7 @@ md_translate_position (GdkWindow *w, double ex, double ey, gint *x, gint *y, Gtk
 
 	while (w && w != gtk_widget_get_window (window)) {
 		gint cx, cy, cw, ch, cd;
-		gdk_window_get_geometry (w, &cx, &cy, &cw, &ch, &cd);
+		gdk_window_get_geometry (w, &cx, &cy, &cw, &ch);
                 *x += cx;
                 *y += cy;
                 w = gdk_window_get_parent (w);
diff --git a/configure.ac b/configure.ac
index 41afbc3..fccb450 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,8 @@ if test "x${enable_gtk3}" = "xyes"; then
 	GAIL="gail-3.0"
 	gail_minimum_version="2.90.4"
 
+	unique_minimum_version="2.90.4"
+
 	GNOME_DESKTOP="gnome-desktop-3.0"
 	gnome_desktop_minimum_version="2.91.3"
 
@@ -298,6 +300,7 @@ PKG_CHECK_MODULES([GNOME_PLATFORM],
 	[gio-2.0 >= glib_minimum_version
          cairo-gobject
 	 $GTK >= $gtk_minimum_version
+	 unique-3.0 >= $unique_minimum_version
 	 $GAIL >= $gail_minimum_version
 	 gconf-2.0 >= gconf_minimum_version
 	 libxml-2.0 >= libxml_minimum_version
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 39e7f0b..12788ad 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -1094,7 +1094,7 @@ etgc_reflow (GnomeCanvasItem *item, gint flags)
 
 				e_canvas_item_move_absolute (GNOME_CANVAS_ITEM (child_node->text),
 							    GROUP_INDENT,
-							    running_height - BUTTON_PADDING);
+							    running_height - GROUP_INDENT - BUTTON_PADDING);
 
 				e_canvas_item_move_absolute (GNOME_CANVAS_ITEM (child),
 							    GROUP_INDENT,