summaryrefslogtreecommitdiffstats
path: root/meta/packages/eds
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-08-30 13:03:48 +0000
committerRoss Burton <ross@openedhand.com>2007-08-30 13:03:48 +0000
commit5ee5800fae29d5665472c73c5ce67157f77acb90 (patch)
treecce9dfea81b3805bb10c9bfc2b59dc258f333ec9 /meta/packages/eds
parent6406e3e0e0ac173dde5479188352820e5a26be6e (diff)
downloadpoky-5ee5800fae29d5665472c73c5ce67157f77acb90.tar.gz
Upgrade eds-dbus to latest svn
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2607 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/eds')
-rw-r--r--meta/packages/eds/eds-dbus/no_libgnome.patch45
-rw-r--r--meta/packages/eds/eds-dbus/oh-contact.patch24
2 files changed, 0 insertions, 69 deletions
diff --git a/meta/packages/eds/eds-dbus/no_libgnome.patch b/meta/packages/eds/eds-dbus/no_libgnome.patch
deleted file mode 100644
index a8bae50d03..0000000000
--- a/meta/packages/eds/eds-dbus/no_libgnome.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1Index: trunk/configure.in
2===================================================================
3--- trunk.orig/configure.in 2005-09-28 20:01:02.000000000 +0000
4+++ trunk/configure.in 2005-09-28 21:02:35.000000000 +0000
5@@ -1120,7 +1120,12 @@
6 AC_SUBST(E_DATA_SERVER_CFLAGS)
7 AC_SUBST(E_DATA_SERVER_LIBS)
8
9-E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0"
10+if test "x${with_libgnome}" != "xno"; then
11+ E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0"
12+else
13+ E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0"
14+fi
15+
16
17 EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, $THREADS_CFLAGS, $THREADS_LIBS)
18 AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
19@@ -1128,7 +1133,7 @@
20
21 dnl --- evolution-addressbook flags
22
23-EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 $IPC_DEPS gnome-vfs-2.0 "
24+EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 $IPC_DEPS "
25
26 EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
27 AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
28@@ -1136,7 +1141,7 @@
29
30 dnl --- evolution-calendar flags
31
32-EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 gnome-vfs-2.0 dbus-glib-1"
33+EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 dbus-glib-1"
34
35 EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)
36 AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
37@@ -1145,7 +1150,7 @@
38 if test "x${with_dbus}" = "xno"; then
39 dnl --- factory flags
40
41- E_FACTORY_DEPS="gobject-2.0 >= $GLIB_REQUIRED $IPC_DEPS gconf-2.0 gnome-vfs-2.0 libgnome-2.0 $mozilla_nspr"
42+ E_FACTORY_DEPS="gobject-2.0 >= $GLIB_REQUIRED $IPC_DEPS gconf-2.0 $mozilla_nspr"
43
44 EVO_SET_COMPILE_FLAGS(E_FACTORY, $E_FACTORY_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
45 AC_SUBST(E_FACTORY_CFLAGS)
diff --git a/meta/packages/eds/eds-dbus/oh-contact.patch b/meta/packages/eds/eds-dbus/oh-contact.patch
index aa9d07de74..ad1bb030d0 100644
--- a/meta/packages/eds/eds-dbus/oh-contact.patch
+++ b/meta/packages/eds/eds-dbus/oh-contact.patch
@@ -120,30 +120,6 @@ Index: addressbook/libedata-book-orbit/ximian-vcard.h
120+" TZzoIf8udibfF972OppJwBXg4s+kgpBZD8KrBoXgFfG+8ZnpZm0UGNAE7gVmuMtv+A/CTlwt\n" \ 120+" TZzoIf8udibfF972OppJwBXg4s+kgpBZD8KrBoXgFfG+8ZnpZm0UGNAE7gVmuMtv+A/CTlwt\n" \
121+" ArmsGAAAAAElFTkSuQmCC\n" \ 121+" ArmsGAAAAAElFTkSuQmCC\n" \
122 "END:VCARD" 122 "END:VCARD"
123Index: addressbook/backends/file/e-book-backend-file.c
124===================================================================
125--- addressbook/backends/file/e-book-backend-file.c (revision 578)
126+++ addressbook/backends/file/e-book-backend-file.c (working copy)
127@@ -1286,13 +1286,14 @@
128 else {
129 #ifdef CREATE_DEFAULT_VCARD
130 EContact *contact = NULL;
131-
132- do_create(bf, XIMIAN_VCARD, &contact);
133- /* XXX check errors here */
134- if (contact)
135+ EBookBackendSyncStatus status;
136+
137+ status = do_create (bf, XIMIAN_VCARD, &contact);
138+ if (status == GNOME_Evolution_Addressbook_Success)
139 g_object_unref (contact);
140+ else
141+ g_warning ("Cannot create default contact: %d", status);
142 #endif
143-
144 writable = TRUE;
145 }
146 }
147Index: addressbook/backends/file/Makefile.am 123Index: addressbook/backends/file/Makefile.am
148=================================================================== 124===================================================================
149--- addressbook/backends/file/Makefile.am (revision 578) 125--- addressbook/backends/file/Makefile.am (revision 578)