Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-daemon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
138
Issues
138
List
Boards
Labels
Service Desk
Milestones
Iterations
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-daemon
Commits
0cbfde6b
Commit
0cbfde6b
authored
Jun 07, 2011
by
Alexandre Savard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#5994: Move addressbook folder from contacts to plugin folder
parent
e7adc365
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
40 additions
and
13 deletions
+40
-13
sflphone-client-gnome/Makefile.am
sflphone-client-gnome/Makefile.am
+1
-1
sflphone-client-gnome/configure.ac
sflphone-client-gnome/configure.ac
+2
-1
sflphone-client-gnome/plugin/addressbook/Makefile.am
sflphone-client-gnome/plugin/addressbook/Makefile.am
+1
-1
sflphone-client-gnome/plugin/addressbook/addressbook.c
sflphone-client-gnome/plugin/addressbook/addressbook.c
+1
-0
sflphone-client-gnome/plugin/addressbook/eds.c
sflphone-client-gnome/plugin/addressbook/eds.c
+0
-0
sflphone-client-gnome/plugin/addressbook/eds.h
sflphone-client-gnome/plugin/addressbook/eds.h
+7
-3
sflphone-client-gnome/src/config/addressbook-config.c
sflphone-client-gnome/src/config/addressbook-config.c
+1
-1
sflphone-client-gnome/src/contacts/Makefile.am
sflphone-client-gnome/src/contacts/Makefile.am
+0
-3
sflphone-client-gnome/src/contacts/addrbookfactory.h
sflphone-client-gnome/src/contacts/addrbookfactory.h
+0
-1
sflphone-client-gnome/src/contacts/addressbook.h
sflphone-client-gnome/src/contacts/addressbook.h
+26
-1
sflphone-client-gnome/src/contacts/searchbar.c
sflphone-client-gnome/src/contacts/searchbar.c
+1
-1
No files found.
sflphone-client-gnome/Makefile.am
View file @
0cbfde6b
SUBDIRS
=
src pixmaps webkit tests man po doc
SUBDIRS
=
src pixmaps webkit tests man po doc
plugin
CFLAGS
=
-Wall
-Werror
-Wextra
...
...
sflphone-client-gnome/configure.ac
View file @
0cbfde6b
...
...
@@ -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
...
...
sflphone-client-gnome/
src/contacts
/addressbook/Makefile.am
→
sflphone-client-gnome/
plugin
/addressbook/Makefile.am
View file @
0cbfde6b
include
../../
../
globals.mak
include
../../globals.mak
noinst_PROGRAMS
=
libevladdrbook.so
...
...
sflphone-client-gnome/
src/contacts
/addressbook/addressbook.c
→
sflphone-client-gnome/
plugin
/addressbook/addressbook.c
View file @
0cbfde6b
...
...
@@ -30,6 +30,7 @@
#include <string.h>
#include <stdio.h>
#include "eds.h"
#include "addressbook.h"
#include "searchbar.h"
#include "addressbook-config.h"
...
...
sflphone-client-gnome/
src/contacts
/addressbook/eds.c
→
sflphone-client-gnome/
plugin
/addressbook/eds.c
View file @
0cbfde6b
File moved
sflphone-client-gnome/
src/contacts
/addressbook/eds.h
→
sflphone-client-gnome/
plugin
/addressbook/eds.h
View file @
0cbfde6b
...
...
@@ -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
...
...
sflphone-client-gnome/src/config/addressbook-config.c
View file @
0cbfde6b
...
...
@@ -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>
...
...
sflphone-client-gnome/src/contacts/Makefile.am
View file @
0cbfde6b
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
sflphone-client-gnome/src/contacts/addrbookfactory.h
View file @
0cbfde6b
...
...
@@ -36,7 +36,6 @@
#include <gtk/gtk.h>
#include "addressbook.h"
typedef
struct
_addrbookfactory
{
gboolean
is_loaded
;
AddrBookHandle
*
addrbook
;
...
...
sflphone-client-gnome/src/contacts/addressbook.h
View file @
0cbfde6b
...
...
@@ -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
...
...
sflphone-client-gnome/src/contacts/searchbar.c
View file @
0cbfde6b
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment