193 lines
7.2 KiB
Diff
193 lines
7.2 KiB
Diff
diff -Nupr 1-eds/addressbook/libedata-book/e-book-backend-db-cache.c 2-eds/addressbook/libedata-book/e-book-backend-db-cache.c
|
|
--- 1-eds/addressbook/libedata-book/e-book-backend-db-cache.c 2008-10-01 16:11:20.000000000 +0530
|
|
+++ 2-eds/addressbook/libedata-book/e-book-backend-db-cache.c 2008-07-01 22:08:59.000000000 +0530
|
|
@@ -420,3 +420,41 @@ e_book_backend_db_cache_is_populated (DB
|
|
return TRUE;
|
|
}
|
|
}
|
|
+
|
|
+void
|
|
+e_book_backend_db_cache_set_time(DB *db, const char *t)
|
|
+{
|
|
+ DBT uid_dbt, vcard_dbt ;
|
|
+ int db_error ;
|
|
+
|
|
+ string_to_dbt ("last_update_time", &uid_dbt);
|
|
+ string_to_dbt (t, &vcard_dbt);
|
|
+
|
|
+ db_error = db->put (db, NULL, &uid_dbt, &vcard_dbt, 0);
|
|
+ if (db_error != 0) {
|
|
+ g_warning ("db->put failed with %d", db_error);
|
|
+ }
|
|
+}
|
|
+
|
|
+char *
|
|
+e_book_backend_db_cache_get_time (DB *db)
|
|
+{
|
|
+ DBT uid_dbt, vcard_dbt;
|
|
+ int db_error;
|
|
+ char *t;
|
|
+
|
|
+ string_to_dbt ("last_update_time", &uid_dbt);
|
|
+ memset (&vcard_dbt, 0, sizeof(vcard_dbt));
|
|
+ vcard_dbt.flags = DB_DBT_MALLOC;
|
|
+
|
|
+ db_error = db->get (db, NULL, &uid_dbt, &vcard_dbt, 0);
|
|
+ if (db_error != 0) {
|
|
+ g_warning ("db->get failed with %d", db_error);
|
|
+ return NULL;
|
|
+ }
|
|
+ else {
|
|
+ t = g_strdup (vcard_dbt.data);
|
|
+ g_free (vcard_dbt.data);
|
|
+ return t;
|
|
+ }
|
|
+}
|
|
diff -Nupr 1-eds/addressbook/libedata-book/e-book-backend-db-cache.h 2-eds/addressbook/libedata-book/e-book-backend-db-cache.h
|
|
--- 1-eds/addressbook/libedata-book/e-book-backend-db-cache.h 2008-10-01 16:11:20.000000000 +0530
|
|
+++ 2-eds/addressbook/libedata-book/e-book-backend-db-cache.h 2008-09-05 11:24:08.000000000 +0530
|
|
@@ -25,6 +25,8 @@
|
|
#include <libebook/e-contact.h>
|
|
#include "db.h"
|
|
|
|
+G_BEGIN_DECLS
|
|
+
|
|
EContact* e_book_backend_db_cache_get_contact (DB *db, const char *uid);
|
|
void string_to_dbt(const char *str, DBT *dbt);
|
|
char *e_book_backend_db_cache_get_filename(DB *db);
|
|
@@ -39,9 +41,8 @@ gboolean e_book_backend_db_cache_exists
|
|
void e_book_backend_db_cache_set_populated (DB *db);
|
|
gboolean e_book_backend_db_cache_is_populated (DB *db);
|
|
GPtrArray* e_book_backend_db_cache_search (DB *db, const char *query);
|
|
-
|
|
-
|
|
-
|
|
+void e_book_backend_db_cache_set_time(DB *db, const char *t);
|
|
+char * e_book_backend_db_cache_get_time (DB *db);
|
|
|
|
G_END_DECLS
|
|
|
|
diff -Nupr 1-eds/calendar/ChangeLog 2-eds/calendar/ChangeLog
|
|
--- 1-eds/calendar/ChangeLog 2008-10-15 11:33:05.000000000 +0530
|
|
+++ 2-eds/calendar/ChangeLog 2008-10-20 16:03:01.000000000 +0530
|
|
@@ -157,6 +157,18 @@
|
|
(e_cal_util_parse_ics_file): Make the documentation reflect that these
|
|
functions either return a new icalcomponent or NULL.
|
|
|
|
+2008-07-18 Suman Manjunath <msuman@novell.com>
|
|
+
|
|
+ ** Added CAL_STATIC_CAPABILITY_CREATE_MESSAGES
|
|
+
|
|
+ * libecal/e-cal-util.h:
|
|
+ This static capability determines if a calendar backend can send
|
|
+ messages to recipients by itself. It is different from the
|
|
+ CAL_STATIC_CAPABILITY_SAVE_SCHEDULES from the fact that this new
|
|
+ capability is processed after the user has been prompted to send
|
|
+ an update. It is useful if the actual object needs some processing
|
|
+ after the messages are sent.
|
|
+
|
|
2008-07-18 Milan Crha <mcrha@redhat.com>
|
|
|
|
** Fix for bug #515998
|
|
diff -Nupr 1-eds/calendar/libecal/e-cal.c 2-eds/calendar/libecal/e-cal.c
|
|
--- 1-eds/calendar/libecal/e-cal.c 2008-10-01 16:11:33.000000000 +0530
|
|
+++ 2-eds/calendar/libecal/e-cal.c 2008-09-09 12:07:54.000000000 +0530
|
|
@@ -1386,7 +1386,16 @@ set_local_attachment_store (ECal *ecal)
|
|
priv->local_attachment_store =
|
|
g_filename_to_uri (filename, NULL, NULL);
|
|
g_free (filename);
|
|
+ } else if (g_str_has_prefix (priv->uri, "mapi://")) {
|
|
+ gchar *filename = g_build_filename (g_get_home_dir (),
|
|
+ ".evolution/cache/calendar",
|
|
+ mangled_uri,
|
|
+ NULL);
|
|
+ priv->local_attachment_store =
|
|
+ g_filename_to_uri (filename, NULL, NULL);
|
|
+ g_free (filename);
|
|
}
|
|
+
|
|
g_free (mangled_uri);
|
|
}
|
|
|
|
diff -Nupr 1-eds/calendar/libecal/e-cal-util.h 2-eds/calendar/libecal/e-cal-util.h
|
|
--- 1-eds/calendar/libecal/e-cal-util.h 2008-10-01 16:11:33.000000000 +0530
|
|
+++ 2-eds/calendar/libecal/e-cal-util.h 2008-07-18 16:29:46.000000000 +0530
|
|
@@ -115,6 +115,7 @@ gboolean e_cal_util_event_dates_match (i
|
|
#define CAL_STATIC_CAPABILITY_ORGANIZER_MUST_ATTEND "organizer-must-attend"
|
|
#define CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS "organizer-not-email-address"
|
|
#define CAL_STATIC_CAPABILITY_REMOVE_ALARMS "remove-alarms"
|
|
+#define CAL_STATIC_CAPABILITY_CREATE_MESSAGES "create-messages"
|
|
#define CAL_STATIC_CAPABILITY_SAVE_SCHEDULES "save-schedules"
|
|
#define CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK "no-conv-to-assign-task"
|
|
#define CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR "no-conv-to-recur"
|
|
diff -Nupr 1-eds/servers/exchange/ChangeLog 2-eds/servers/exchange/ChangeLog
|
|
--- 1-eds/servers/exchange/ChangeLog 2008-10-20 10:19:25.000000000 +0530
|
|
+++ 2-eds/servers/exchange/ChangeLog 2008-10-20 16:03:01.000000000 +0530
|
|
@@ -14,6 +14,11 @@
|
|
* storage/exchange-account.c: (set_sf_prop): Do not store invalid
|
|
values in 'standard_uris', it leads to crash later.
|
|
|
|
+2008-09-19 Ashish Shrivastava <shashish@novell.com>
|
|
+
|
|
+ * lib/e2k-global-catalog.c (e2k_global_catalog_get_ldap): Don't set
|
|
+ ldap_error - prevents crashes for now.
|
|
+
|
|
2008-08-18 Milan Crha <mcrha@redhat.com>
|
|
|
|
** Part of fix for bug #324203
|
|
@@ -233,6 +238,12 @@
|
|
* lib/e2k-result.c (prop_get_binary_array), (prop_get_binary):
|
|
Initialize 'length' before calling g_base64_decode().
|
|
|
|
+2007-11-11 Srinivasa Ragavan <sragavan@novell.com>
|
|
+
|
|
+ * lib/e2k-global-catalog.c: (e2k_global_catalog_set_password): Added a
|
|
+ new api to set password into gc.
|
|
+ * lib/e2k-global-catalog.h:
|
|
+
|
|
2007-10-27 Matthew Barnes <mbarnes@redhat.com>
|
|
|
|
* lib/e2k-user-dialog.c:
|
|
diff -Nupr 1-eds/servers/exchange/lib/e2k-global-catalog.c 2-eds/servers/exchange/lib/e2k-global-catalog.c
|
|
--- 1-eds/servers/exchange/lib/e2k-global-catalog.c 2008-10-01 16:11:00.000000000 +0530
|
|
+++ 2-eds/servers/exchange/lib/e2k-global-catalog.c 2008-09-19 14:34:53.000000000 +0530
|
|
@@ -435,8 +435,11 @@ e2k_global_catalog_get_ldap (E2kGlobalCa
|
|
|
|
err = get_ldap_connection (gc, op, gc->priv->server, 3268, &ldap);
|
|
|
|
+#if 0
|
|
+ //ldap_error = (gint *) g_malloc (sizeof (gint));
|
|
if (ldap_error)
|
|
*ldap_error = err;
|
|
+#endif
|
|
|
|
return ldap;
|
|
}
|
|
@@ -473,6 +476,13 @@ e2k_global_catalog_new (const char *serv
|
|
return gc;
|
|
}
|
|
|
|
+void
|
|
+e2k_global_catalog_set_password (E2kGlobalCatalog *gc, const char *password)
|
|
+{
|
|
+ g_free (gc->priv->password);
|
|
+ gc->priv->password = g_strdup (password);
|
|
+}
|
|
+
|
|
static const char *
|
|
lookup_mta (E2kGlobalCatalog *gc, E2kOperation *op, const char *mta_dn)
|
|
{
|
|
diff -Nupr 1-eds/servers/exchange/lib/e2k-global-catalog.h 2-eds/servers/exchange/lib/e2k-global-catalog.h
|
|
--- 1-eds/servers/exchange/lib/e2k-global-catalog.h 2008-10-01 16:11:00.000000000 +0530
|
|
+++ 2-eds/servers/exchange/lib/e2k-global-catalog.h 2008-09-09 12:07:54.000000000 +0530
|
|
@@ -117,6 +117,9 @@ E2kGlobalCatalogStatus e2k_global_catalo
|
|
const char *self_dn,
|
|
const char *delegate_dn);
|
|
|
|
+void
|
|
+e2k_global_catalog_set_password (E2kGlobalCatalog *gc, const char *password);
|
|
+
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif /* __cplusplus */
|