Commit 0cbfde6b authored by Alexandre Savard's avatar Alexandre Savard

#5994: Move addressbook folder from contacts to plugin folder

parent e7adc365
SUBDIRS = src pixmaps webkit tests man po doc
SUBDIRS = src pixmaps webkit tests man po doc plugin
CFLAGS=-Wall -Werror -Wextra
......
......@@ -84,11 +84,12 @@ src/Makefile
src/config/Makefile
src/dbus/Makefile
src/contacts/Makefile
src/contacts/addressbook/Makefile
src/widget/Makefile
src/icons/Makefile
pixmaps/Makefile
webkit/Makefile
plugin/addressbook/Makefile
plugin/Makefile
sflphone.desktop
tests/Makefile
man/Makefile
......
include ../../../globals.mak
include ../../globals.mak
noinst_PROGRAMS = libevladdrbook.so
......
......@@ -30,6 +30,7 @@
#include <string.h>
#include <stdio.h>
#include "eds.h"
#include "addressbook.h"
#include "searchbar.h"
#include "addressbook-config.h"
......
......@@ -41,7 +41,9 @@
#include <glib/gtypes.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libebook/e-book.h>
#include <sflphone_const.h>
#include "addressbook.h"
#include "sflphone_const.h"
#define EMPTY_ENTRY "empty"
......@@ -57,6 +59,7 @@ int current_search_id;
/**
* Represent a contact entry
*/
/*
typedef struct _Hit {
gchar *name;
GdkPixbuf *photo;
......@@ -64,10 +67,11 @@ typedef struct _Hit {
gchar *phone_home;
gchar *phone_mobile;
} Hit;
*/
/**
* Book structure for "outside world"
*/
/*
typedef struct {
gchar *uid;
gchar *uri;
......@@ -75,7 +79,7 @@ typedef struct {
gboolean active;
gboolean isdefault;
} book_data_t;
*/
/**
* Free a contact entry
......
......@@ -31,7 +31,7 @@
#include "addressbook-config.h"
#include "searchbar.h"
#include "contacts/addrbookfactory.h"
#include "contacts/addressbook/eds.h"
// #include "contacts/addressbook/eds.h"
#include <string.h>
#include <stdlib.h>
......
include ../../globals.mak
SUBDIRS = addressbook
noinst_LTLIBRARIES = libcontacts.la
libcontacts_la_SOURCES = \
......@@ -23,4 +21,3 @@ libcontacts_la_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) \
$(LIBEDATASERVER_CFLAGS) $(LIBEDATASERVERUI_CFLAGS) $(LIBGNOMEUI_CFLAGS) \
$(GNOMEDOCUTILS_CFLAGS)
libcontacts_la_LIBADD = ./addressbook/libevladdrbook.so
......@@ -36,7 +36,6 @@
#include <gtk/gtk.h>
#include "addressbook.h"
typedef struct _addrbookfactory {
gboolean is_loaded;
AddrBookHandle *addrbook;
......
......@@ -39,10 +39,35 @@
#define __ADDRESSBOOK_H__
#include <gtk/gtk.h>
#include <addressbook/eds.h>
// #include <addressbook/eds.h>
#define EMPTY_ENTRY "empty"
typedef enum {ABOOK_QUERY_IS, ABOOK_QUERY_BEGINS_WITH, ABOOK_QUERY_CONTAINS} AddrbookSearchType;
/**
* Represent a contact entry
*/
typedef struct _Hit {
gchar *name;
GdkPixbuf *photo;
gchar *phone_business;
gchar *phone_home;
gchar *phone_mobile;
} Hit;
/**
* Book structure for "outside world"
*/
typedef struct {
gchar *uid;
gchar *uri;
gchar *name;
gboolean active;
gboolean isdefault;
} book_data_t;
typedef struct _AddressBook_Config {
// gint64: a signed integer guaranteed to be 64 bits on all platforms
// To print or scan values of this type, use G_GINT64_MODIFIER and/or G_GINT64_FORMAT
......
......@@ -35,7 +35,7 @@
#include <calltree.h>
#include <config/addressbook-config.h>
#include <contacts/addressbook.h>
#include <contacts/addressbook/eds.h>
// #include <contacts/addressbook/eds.h>
#include <contacts/addrbookfactory.h>
GtkWidget * searchbox;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment