[evolution/kill-bonobo] Fix calendar pane positioning.

[Matthew Barnes <mbarnes src gnome org>]

commit 0b293d6318db3c8a9f0de076eec5da2408888f6d
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Aug 27 18:39:38 2009 -0400

    Fix calendar pane positioning.

 modules/calendar/e-cal-shell-content.c |   10 ++++------
 modules/calendar/e-cal-shell-sidebar.c |    6 ++++--
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 408f07f..e199f05 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -26,6 +26,8 @@
 
 #include "e-util/e-binding.h"
 #include "e-util/gconf-bridge.h"
+#include "widgets/menus/gal-view-etable.h"
+#include "widgets/misc/e-paned.h"
 
 #include "calendar/gui/calendar-config.h"
 #include "calendar/gui/calendar-view.h"
@@ -36,8 +38,6 @@
 #include "calendar/gui/e-day-view.h"
 #include "calendar/gui/e-week-view.h"
 
-#include "widgets/menus/gal-view-etable.h"
-
 #define E_CAL_SHELL_CONTENT_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_CAL_SHELL_CONTENT, ECalShellContentPrivate))
@@ -132,7 +132,7 @@ cal_shell_content_notify_view_id_cb (ECalShellContent *cal_shell_content)
 		key = "/apps/evolution/calendar/display/hpane_position";
 
 	binding_id = gconf_bridge_bind_property_delayed (
-		bridge, key, G_OBJECT (paned), "position");
+		bridge, key, G_OBJECT (paned), "hposition");
 
 	cal_shell_content->priv->paned_binding_id = binding_id;
 }
@@ -344,9 +344,7 @@ cal_shell_content_constructed (GObject *object)
 
 	container = GTK_WIDGET (object);
 
-	/* FIXME Need to deal with saving and restoring the position.
-	 *       Month view has its own position. */
-	widget = gtk_hpaned_new ();
+	widget = e_paned_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	priv->hpaned = g_object_ref (widget);
 	gtk_widget_show (widget);
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index c25b247..05b3a47 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -27,6 +27,8 @@
 #include "e-util/e-error.h"
 #include "e-util/e-binding.h"
 #include "e-util/gconf-bridge.h"
+#include "widgets/misc/e-paned.h"
+
 #include "calendar/common/authentication.h"
 #include "calendar/gui/calendar-config.h"
 #include "calendar/gui/e-calendar-selector.h"
@@ -401,7 +403,7 @@ cal_shell_sidebar_constructed (GObject *object)
 
 	container = GTK_WIDGET (shell_sidebar);
 
-	widget = gtk_vpaned_new ();
+	widget = e_paned_new (GTK_ORIENTATION_VERTICAL);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	priv->paned = g_object_ref (widget);
 	gtk_widget_show (widget);
@@ -497,7 +499,7 @@ cal_shell_sidebar_constructed (GObject *object)
 
 	object = G_OBJECT (priv->paned);
 	key = "/apps/evolution/calendar/display/date_navigator_vpane_position";
-	gconf_bridge_bind_property_delayed (bridge, key, object, "position");
+	gconf_bridge_bind_property_delayed (bridge, key, object, "vposition");
 }
 
 static void