4 files changed, 8 insertions, 21 deletions
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 9fe23fe525..f7827413b7 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -902,13 +902,9 @@ show_options (Dialog *dialog)
 #endif
 
 static void
-addressbook_clicked_cb (GtkWidget *widget, gpointer data)
+addressbook_clicked_cb (GtkWidget *widget, Dialog *dialog)
 {
-	Dialog *dialog = data;
-	ENameSelectorDialog *name_selector_dialog;
-
-	name_selector_dialog = e_name_selector_peek_dialog (dialog->name_selector);
-	gtk_widget_show (GTK_WIDGET (name_selector_dialog));
+	e_name_selector_show_dialog (dialog->name_selector, dialog->toplevel);
 }
 
 static void
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index 551229cc6d..b45f587d57 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -189,13 +189,9 @@ static void
 addressbook_clicked_cb (GtkWidget *widget, gpointer data)
 {
 	EDelegateDialog *edd = data;
-	EDelegateDialogPrivate *priv;
-	ENameSelectorDialog *name_selector_dialog;
 
-	priv = edd->priv;
-
-	name_selector_dialog = e_name_selector_peek_dialog (priv->name_selector);
-	gtk_widget_show (GTK_WIDGET (name_selector_dialog));
+	e_name_selector_show_dialog (edd->priv->name_selector,
+				     e_delegate_dialog_get_toplevel (edd));
 }
 
 static void
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 27270fd592..735566b837 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -973,11 +973,8 @@ static void
 to_button_clicked_cb (GtkButton *button,
                       MemoPage *mpage)
 {
-	ENameSelectorDialog *name_selector_dialog;
-
-	name_selector_dialog = e_name_selector_peek_dialog (
-		mpage->priv->name_selector);
-	gtk_widget_show (GTK_WIDGET (name_selector_dialog));
+	e_name_selector_show_dialog (mpage->priv->name_selector,
+				     mpage->priv->main);
 }
 
 static void
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index b58122124a..686d43c65d 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -945,10 +945,8 @@ name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpoin
 void
 e_meeting_list_view_invite_others_dialog (EMeetingListView *view)
 {
-	ENameSelectorDialog *dialog;
-
-	dialog = e_name_selector_peek_dialog (view->priv->name_selector);
-	gtk_widget_show (GTK_WIDGET (dialog));
+	e_name_selector_show_dialog (view->priv->name_selector,
+				     GTK_WIDGET (view));
 }
 
 void