aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-03-06 18:50:49 +0800
committerMilan Crha <mcrha@src.gnome.org>2009-03-06 18:50:49 +0800
commit3ac551e993179c2e0af41cbfde49cd118c9a11a5 (patch)
tree6c4ea37364e711d7c013bbc8a306b83160160d73 /calendar/gui
parentf04e4e06d22dc1ab0dd25501d9199d7e5014dbf9 (diff)
downloadgsoc2013-evolution-3ac551e993179c2e0af41cbfde49cd118c9a11a5.tar
gsoc2013-evolution-3ac551e993179c2e0af41cbfde49cd118c9a11a5.tar.gz
gsoc2013-evolution-3ac551e993179c2e0af41cbfde49cd118c9a11a5.tar.bz2
gsoc2013-evolution-3ac551e993179c2e0af41cbfde49cd118c9a11a5.tar.lz
gsoc2013-evolution-3ac551e993179c2e0af41cbfde49cd118c9a11a5.tar.xz
gsoc2013-evolution-3ac551e993179c2e0af41cbfde49cd118c9a11a5.tar.zst
gsoc2013-evolution-3ac551e993179c2e0af41cbfde49cd118c9a11a5.zip
** Fix for bug #401346
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. svn path=/trunk/; revision=37376
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/dialogs/event-editor.c4
-rw-r--r--calendar/gui/e-meeting-time-sel.c5
2 files changed, 6 insertions, 3 deletions
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);