evolution r34965 - trunk/plugins/import-ics-attachments

[mcrha svn gnome org]

Author: mcrha
Date: Wed Feb  6 10:52:10 2008
New Revision: 34965
URL: http://svn.gnome.org/viewvc/evolution?rev=34965&view=rev

Log:
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.



Modified:
   trunk/plugins/import-ics-attachments/ChangeLog
   trunk/plugins/import-ics-attachments/icsimporter.c

Modified: trunk/plugins/import-ics-attachments/icsimporter.c
==============================================================================
--- trunk/plugins/import-ics-attachments/icsimporter.c	(original)
+++ trunk/plugins/import-ics-attachments/icsimporter.c	Wed Feb  6 10:52:10 2008
@@ -64,7 +64,6 @@
 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 @@
 			  "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 @@
 	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 @@
 
 		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 @@
 {
 	g_object_unref (icidata->client);
 	icalcomponent_free (icidata->icalcomp);
-	gtk_signal_emit_by_name (GTK_OBJECT (icidata->window), "close");
 	g_free (icidata);
 }