diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-02-14 09:36:22 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-02-14 09:36:22 +0800 |
| commit | a848bc5256e4c80371a11f5eae20679df11d0fc1 (patch) | |
| tree | 794b4c280bf98c2d7ce77031048d9bc4897ae5fe /libempathy-gtk | |
| parent | d48aea8bdaed274dfec7a46e092550067d7bd2ac (diff) | |
| download | gsoc2013-empathy-a848bc5256e4c80371a11f5eae20679df11d0fc1.tar gsoc2013-empathy-a848bc5256e4c80371a11f5eae20679df11d0fc1.tar.gz gsoc2013-empathy-a848bc5256e4c80371a11f5eae20679df11d0fc1.tar.bz2 gsoc2013-empathy-a848bc5256e4c80371a11f5eae20679df11d0fc1.tar.lz gsoc2013-empathy-a848bc5256e4c80371a11f5eae20679df11d0fc1.tar.xz gsoc2013-empathy-a848bc5256e4c80371a11f5eae20679df11d0fc1.tar.zst gsoc2013-empathy-a848bc5256e4c80371a11f5eae20679df11d0fc1.zip | |
Only destroy block confirmation dialogs after we've read out the abusive state
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-contact-dialogs.c | 3 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-dialogs.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c index b9bf7e050..2f23a9163 100644 --- a/libempathy-gtk/empathy-contact-dialogs.c +++ b/libempathy-gtk/empathy-contact-dialogs.c @@ -532,8 +532,6 @@ empathy_block_contact_dialog_show (GtkWindow *parent, } res = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - if (abusive != NULL) { if (abusive_check != NULL) { *abusive = gtk_toggle_button_get_active ( @@ -543,6 +541,7 @@ empathy_block_contact_dialog_show (GtkWindow *parent, } } + gtk_widget_destroy (dialog); g_object_unref (manager); return res == GTK_RESPONSE_REJECT; diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c index e32ff05b6..22af8d567 100644 --- a/libempathy-gtk/empathy-individual-dialogs.c +++ b/libempathy-gtk/empathy-individual-dialogs.c @@ -240,7 +240,6 @@ empathy_block_individual_dialog_show (GtkWindow *parent, g_string_free (str, TRUE); res = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); if (abusive != NULL) { @@ -251,5 +250,7 @@ empathy_block_individual_dialog_show (GtkWindow *parent, *abusive = FALSE; } + gtk_widget_destroy (dialog); + return res == GTK_RESPONSE_REJECT; } |