Merge branch 'master' into kill-bonobo

5 files changed, 15 insertions, 23 deletions

diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index 860a70a3d5..79221d4573 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -286,7 +286,9 @@ backup_restore_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 
 	page = gnome_druid_page_standard_new_with_vals (_("Restore from backup"), NULL, NULL);
 	hbox = gtk_hbox_new (FALSE, 6);
-	label = gtk_label_new (_("You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. \nIt also restores all your personal settings, mail filters etc."));
+	label = gtk_label_new (_("You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."));
+	gtk_label_set_line_wrap ((GtkLabel *)label, TRUE);
+	gtk_label_set_single_line_mode ((GtkLabel *)label, FALSE);
 	gtk_box_pack_start ((GtkBox *)hbox, label, FALSE, FALSE, 6);
 	box = gtk_vbox_new (FALSE, 6);
 	gtk_box_pack_start ((GtkBox *)box, hbox, FALSE, FALSE, 0);
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index d1f8fabb34..5507568809 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -48,12 +48,10 @@ static gchar *
 format_date (const gchar * value)
 {
 	time_t time;
-	time_t actual_time;
 	gchar *str;
 
 	time = e_gw_connection_get_date_from_string (value);
-	actual_time = camel_header_decode_date (ctime(&time), NULL);
-	str = ctime (&actual_time);
+	str = ctime (&time);
 
 	str [strlen(str)-1] = '\0';
 	return str;
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 674c8cd486..f409f8831a 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -9,12 +9,11 @@ AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\
 	$(EVOLUTION_MAIL_CFLAGS)		\
-	$(LIBNOTIFY_CFLAGS)			
+	$(LIBNOTIFY_CFLAGS)
 
-if ENABLE_DBUS
+if DBUS_SUPPORT
 AM_CPPFLAGS += 	-DDBUS_API_SUBJECT_TO_CHANGE=1		\
-		-DFOUND_DBUS_VERSION=$(FOUND_DBUS_VERSION)          \
-		$(NMN_CFLAGS)
+		$(DBUS_GLIB_CFLAGS)
 endif
 
 @EVO_PLUGIN_RULE@
@@ -31,8 +30,8 @@ liborg_gnome_mail_notification_la_LIBADD = 		\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(GNOME_PLATFORM_LIBS)
 
-if ENABLE_DBUS
-liborg_gnome_mail_notification_la_LIBADD += $(NMN_LIBS)
+if DBUS_SUPPORT
+liborg_gnome_mail_notification_la_LIBADD += $(DBUS_GLIB_LIBS)
 endif 
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 46b434b65f..b0a0aa279e 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -136,24 +136,13 @@ send_dbus_message (const gchar *name, const gchar *data, guint new)
 		return;
 
 	/* Appends the data as an argument to the message */
-	dbus_message_append_args (message,
-#if FOUND_DBUS_VERSION >= 310
-				  DBUS_TYPE_STRING, &data,
-#else
-				  DBUS_TYPE_STRING, data,
-#endif
-				  DBUS_TYPE_INVALID);
+	dbus_message_append_args (message, DBUS_TYPE_STRING, &data, DBUS_TYPE_INVALID);
 
 	if (new) {
 		gchar * display_name = em_utils_folder_name_from_uri (data);
 		dbus_message_append_args (message,
-#if FOUND_DBUS_VERSION >= 310
 					  DBUS_TYPE_STRING, &display_name, DBUS_TYPE_UINT32, &new,
-#else
-					  DBUS_TYPE_STRING, display_name, DBUS_TYPE_UINT32, new,
-#endif
 					  DBUS_TYPE_INVALID);
-
 	}
 
 	/* Sends the message */
diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
index 7fc20b9dc1..0aafc8c82d 100644
--- a/plugins/vcard-inline/vcard-inline.c
+++ b/plugins/vcard-inline/vcard-inline.c
@@ -87,6 +87,7 @@ org_gnome_vcard_inline_decode (VCardInlinePObject *vcard_object,
 	GList *contact_list;
 	GByteArray *array;
 	const gchar *string;
+	const guint8 padding[2] = {0};
 
 	array = g_byte_array_new ();
 	medium = CAMEL_MEDIUM (mime_part);
@@ -96,11 +97,14 @@ org_gnome_vcard_inline_decode (VCardInlinePObject *vcard_object,
 	data_wrapper = camel_medium_get_content_object (medium);
 	camel_data_wrapper_decode_to_stream (data_wrapper, stream);
 
+	/* because the result is not NULL-terminated */
+	g_byte_array_append (array, padding, 2);
+
 	string = (gchar *) array->data;
 	contact_list = eab_contact_list_from_string (string);
 	vcard_object->contact_list = contact_list;
 
-	camel_object_unref (data_wrapper);
+	camel_object_unref (mime_part);
 	camel_object_unref (stream);
 }