evolution r37376 - in trunk/calendar: . gui gui/dialogs

[mcrha svn gnome org]

Author: mcrha
Date: Fri Mar  6 10:50:49 2009
New Revision: 37376
URL: http://svn.gnome.org/viewvc/evolution?rev=37376&view=rev

Log:
2009-03-06  Milan Crha  <mcrha redhat com>

	** Fix for bug #401346

	* gui/e-meeting-time-sel.c: (e_meeting_time_selector_destroy):
	Do not remove notification twice.
	* gui/dialogs/event-editor.c: (create_schedule_page),
	(action_free_busy_cb): Do not show Free/Busy dialog modal.



Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/gui/dialogs/event-editor.c
   trunk/calendar/gui/e-meeting-time-sel.c

Modified: trunk/calendar/gui/dialogs/event-editor.c
==============================================================================
--- trunk/calendar/gui/dialogs/event-editor.c	(original)
+++ trunk/calendar/gui/dialogs/event-editor.c	Fri Mar  6 10:50:49 2009
@@ -113,7 +113,7 @@
 	priv = EVENT_EDITOR_GET_PRIVATE (editor);
 
 	priv->sched_window = gtk_dialog_new_with_buttons (
-		_("Free/Busy"), GTK_WINDOW (editor), GTK_DIALOG_MODAL,
+		_("Free/Busy"), GTK_WINDOW (editor), GTK_DIALOG_DESTROY_WITH_PARENT,
 		GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
 
 	g_signal_connect (
@@ -168,7 +168,7 @@
 	if (editor->priv->sched_window == NULL)
 		create_schedule_page (COMP_EDITOR (editor));
 	else
-		gtk_widget_show (editor->priv->sched_window);
+		gtk_window_present (GTK_WINDOW (editor->priv->sched_window));
 }
 
 static void

Modified: trunk/calendar/gui/e-meeting-time-sel.c
==============================================================================
--- trunk/calendar/gui/e-meeting-time-sel.c	(original)
+++ trunk/calendar/gui/e-meeting-time-sel.c	Fri Mar  6 10:50:49 2009
@@ -826,7 +826,10 @@
 	mts->display_top = NULL;
 	mts->display_main = NULL;
 
-	calendar_config_remove_notification (mts->fb_uri_not);
+	if (mts->fb_uri_not) {
+		calendar_config_remove_notification (mts->fb_uri_not);
+		mts->fb_uri_not = 0;
+	}
 
 	if (mts->fb_refresh_not != 0) {
 		g_source_remove (mts->fb_refresh_not);