aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2012-08-08 17:59:49 +0800
committerMilan Crha <mcrha@redhat.com>2012-08-08 17:59:49 +0800
commit5f0b2dd1d8182d99dda623d5a8bbc4acdc05e0a4 (patch)
treed0ba033c65f46f7ff0637e4f4c55e3d7386882f4 /calendar
parente45c63f52b1d01bb5b721905d1c68451dbb94303 (diff)
downloadgsoc2013-evolution-5f0b2dd1d8182d99dda623d5a8bbc4acdc05e0a4.tar
gsoc2013-evolution-5f0b2dd1d8182d99dda623d5a8bbc4acdc05e0a4.tar.gz
gsoc2013-evolution-5f0b2dd1d8182d99dda623d5a8bbc4acdc05e0a4.tar.bz2
gsoc2013-evolution-5f0b2dd1d8182d99dda623d5a8bbc4acdc05e0a4.tar.lz
gsoc2013-evolution-5f0b2dd1d8182d99dda623d5a8bbc4acdc05e0a4.tar.xz
gsoc2013-evolution-5f0b2dd1d8182d99dda623d5a8bbc4acdc05e0a4.tar.zst
gsoc2013-evolution-5f0b2dd1d8182d99dda623d5a8bbc4acdc05e0a4.zip
Bug #559815 - Empty Reminders editor when opened second time
Diffstat (limited to 'calendar')
-rw-r--r--calendar/gui/dialogs/event-page.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 437af2da8e..d8d0711ab1 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -918,6 +918,11 @@ event_page_dispose (GObject *object)
priv->sod = NULL;
}
+ if (priv->alarm_dialog) {
+ gtk_widget_destroy (priv->alarm_dialog);
+ priv->alarm_dialog = NULL;
+ }
+
/* Chain up to parent's dispose() method. */
G_OBJECT_CLASS (event_page_parent_class)->dispose (object);
}
@@ -3200,6 +3205,15 @@ alarm_custom_clicked_cb (GtkWidget *widget,
}
#endif
+static gboolean
+alarm_dialog_delete_event_cb (GtkWidget *alarm_dialog)
+{
+ gtk_widget_hide (alarm_dialog);
+
+ /* stop processing other handlers */
+ return TRUE;
+}
+
/* Hooks the widget signals */
static gboolean
init_widgets (EventPage *epage)
@@ -3347,7 +3361,7 @@ init_widgets (EventPage *epage)
G_CALLBACK (gtk_widget_hide), priv->alarm_dialog);
g_signal_connect (
priv->alarm_dialog, "delete-event",
- G_CALLBACK (gtk_widget_hide), priv->alarm_dialog);
+ G_CALLBACK (alarm_dialog_delete_event_cb), priv->alarm_dialog);
priv->alarm_list_dlg_widget = alarm_list_dialog_peek (
registry, client, priv->alarm_list_store);
gtk_widget_reparent (priv->alarm_list_dlg_widget, priv->alarm_box);