From d0c328172f7e59ea95cc1ba3b167bacdbe9f9d2e Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Fri, 24 Aug 2012 14:06:23 +0200
Subject: [PATCH] Adressbook-popup: set link using the template.

---
 webcit/addressbook_popup.c | 14 --------------
 webcit/event.c             |  3 ++-
 webcit/webcit.h            |  1 -
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index 887198f57..72ab054d0 100644
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -15,20 +15,6 @@
 #include "webcit.h"
 
 
-/*
- * Call this right before wDumpContent() on any page which requires the address book popup
- */
-void address_book_popup(void) {
-	/* Open a new div, hidden initially, for address book popups. */
-	wc_printf("</div>\n");	/* End of 'content' div */
-	wc_printf("<div id=\"address_book_popup\" style=\"display:none;\">");
-	wc_printf("<div id=\"address_book_popup_container_div\">");
-	wc_printf("<div id=\"address_book_popup_middle_div\"></div>");
-	wc_printf("<div id=\"address_book_inner_div\"></div>");
-	wc_printf("</div>");
-	/* The 'address_book_popup' div will be closed by wDumpContent() */
-}
-
 /*
  * Address book popup window
  */
diff --git a/webcit/event.c b/webcit/event.c
index c3c2ba3d6..6d6bb5619 100644
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -779,7 +779,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 		"RecurrenceShowHide();		\n"
 		"EnableOrDisableCheckButton();	\n"
 	);
-	address_book_popup();
+	do_template("addressbook_popup");
+
 	wDumpContent(1);
 
 	if (created_new_vevent) {
diff --git a/webcit/webcit.h b/webcit/webcit.h
index 65f2d11dc..5fa6ddf61 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -677,7 +677,6 @@ void output_html(const char *, int, int, StrBuf *, StrBuf *);
 ssize_t write(int fd, const void *buf, size_t count);
 void cal_process_attachment(wc_mime_attachment *Mime);
 
-void address_book_popup(void);
 void begin_ajax_response(void);
 void end_ajax_response(void);
 
-- 
2.30.2