Hello community, here is the log from the commit of package evolution-data-server checked in at Tue May 2 13:24:33 CEST 2006. -------- --- GNOME/evolution-data-server/evolution-data-server.changes 2006-04-25 17:33:08.000000000 +0200 +++ STABLE/evolution-data-server/evolution-data-server.changes 2006-05-01 23:24:39.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 1 23:24:29 CEST 2006 - fejj@suse.de + +- Added bgo-315976-INBOX-not-shown-when-override-namespace.patch + +------------------------------------------------------------------- New: ---- bgo-315976-INBOX-not-shown-when-override-namespace.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-data-server.spec ++++++ --- /var/tmp/diff_new_pack.8ifO5k/_old 2006-05-02 13:23:44.000000000 +0200 +++ /var/tmp/diff_new_pack.8ifO5k/_new 2006-05-02 13:23:44.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Evolution Data Server Version: 1.6.0 -Release: 33 +Release: 37 Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.6/%{name}-%{version}.tar.bz2 #Patch3: evolution-data-server-gcc4.patch Patch5: evolution-data-server-configure.patch @@ -78,6 +78,7 @@ Patch57: nameselectorlist-keychange.diff Patch58: imap4-removal.diff Patch59: bgo-321797.patch +Patch60: bgo-315976-INBOX-not-shown-when-override-namespace.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libsoup >= 2.2.6 mozilla-nss @@ -167,6 +168,7 @@ %patch57 %patch58 %patch59 +%patch60 %build rename no nb po/no.* @@ -217,6 +219,8 @@ %{prefix}/share/gtk-doc/html/* %changelog -n evolution-data-server +* Mon May 01 2006 - fejj@suse.de +- Added bgo-315976-INBOX-not-shown-when-override-namespace.patch * Tue Apr 25 2006 - sragavan@novell.com - Fixes (bnc) 169228 - Retract GNOME Keyring Integration from the build (Srini) ++++++ bgo-315976-INBOX-not-shown-when-override-namespace.patch ++++++ Index: camel/providers/imap/camel-imap-store.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap/camel-imap-store.c,v retrieving revision 1.340.2.3 diff -u -r1.340.2.3 camel/providers/imap/camel-imap-store.c --- camel/providers/imap/camel-imap-store.c 24 Apr 2006 15:18:25 -0000 1.340.2.3 +++ camel/providers/imap/camel-imap-store.c 1 May 2006 21:14:40 -0000 @@ -280,7 +280,7 @@ imap_store->parameters = 0; if (camel_url_get_param (url, "use_lsub")) imap_store->parameters |= IMAP_PARAM_SUBSCRIPTIONS; - if (camel_url_get_param (url, "namespace")) { + if (camel_url_get_param (url, "override_namespace") && camel_url_get_param (url, "namespace")) { imap_store->parameters |= IMAP_PARAM_OVERRIDE_NAMESPACE; g_free(imap_store->namespace); imap_store->namespace = g_strdup (camel_url_get_param (url, "namespace")); @@ -2618,7 +2618,10 @@ if (store->namespace && store->namespace[0]) { char *pattern; - + + get_folders_sync(store, "INBOX", &m->ex); + if (camel_exception_is_set(&m->ex)) + goto done; get_folders_sync(store, store->namespace, &m->ex); if (camel_exception_is_set(&m->ex)) goto done; @@ -2697,6 +2700,10 @@ if (top[0] == 0) { if (imap_store->namespace && imap_store->namespace[0]) { + get_folders_sync(imap_store, "INBOX", ex); + if (camel_exception_is_set(ex)) + goto fail; + i = strlen(imap_store->namespace)-1; pattern = g_alloca(i+5); strcpy(pattern, imap_store->namespace); @@ -2711,7 +2718,7 @@ } } else { char *name; - + name = camel_imap_store_summary_full_from_path(imap_store->summary, top); if (name == NULL) name = camel_imap_store_summary_path_to_full(imap_store->summary, top, imap_store->dir_sep); @@ -2748,6 +2755,7 @@ guint32 flags, CamelException *ex) { CamelImapStore *imap_store = CAMEL_IMAP_STORE (store); + gboolean include_inbox = FALSE; CamelFolderInfo *fi; GPtrArray *folders; char *pattern, *name; @@ -2760,12 +2768,14 @@ folders = g_ptr_array_new (); - if (top == NULL) + if (top == NULL || top[0] == '\0') { + include_inbox = TRUE; top = ""; + } /* get starting point */ if (top[0] == 0) { - if (imap_store->namespace) { + if (imap_store->namespace && imap_store->namespace[0]) { name = g_strdup(imap_store->summary->namespace->full_name); top = imap_store->summary->namespace->path; } else @@ -2789,9 +2799,10 @@ if (si == NULL) continue; - + if ((!strcmp(name, camel_imap_store_info_full_name(imap_store->summary, si)) - || imap_match_pattern(imap_store->dir_sep, pattern, camel_imap_store_info_full_name(imap_store->summary, si))) + || imap_match_pattern(imap_store->dir_sep, pattern, camel_imap_store_info_full_name(imap_store->summary, si)) + || (include_inbox && !g_ascii_strcasecmp (camel_imap_store_info_full_name(imap_store->summary, si), "INBOX"))) && ((imap_store->parameters & IMAP_PARAM_SUBSCRIPTIONS) == 0 || (flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED) == 0 || (si->flags & CAMEL_STORE_INFO_FOLDER_SUBSCRIBED))) { @@ -2804,11 +2815,11 @@ it. See create folder */ if (fi->flags & CAMEL_FOLDER_NOINFERIORS) fi->flags = (fi->flags & ~CAMEL_FOLDER_NOINFERIORS) | CAMEL_FOLDER_NOCHILDREN; - + /* blah, this gets lost somewhere, i can't be bothered finding out why */ if (!g_ascii_strcasecmp(fi->full_name, "inbox")) fi->flags = (fi->flags & ~CAMEL_FOLDER_TYPE_MASK) | CAMEL_FOLDER_TYPE_INBOX; - + if (si->flags & CAMEL_FOLDER_NOSELECT) { CamelURL *url = camel_url_new(fi->uri, NULL); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de