Forgot to commit some bits.

4 files changed, 11 insertions, 5 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 38490aee72..3194eec943 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -3461,6 +3461,15 @@ expand_phone_toggle (EContactEditor *ce)
 }
 
 static void
+expand_mail_toggle (EContactEditor *ce)
+{
+	GtkWidget *mail;
+
+	mail = e_builder_get_widget (ce->builder, "entry-email-4");
+	expand_mail (ce, !gtk_widget_get_visible (mail));
+}
+
+static void
 e_contact_editor_init (EContactEditor *e_contact_editor)
 {
 	GtkBuilder *builder;
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 0242d20c02..0feced4ca0 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -608,7 +608,7 @@ e_contact_quick_add_email (const gchar *email, EContactQuickAddCallback cb, gpoi
 		name = g_strndup (email, lt - email);
 		addr = g_strndup (lt + 1, gt - lt - 1);
 	} else {
-		addr = email;
+		addr = g_strdup (email);
 	}
 
 	e_contact_quick_add (name, addr, cb, closure);
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index bd2eea61e9..ae79698efd 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -2087,6 +2087,7 @@ create_exception_dialog (RecurrencePage *rpage, const gchar *title, GtkWidget **
 	RecurrencePagePrivate *priv;
 	GtkWidget *dialog, *toplevel;
 	CompEditor *editor;
+	GtkWidget *container;
 
 	priv = rpage->priv;
 
diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c
index ebe72bf629..a5ec67d4c4 100644
--- a/modules/mail/e-mail-shell-sidebar.c
+++ b/modules/mail/e-mail-shell-sidebar.c
@@ -196,11 +196,7 @@ guess_screen_width (EMailShellSidebar *sidebar)
 		GdkRectangle rect;
 
 		toplevel = gtk_widget_get_toplevel (widget);
-#if GTK_CHECK_VERSION(2,19,7)
 		if (toplevel && gtk_widget_get_realized (toplevel))
-#else
-		if (toplevel && GTK_WIDGET_REALIZED (toplevel))
-#endif
 			monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (toplevel));
 		else {
 			/* We don't know in which monitor the window manager