diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-02-14 09:36:22 +0800 |
|---|---|---|
| committer | Chandni Verma <chandniverma2112@gmail.com> | 2011-03-11 13:10:23 +0800 |
| commit | 4b7d2787c3d4487647628109e14a6618e3db8da8 (patch) | |
| tree | 71af717dea9addd4e08d124044736b7ff16d3dfd | |
| parent | 80d502ca384aaf07e2b572da7414d7ff36e91936 (diff) | |
| download | gsoc2013-empathy-4b7d2787c3d4487647628109e14a6618e3db8da8.tar gsoc2013-empathy-4b7d2787c3d4487647628109e14a6618e3db8da8.tar.gz gsoc2013-empathy-4b7d2787c3d4487647628109e14a6618e3db8da8.tar.bz2 gsoc2013-empathy-4b7d2787c3d4487647628109e14a6618e3db8da8.tar.lz gsoc2013-empathy-4b7d2787c3d4487647628109e14a6618e3db8da8.tar.xz gsoc2013-empathy-4b7d2787c3d4487647628109e14a6618e3db8da8.tar.zst gsoc2013-empathy-4b7d2787c3d4487647628109e14a6618e3db8da8.zip | |
Only destroy block confirmation dialogs after we've read out the abusive state
| -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 737a449d2..06481cf7d 100644 --- a/libempathy-gtk/empathy-contact-dialogs.c +++ b/libempathy-gtk/empathy-contact-dialogs.c @@ -556,8 +556,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 ( @@ -567,6 +565,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 1d3fcb8e2..e141182ba 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; } |