[evolution/webkit: 167/196] Fix build after rebase
- From: Dan VrÃtil <dvratil src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/webkit: 167/196] Fix build after rebase
- Date: Tue, 27 Mar 2012 16:14:45 +0000 (UTC)
commit b2e69a3cce5ae8608012cee0ed8d39598c13659f
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 | 4 ++--
widgets/misc/e-contact-map.c | 4 ++--
widgets/misc/e-contact-marker.c | 4 ++--
4 files changed, 9 insertions(+), 11 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 d80aa17..38fe56c 100644
--- a/widgets/misc/e-contact-map-window.c
+++ b/widgets/misc/e-contact-map-window.c
@@ -40,8 +40,8 @@
#include <glib-object.h>
#define E_CONTACT_MAP_WINDOW_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE \
- ((obj), E_TYPE_CONTACT_MAP, EContactMapWindowPrivate))
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), E_TYPE_CONTACT_MAP_WINDOW, EContactMapWindowPrivate))
G_DEFINE_TYPE (EContactMapWindow, e_contact_map_window, GTK_TYPE_WINDOW)
diff --git a/widgets/misc/e-contact-map.c b/widgets/misc/e-contact-map.c
index b9c2a99..6e20ac1 100644
--- a/widgets/misc/e-contact-map.c
+++ b/widgets/misc/e-contact-map.c
@@ -43,8 +43,8 @@
#include <math.h>
#define E_CONTACT_MAP_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE \
- ((obj), E_TYPE_CONTACT_MAP, EContactMapPrivate))
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), E_TYPE_CONTACT_MAP, EContactMapPrivate))
G_DEFINE_TYPE (EContactMap, e_contact_map, GTK_CHAMPLAIN_TYPE_EMBED)
diff --git a/widgets/misc/e-contact-marker.c b/widgets/misc/e-contact-marker.c
index d7e5ad6..98f1ea1 100644
--- a/widgets/misc/e-contact-marker.c
+++ b/widgets/misc/e-contact-marker.c
@@ -39,8 +39,8 @@
#include <string.h>
#define E_CONTACT_MARKER_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE \
- ((obj), E_TYPE_CONTACT_MARKER, EContactMarkerPrivate))
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), E_TYPE_CONTACT_MARKER, EContactMarkerPrivate))
G_DEFINE_TYPE (EContactMarker, e_contact_marker, CHAMPLAIN_TYPE_LABEL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]