[evolution/webkit: 167/182] Fix build after rebase

[Dan VrÃtil <dvratil src gnome org>]

commit 1660c5a7994868fa3df73afe412833639b2d8f84
Author: Dan VrÃtil <dvratil redhat com>
Date:   Thu Feb 23 20:52:37 2012 +0100

    Fix build after rebase

 mail/em-format-html-display.c       |    8 +++-----
 widgets/misc/e-contact-map-window.c |    5 +++++
 widgets/misc/e-contact-map.c        |    5 +++++
 widgets/misc/e-contact-marker.c     |    4 ++++
 4 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 2c6c422..1c37437 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -382,12 +382,10 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button,
 	g_object_unref (builder);
 
 	g_signal_connect (
-	        part_widget, "response", 
-		G_CALLBACK(efhd_xpkcs7mime_info_response), emps);
-	gtk_widget_show (part_widget);
+	        po->widget, "response",
+		G_CALLBACK(efhd_xpkcs7mime_info_response), po);
 
-	g_object_unref (part_widget);
-	camel_cipher_validity_free (validity);
+	gtk_widget_show (po->widget);
 }
 
 static GtkWidget*
diff --git a/widgets/misc/e-contact-map-window.c b/widgets/misc/e-contact-map-window.c
index 87ce665..2af97ac 100644
--- a/widgets/misc/e-contact-map-window.c
+++ b/widgets/misc/e-contact-map-window.c
@@ -39,6 +39,11 @@
 #include <glib/gi18n.h>
 #include <glib-object.h>
 
+#define E_CONTACT_MAP_WINDOW_GET_PRIVATE(obj) \
+        (G_TYPE_INSTANCE_GET_PRIVATE \
+        ((obj), E_TYPE_CONTACT_MAP_WINDOW, EContactMapWindowPrivate))
+
+
 G_DEFINE_TYPE (EContactMapWindow, e_contact_map_window, GTK_TYPE_WINDOW)
 
 struct _EContactMapWindowPrivate {
diff --git a/widgets/misc/e-contact-map.c b/widgets/misc/e-contact-map.c
index 7158aae..31c114d 100644
--- a/widgets/misc/e-contact-map.c
+++ b/widgets/misc/e-contact-map.c
@@ -42,6 +42,11 @@
 #include <glib/gi18n.h>
 #include <math.h>
 
+#define E_CONTACT_MAP_GET_PRIVATE(obj) \
+        (G_TYPE_INSTANCE_GET_PRIVATE \
+        ((obj), E_TYPE_CONTACT_MAP, EContactMapPrivate))
+
+
 G_DEFINE_TYPE (EContactMap, e_contact_map, GTK_CHAMPLAIN_TYPE_EMBED)
 
 struct _EContactMapPrivate {
diff --git a/widgets/misc/e-contact-marker.c b/widgets/misc/e-contact-marker.c
index 2f7c2cb..98f1ea1 100644
--- a/widgets/misc/e-contact-marker.c
+++ b/widgets/misc/e-contact-marker.c
@@ -38,6 +38,10 @@
 #include <math.h>
 #include <string.h>
 
+#define E_CONTACT_MARKER_GET_PRIVATE(obj) \
+        (G_TYPE_INSTANCE_GET_PRIVATE \
+        ((obj), E_TYPE_CONTACT_MARKER, EContactMarkerPrivate))
+
 G_DEFINE_TYPE (EContactMarker, e_contact_marker, CHAMPLAIN_TYPE_LABEL);
 
 struct _EContactMarkerPrivate