From e06b88c4fda627599d7c1a33ddec0a35a4374e4f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 13 Oct 2009 16:24:10 +0200 Subject: Bug #594471 - Shouldn't call e_error_new/run with NULL 'parent' --- addressbook/gui/contact-list-editor/e-contact-list-editor.c | 3 ++- addressbook/gui/contact-list-editor/e-contact-list-model.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/contact-list-editor') diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 77d91357c5..73b5dcd7cf 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -25,6 +25,7 @@ #include "e-contact-list-editor.h" #include #include +#include "shell/e-shell.h" #include @@ -259,7 +260,7 @@ contact_list_editor_contact_exists (EContactListModel *model, if (!e_contact_list_model_has_email (model, email)) return FALSE; - return (e_error_run (NULL, tag, email, NULL) != GTK_RESPONSE_YES); + return (e_error_run (e_shell_get_active_window (NULL), tag, email, NULL) != GTK_RESPONSE_YES); } static void diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c index d43e895570..a5fc9937ac 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-model.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c @@ -24,6 +24,7 @@ #include "e-contact-list-model.h" #include "e-util/e-error.h" +#include "shell/e-shell.h" static gpointer parent_class; @@ -152,7 +153,7 @@ e_contact_list_model_add_email (EContactListModel *model, g_return_if_fail (email != NULL); if (e_contact_list_model_has_email (model, email)) - if (e_error_run (NULL, tag, email, NULL) != GTK_RESPONSE_YES) + if (e_error_run (e_shell_get_active_window (NULL), tag, email, NULL) != GTK_RESPONSE_YES) return; destination = e_destination_new (); -- cgit v1.2.3