aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog9
-rw-r--r--calendar/gui/dialogs/event-editor.c4
-rw-r--r--calendar/gui/e-meeting-time-sel.c5
3 files changed, 15 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index b38d2dd1f4..c75fad74f1 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
2009-03-05 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #435455 (bnc)
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index b95493b7f7..a579d77348 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -113,7 +113,7 @@ create_schedule_page (CompEditor *editor)
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 @@ action_free_busy_cb (GtkAction *action,
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
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 1589e983e2..8466dc3014 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -826,7 +826,10 @@ e_meeting_time_selector_destroy (GtkObject *object)
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);