empathy r1617 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Oct 17 12:47:04 2008
New Revision: 1617
URL: http://svn.gnome.org/viewvc/empathy?rev=1617&view=rev

Log:
Added import_dialog_free and actually destroy the importer when finished importing or when cancelled. (Jonny Lamb)

Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

Modified:
   trunk/src/empathy-import-dialog.c

Modified: trunk/src/empathy-import-dialog.c
==============================================================================
--- trunk/src/empathy-import-dialog.c	(original)
+++ trunk/src/empathy-import-dialog.c	Fri Oct 17 12:47:04 2008
@@ -444,6 +444,13 @@
 }
 
 static void
+import_dialog_free (EmpathyImportDialog *dialog)
+{
+  gtk_widget_destroy (dialog->window);
+  g_slice_free (EmpathyImportDialog, dialog);
+}
+
+static void
 import_dialog_button_ok_clicked_cb (GtkButton *button,
                                     EmpathyImportDialog *dialog)
 {
@@ -464,14 +471,14 @@
   gtk_dialog_run (GTK_DIALOG (message));
   gtk_widget_destroy (message);
 
-  gtk_widget_hide (GTK_WIDGET (dialog->window));
+  import_dialog_free (dialog);
 }
 
 static void
 import_dialog_button_cancel_clicked_cb (GtkButton *button,
                                         EmpathyImportDialog *dialog)
 {
-  gtk_widget_hide (GTK_WIDGET (dialog->window));
+  import_dialog_free (dialog);
 }
 
 static void