4 files changed, 5 insertions, 3 deletions
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index c72ba64342..ceecdae451 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -34,6 +34,7 @@ INCLUDES =						\
 	-I$(top_builddir)/addressbook/ename		\
 	-I$(top_builddir)/shell				\
 	-I$(top_srcdir)/shell				\
+	-DG_DISABLE_DEPRECATED				\
         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 privlib_LTLIBRARIES = libebook.la libebook-static.la
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
index deac7eee14..a26e133171 100644
--- a/addressbook/backend/pas/Makefile.am
+++ b/addressbook/backend/pas/Makefile.am
@@ -21,6 +21,7 @@ INCLUDES =						\
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/addressbook/backend		\
 	-I$(top_builddir)/addressbook/backend		\
+	-DG_DISABLE_DEPRECATED				\
         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 LDAP_SCHEMA =						\
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index 58e1a8405a..c5c8251ad9 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -1423,7 +1423,7 @@ pas_backend_file_load_uri (PASBackend             *backend,
 				char *create_initial_file;
 				char *dir;
 
-				dir = g_dirname(filename);
+				dir = g_path_get_dirname(filename);
 				create_initial_file = g_build_filename (dir, "create-initial", NULL);
 
 				if (g_file_test(create_initial_file, G_FILE_TEST_EXISTS)) {
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
index 5161ae0b63..c09495fb22 100644
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ b/addressbook/backend/pas/pas-backend-ldap.c
@@ -1020,7 +1020,7 @@ static void
 add_objectclass_mod (PASBackendLDAP *bl, GPtrArray *mod_array, GList *existing_objectclasses)
 {
 #define FIND_INSERT(oc) \
-	if (!g_list_find_custom (existing_objectclasses, (oc), (GCompareFunc)g_strcasecmp)) \
+	if (!g_list_find_custom (existing_objectclasses, (oc), (GCompareFunc)g_ascii_strcasecmp)) \
 	         g_ptr_array_add (objectclasses, g_strdup ((oc)))
 #define INSERT(oc) \
 		 g_ptr_array_add (objectclasses, g_strdup ((oc)))
@@ -2752,7 +2752,7 @@ build_card_from_entry (LDAP *ldap, LDAPMessage *e, GList **existing_objectclasse
 		}
 		else {
 			for (i = 0; i < num_prop_infos; i ++)
-				if (!g_strcasecmp (attr, prop_info[i].ldap_attr)) {
+				if (!g_ascii_strcasecmp (attr, prop_info[i].ldap_attr)) {
 					info = &prop_info[i];
 					break;
 				}