diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/import-ics-attachments/ChangeLog | 8 | ||||
| -rw-r--r-- | plugins/import-ics-attachments/icsimporter.c | 14 |
2 files changed, 9 insertions, 13 deletions
diff --git a/plugins/import-ics-attachments/ChangeLog b/plugins/import-ics-attachments/ChangeLog index c772527ba8..c58460b719 100644 --- a/plugins/import-ics-attachments/ChangeLog +++ b/plugins/import-ics-attachments/ChangeLog @@ -1,3 +1,11 @@ +2008-02-06 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #514622 + + * icsimporter.c: (dialog_close_cb): Drop this function. + * icsimporter.c: (init_widgets), (dialog_response_cb), + (ical_import_done): Do not call "close" on already closed dialog. + 2007-10-01 Milan Crha <mcrha@redhat.com> * icsimporter.c: (prepare_events), (prepare_tasks): diff --git a/plugins/import-ics-attachments/icsimporter.c b/plugins/import-ics-attachments/icsimporter.c index dbcb597a20..093d95e3d0 100644 --- a/plugins/import-ics-attachments/icsimporter.c +++ b/plugins/import-ics-attachments/icsimporter.c @@ -64,7 +64,6 @@ static void prepare_tasks (icalcomponent *icalcomp, GList *vtodos); static void import_items(ICalImporterData *icidata); static gboolean update_objects (ECal *client, icalcomponent *icalcomp); static void dialog_response_cb (GtkDialog *dialog, gint response_id, ICalImporterData *icidata); -static void dialog_close_cb (GtkDialog *dialog, ICalImporterData *icidata); static void ical_import_done(ICalImporterData *icidata); static void init_widgets (char *path); static icalcomponent_kind get_menu_type (void *data); @@ -212,10 +211,6 @@ init_widgets(char *path) "response", G_CALLBACK (dialog_response_cb), icidata); - g_signal_connect (dialog, - "close", - G_CALLBACK (dialog_close_cb), - icidata); vbox = GTK_DIALOG(dialog)->vbox; hbox = gtk_hbox_new (FALSE, FALSE); @@ -275,6 +270,7 @@ init_widgets(char *path) gtk_window_set_default_size (GTK_WINDOW (dialog), 210,340); gtk_widget_show_all (dialog); gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); } static void @@ -287,17 +283,10 @@ dialog_response_cb (GtkDialog *dialog, gint response_id, ICalImporterData *icida case GTK_RESPONSE_CANCEL : case GTK_RESPONSE_DELETE_EVENT : - gtk_signal_emit_by_name ((GtkObject *)dialog, "close"); break; } } -static void -dialog_close_cb (GtkDialog *dialog, ICalImporterData *icidata) -{ - gtk_widget_destroy ((GtkWidget *)dialog); -} - /* This removes all components except VEVENTs and VTIMEZONEs from the toplevel */ static void prepare_events (icalcomponent *icalcomp, GList **vtodos) @@ -421,7 +410,6 @@ ical_import_done(ICalImporterData *icidata) { g_object_unref (icidata->client); icalcomponent_free (icidata->icalcomp); - gtk_signal_emit_by_name (GTK_OBJECT (icidata->window), "close"); g_free (icidata); } |