[evolution-patches] patch for #41582

[Rodrigo Moya <rodrigo ximian com>]

? gui/alarm-notify/alarm-notify.gladep
? gui/dialogs/alarm-options.gladep
? gui/dialogs/alarm-page.gladep
? gui/dialogs/cal-prefs-dialog.gladep
? gui/dialogs/e-delegate-dialog.gladep
? gui/dialogs/event-page.gladep
? gui/dialogs/meeting-page.gladep
? gui/dialogs/recurrence-page.gladep
? gui/dialogs/schedule-page.gladep
? gui/dialogs/task-details-page.gladep
? gui/dialogs/task-page.gladep
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.1790
diff -u -p -r1.1790 ChangeLog
--- ChangeLog	9 Jun 2003 17:31:15 -0000	1.1790
+++ ChangeLog	10 Jun 2003 15:47:33 -0000
@@ -1,3 +1,13 @@
+2003-06-10  Rodrigo Moya <rodrigo ximian com>
+
+	Fixes #41582
+
+	* gui/gnome-cal.c (gnome_calendar_hpane_resized): killed warnings
+	and added code to resize the EDayView's time column on the hpane's
+	resizing.
+	(gnome_calendar_vpane_resized): killed warnings.
+	
 2003-06-04  Rodrigo Moya <rodrigo ximian com>
 
 	* pcs/query.c (start_cached_query_cb): adapted to changes in
Index: gui/gnome-cal.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/gnome-cal.c,v
retrieving revision 1.242
diff -u -p -r1.242 gnome-cal.c
--- gui/gnome-cal.c	20 May 2003 20:33:00 -0000	1.242
+++ gui/gnome-cal.c	10 Jun 2003 15:47:39 -0000
@@ -42,6 +42,7 @@
 #include "dialogs/task-editor.h"
 #include "comp-util.h"
 #include "e-day-view.h"
+#include "e-day-view-time-item.h"
 #include "e-week-view.h"
 #include "evolution-calendar.h"
 #include "gnome-cal.h"
@@ -2640,10 +2641,10 @@ gnome_calendar_vpane_resized (GtkWidget 
 	priv = gcal->priv;
 
 	if (priv->current_view_type == GNOME_CAL_MONTH_VIEW && !priv->range_selected) {
-		priv->vpane_pos_month_view = gtk_paned_get_position (priv->vpane);
+		priv->vpane_pos_month_view = gtk_paned_get_position (GTK_PANED (priv->vpane));
 		calendar_config_set_month_vpane_pos (priv->vpane_pos_month_view);
 	} else {
-		priv->vpane_pos = gtk_paned_get_position (priv->vpane);
+		priv->vpane_pos = gtk_paned_get_position (GTK_PANED (priv->vpane));
 		calendar_config_set_vpane_pos (priv->vpane_pos);
 	}
 
@@ -2654,17 +2655,27 @@ static gboolean
 gnome_calendar_hpane_resized (GtkWidget *w, GdkEventButton *e, GnomeCalendar *gcal)
 {
 	GnomeCalendarPrivate *priv;
+	gint times_width;
 
 	priv = gcal->priv;
 
 	if (priv->current_view_type == GNOME_CAL_MONTH_VIEW && !priv->range_selected) {
-		priv->hpane_pos_month_view = gtk_paned_get_position (priv->hpane);
+		priv->hpane_pos_month_view = gtk_paned_get_position (GTK_PANED (priv->hpane));
 		calendar_config_set_month_hpane_pos (priv->hpane_pos_month_view);
 	} else {
-		priv->hpane_pos = gtk_paned_get_position (priv->hpane);
+		priv->hpane_pos = gtk_paned_get_position (GTK_PANED (priv->hpane));
 		calendar_config_set_hpane_pos (priv->hpane_pos);
 	}
 
+	/* adjust the size of the EDayView's time column */
+	times_width = e_day_view_time_item_get_column_width (
+		E_DAY_VIEW_TIME_ITEM (E_DAY_VIEW (priv->day_view)->time_canvas_item));
+	if (times_width < priv->hpane_pos - 20)
+		gtk_widget_set_usize (E_DAY_VIEW (priv->day_view)->time_canvas, times_width, -1);
+	else
+		gtk_widget_set_usize (E_DAY_VIEW (priv->day_view)->time_canvas, priv->hpane_pos - 20, -1);
+	
+	
 	return FALSE;
 }