From d303bba5106f0019ee887384cd709cbd0e5be922 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@src.gnome.org>
Date: Sun, 27 May 2007 17:55:34 +0000
Subject: 	** Fix for bug #351729 from Milan Crha

svn path=/trunk/; revision=33584
---
 calendar/ChangeLog                    | 8 ++++++++
 calendar/gui/dialogs/event-editor.c   | 3 +--
 calendar/gui/dialogs/event-page.glade | 6 +++---
 calendar/gui/dialogs/task-editor.c    | 4 ++--
 4 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'calendar')

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 3de11eec06..c62976a0be 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-27  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fix for bug #351729 from Milan Crha
+
+	* gui/dialogs/event-editor.c: (event_editor_construct):
+	* gui/dialogs/event-page.glade:
+	* gui/dialogs/task-editor.c: (task_editor_construct):
+
 2007-05-27  Srinivasa Ragavan  <sragavan@novell.com>
 
 	* gui/e-cal-popup.c: Addup missing hooks in the previous commit.
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 5569ab4027..eac3de7832 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -613,8 +613,7 @@ event_editor_construct (EventEditor *ee, ECal *client)
 	g_object_ref_sink (priv->recur_page);
 	gtk_container_add ((GtkContainer *) (GTK_DIALOG (priv->recur_window)->vbox), 
 			comp_editor_page_get_widget (COMP_EDITOR_PAGE (priv->recur_page)));
-	gtk_widget_show_all (priv->recur_window);
-	gtk_widget_hide (priv->recur_window);
+	gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (priv->recur_window)));
 	comp_editor_append_page (COMP_EDITOR (ee), COMP_EDITOR_PAGE (priv->recur_page), NULL, FALSE);
 	if (priv->is_meeting) {
 
diff --git a/calendar/gui/dialogs/event-page.glade b/calendar/gui/dialogs/event-page.glade
index 95fffa2eb8..1f6c727cf9 100644
--- a/calendar/gui/dialogs/event-page.glade
+++ b/calendar/gui/dialogs/event-page.glade
@@ -16,6 +16,7 @@
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
 
   <child>
     <widget class="GtkVBox" id="event-page">
@@ -145,11 +146,11 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="mnemonic_widget">organizer-entry</property>
 		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		  <property name="width_chars">-1</property>
 		  <property name="single_line_mode">False</property>
 		  <property name="angle">0</property>
-		  <property name="mnemonic_widget">organizer-entry</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
@@ -174,11 +175,11 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="mnemonic_widget">start-time</property>
 		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		  <property name="width_chars">-1</property>
 		  <property name="single_line_mode">False</property>
 		  <property name="angle">0</property>
-		  <property name="mnemonic_widget">start-time</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
@@ -958,7 +959,6 @@
 
 <widget class="GtkDialog" id="alarm-dialog">
   <property name="border_width">4</property>
-  <property name="visible">True</property>
   <property name="title" translatable="yes">Alarms</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index ef614ef1c0..f205a78d6f 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -436,8 +436,8 @@ task_editor_construct (TaskEditor *te, ECal *client)
 	g_object_ref_sink (priv->task_details_page);
 	gtk_container_add ((GtkContainer *) GTK_DIALOG(priv->task_details_window)->vbox, 
 		           comp_editor_page_get_widget ((CompEditorPage *)priv->task_details_page));
-	gtk_widget_show_all (priv->task_details_window);
-	gtk_widget_hide (priv->task_details_window);
+	gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (priv->task_details_window) ) );
+	/* gtk_widget_hide (priv->task_details_window); */
 	comp_editor_append_page (editor, COMP_EDITOR_PAGE (priv->task_details_page), NULL, FALSE);
 	
 	if (!e_cal_is_read_only (client, &read_only, NULL))
-- 
cgit v1.2.3