mirror of
https://git.yoctoproject.org/poky
synced 2026-09-29 07:36:20 +02:00
Upgrade eds-dbus to latest svn
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2607 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
@@ -69,7 +69,7 @@ SRCREV_pn-contacts ?= "327"
|
|||||||
SRCREV_pn-dates ?= "470"
|
SRCREV_pn-dates ?= "470"
|
||||||
SRCREV_pn-gtkhtml2 ?= "1144"
|
SRCREV_pn-gtkhtml2 ?= "1144"
|
||||||
SRCREV_pn-web ?= "96"
|
SRCREV_pn-web ?= "96"
|
||||||
SRCREV_pn-eds-dbus ?= "580"
|
SRCREV_pn-eds-dbus ?= "595"
|
||||||
SRCDATE_minimo ?= "20070510"
|
SRCDATE_minimo ?= "20070510"
|
||||||
SRCDATE_ipkg-utils-native ?= "20050930"
|
SRCDATE_ipkg-utils-native ?= "20050930"
|
||||||
SRCDATE_ipkg-link-1 ?= "20050930"
|
SRCDATE_ipkg-link-1 ?= "20050930"
|
||||||
|
|||||||
@@ -1,45 +0,0 @@
|
|||||||
Index: trunk/configure.in
|
|
||||||
===================================================================
|
|
||||||
--- trunk.orig/configure.in 2005-09-28 20:01:02.000000000 +0000
|
|
||||||
+++ trunk/configure.in 2005-09-28 21:02:35.000000000 +0000
|
|
||||||
@@ -1120,7 +1120,12 @@
|
|
||||||
AC_SUBST(E_DATA_SERVER_CFLAGS)
|
|
||||||
AC_SUBST(E_DATA_SERVER_LIBS)
|
|
||||||
|
|
||||||
-E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0"
|
|
||||||
+if test "x${with_libgnome}" != "xno"; then
|
|
||||||
+ E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0"
|
|
||||||
+else
|
|
||||||
+ E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0"
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
|
|
||||||
EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, $THREADS_CFLAGS, $THREADS_LIBS)
|
|
||||||
AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
|
|
||||||
@@ -1128,7 +1133,7 @@
|
|
||||||
|
|
||||||
dnl --- evolution-addressbook flags
|
|
||||||
|
|
||||||
-EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 $IPC_DEPS gnome-vfs-2.0 "
|
|
||||||
+EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 $IPC_DEPS "
|
|
||||||
|
|
||||||
EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
|
|
||||||
AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
|
|
||||||
@@ -1136,7 +1141,7 @@
|
|
||||||
|
|
||||||
dnl --- evolution-calendar flags
|
|
||||||
|
|
||||||
-EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 gnome-vfs-2.0 dbus-glib-1"
|
|
||||||
+EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 dbus-glib-1"
|
|
||||||
|
|
||||||
EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)
|
|
||||||
AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
|
|
||||||
@@ -1145,7 +1150,7 @@
|
|
||||||
if test "x${with_dbus}" = "xno"; then
|
|
||||||
dnl --- factory flags
|
|
||||||
|
|
||||||
- E_FACTORY_DEPS="gobject-2.0 >= $GLIB_REQUIRED $IPC_DEPS gconf-2.0 gnome-vfs-2.0 libgnome-2.0 $mozilla_nspr"
|
|
||||||
+ E_FACTORY_DEPS="gobject-2.0 >= $GLIB_REQUIRED $IPC_DEPS gconf-2.0 $mozilla_nspr"
|
|
||||||
|
|
||||||
EVO_SET_COMPILE_FLAGS(E_FACTORY, $E_FACTORY_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
|
|
||||||
AC_SUBST(E_FACTORY_CFLAGS)
|
|
||||||
@@ -120,30 +120,6 @@ Index: addressbook/libedata-book-orbit/ximian-vcard.h
|
|||||||
+" TZzoIf8udibfF972OppJwBXg4s+kgpBZD8KrBoXgFfG+8ZnpZm0UGNAE7gVmuMtv+A/CTlwt\n" \
|
+" TZzoIf8udibfF972OppJwBXg4s+kgpBZD8KrBoXgFfG+8ZnpZm0UGNAE7gVmuMtv+A/CTlwt\n" \
|
||||||
+" ArmsGAAAAAElFTkSuQmCC\n" \
|
+" ArmsGAAAAAElFTkSuQmCC\n" \
|
||||||
"END:VCARD"
|
"END:VCARD"
|
||||||
Index: addressbook/backends/file/e-book-backend-file.c
|
|
||||||
===================================================================
|
|
||||||
--- addressbook/backends/file/e-book-backend-file.c (revision 578)
|
|
||||||
+++ addressbook/backends/file/e-book-backend-file.c (working copy)
|
|
||||||
@@ -1286,13 +1286,14 @@
|
|
||||||
else {
|
|
||||||
#ifdef CREATE_DEFAULT_VCARD
|
|
||||||
EContact *contact = NULL;
|
|
||||||
-
|
|
||||||
- do_create(bf, XIMIAN_VCARD, &contact);
|
|
||||||
- /* XXX check errors here */
|
|
||||||
- if (contact)
|
|
||||||
+ EBookBackendSyncStatus status;
|
|
||||||
+
|
|
||||||
+ status = do_create (bf, XIMIAN_VCARD, &contact);
|
|
||||||
+ if (status == GNOME_Evolution_Addressbook_Success)
|
|
||||||
g_object_unref (contact);
|
|
||||||
+ else
|
|
||||||
+ g_warning ("Cannot create default contact: %d", status);
|
|
||||||
#endif
|
|
||||||
-
|
|
||||||
writable = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Index: addressbook/backends/file/Makefile.am
|
Index: addressbook/backends/file/Makefile.am
|
||||||
===================================================================
|
===================================================================
|
||||||
--- addressbook/backends/file/Makefile.am (revision 578)
|
--- addressbook/backends/file/Makefile.am (revision 578)
|
||||||
|
|||||||
Reference in New Issue
Block a user