rename contacts.h to contacts-ofono-efl.h to avoid clash on tizen.

Tizen libraries are bad and do not have proper namespace in them,
conflicting with our own project (that does not have a namespace as
it's not meant to be used by external peers).

diff --git a/Makefile.am b/Makefile.am
index d918206..ec2a443 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_DIST =
 noinst_LTLIBRARIES = utils/libofono-efl-utils.la
 
 utils_libofono_efl_utils_la_SOURCES = \
-       utils/contacts.h \
+       utils/contacts-ofono-efl.h \
        utils/log.h \
        utils/ofono.c \
        utils/ofono.h \

diff --git a/dialer/gui.h b/dialer/gui.h
index 8939bcf..22f5afe 100644 (file)
--- a/dialer/gui.h
+++ b/dialer/gui.h
@@ -1,7 +1,7 @@
 #ifndef _EFL_OFONO_GUI_H__
 #define _EFL_OFONO_GUI_H__ 1
 
-#include "contacts.h"
+#include "contacts-ofono-efl.h"
 #include "ofono.h"
 
 Evas_Object *gui_simple_popup(const char *title, const char *message);

diff --git a/utils/contacts.h b/utils/contacts-ofono-efl.h
similarity index 100%
rename from utils/contacts.h
rename to utils/contacts-ofono-efl.h

diff --git a/utils/contacts-tizen.c b/utils/contacts-tizen.c
index 5554d64..81a3bf5 100644 (file)
--- a/utils/contacts-tizen.c
+++ b/utils/contacts-tizen.c
@@ -10,7 +10,7 @@
 
 #include "log.h"
 #include "ofono.h"
-#include "contacts.h"
+#include "contacts-ofono-efl.h"
 #include "util.h"
 
 typedef struct _Contacts {

diff --git a/utils/contacts.c b/utils/contacts.c
index 3cb10f3..3dd14b9 100644 (file)
--- a/utils/contacts.c
+++ b/utils/contacts.c
@@ -7,7 +7,7 @@
 
 #include "log.h"
 #include "ofono.h"
-#include "contacts.h"
+#include "contacts-ofono-efl.h"
 #include "util.h"
 
 #ifndef EET_COMPRESSION_DEFAULT