aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2008-10-17 20:47:04 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-10-17 20:47:04 +0800
commit983dfa055cd7519cfc3d97bd738789dd9a58fe58 (patch)
tree99439557347623b086c4537eb81016b57239728d /src
parent50c9c5545aed1088fcdc1a80c2e0e8a42b589df5 (diff)
downloadgsoc2013-empathy-983dfa055cd7519cfc3d97bd738789dd9a58fe58.tar
gsoc2013-empathy-983dfa055cd7519cfc3d97bd738789dd9a58fe58.tar.gz
gsoc2013-empathy-983dfa055cd7519cfc3d97bd738789dd9a58fe58.tar.bz2
gsoc2013-empathy-983dfa055cd7519cfc3d97bd738789dd9a58fe58.tar.lz
gsoc2013-empathy-983dfa055cd7519cfc3d97bd738789dd9a58fe58.tar.xz
gsoc2013-empathy-983dfa055cd7519cfc3d97bd738789dd9a58fe58.tar.zst
gsoc2013-empathy-983dfa055cd7519cfc3d97bd738789dd9a58fe58.zip
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> svn path=/trunk/; revision=1617
Diffstat (limited to 'src')
-rw-r--r--src/empathy-import-dialog.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index 45ee0b8a3..8d3582eff 100644
--- a/src/empathy-import-dialog.c
+++ b/src/empathy-import-dialog.c
@@ -444,6 +444,13 @@ import_dialog_tree_model_foreach (GtkTreeModel *model,
}
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 @@ import_dialog_button_ok_clicked_cb (GtkButton *button,
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