OBS User unknown 2008-09-24 13:22:04 +00:00 committed by Git OBS Bridge
parent d050163cbc
commit e54e567194
6 changed files with 34714 additions and 55 deletions

View File

@ -0,0 +1,22 @@
diff --git a/camel/camel-db.c b/camel/camel-db.c
index b76775c..95a9289 100644
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -1088,6 +1088,8 @@ camel_db_get_column_name (const char *raw_name)
return g_strdup ("deleted");
else if (!g_ascii_strcasecmp (raw_name, "junk"))
return g_strdup ("junk");
+ else if (!g_ascii_strcasecmp (raw_name, "Answered"))
+ return g_strdup ("replied");
else if (!g_ascii_strcasecmp (raw_name, "Seen"))
return g_strdup ("read");
else if (!g_ascii_strcasecmp (raw_name, "user-tag"))
@@ -1096,6 +1098,8 @@ camel_db_get_column_name (const char *raw_name)
return g_strdup ("labels");
else if (!g_ascii_strcasecmp (raw_name, "Attachments"))
return g_strdup ("attachment");
+ else if (!g_ascii_strcasecmp (raw_name, "x-camel-mlist"))
+ return g_strdup ("mlist");
else {
/* Let it crash for all unknown columns for now.
We need to load the messages into memory and search etc.

View File

@ -1,30 +0,0 @@
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index d511b37..b0d409b 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -483,7 +483,7 @@ camel_folder_search_search(CamelFolderSearch *search, const char *expr, GPtrArra
/* Sync the db, so that we search the db for changes */
camel_folder_summary_save_to_db (search->folder->summary, ex);
- d(printf ("sexp is : [%s]\n", expr));
+ printf ("sexp is : [%s]\n", expr);
if (g_getenv("SQL_SEARCH_OLD"))
sql_query = camel_sexp_to_sql (expr);
else
@@ -492,7 +492,7 @@ camel_folder_search_search(CamelFolderSearch *search, const char *expr, GPtrArra
tmp = g_strdup_printf ("SELECT uid FROM %s %s %s", tmp1, sql_query ? "WHERE":"", sql_query?sql_query:"");
camel_db_free_sqlized_string (tmp1);
g_free (sql_query);
- d(printf("Equivalent sql %s\n", tmp));
+ printf("Equivalent sql %s\n", tmp);
matches = g_ptr_array_new();
cdb = (CamelDB *) (search->folder->cdb);
@@ -671,7 +671,6 @@ search_match_all(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFold
camel_folder_summary_reload_from_db (search->folder->summary, search->priv->ex);
}
- e_sexp_term_eval (f, argv [0]);
for (i=0;i<v->len;i++) {
const char *uid;

View File

@ -1,15 +0,0 @@
diff --git a/camel/camel-search-sql-sexp.c b/camel/camel-search-sql-sexp.c
index b1f2c27..d3e561d 100644
--- a/camel/camel-search-sql-sexp.c
+++ b/camel/camel-search-sql-sexp.c
@@ -363,7 +363,9 @@ check_header (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data
value = get_db_safe_string (tstr);
g_free (tstr);
} else if (how == CAMEL_SEARCH_MATCH_EXACT) {
- value = get_db_safe_string(argv[i]->value.string);
+ tstr = g_strdup_printf ("%c%s%c", '%', argv[i]->value.string, '%');
+ value = get_db_safe_string (tstr);
+ g_free (tstr);
}
str = g_strdup_printf("(%s LIKE %s)", headername, value);
g_free(value);

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Sep 17 11:20:37 CDT 2008 - maw@suse.de
- Add evolution-data-server-db-fixes.patch.
-------------------------------------------------------------------
Tue Sep 16 09:26:28 CDT 2008 - maw@suse.de
- Add evolution-data-server-updates.patch, which comprises the
diff between r9505 and r9557 in GNOME SVN
- Drop evolution-data-server-show-sexp.patch and
evolution-data-server-sql-percents.patch.
-------------------------------------------------------------------
Tue Sep 9 15:44:13 CDT 2008 - maw@suse.de

View File

@ -44,7 +44,7 @@ Group: Development/Libraries/GNOME
AutoReqProv: on
Summary: Evolution Data Server
Version: 2.23.92
Release: 3
Release: 4
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.22/%{name}-%{version}.tar.bz2
Patch0: evolution-data-server-configure.patch
# PATCH-NEEDS-REBASE bnc-164367-gw-attachments-appts-throw-error.patch bnc164367 -- was PATCH-FIX-UPSTREAM, and may be droppable
@ -57,10 +57,10 @@ Patch4: bnc-304835-ex-crash-after-restart.patch
Patch5: bnc-307861-calendar-auth.diff
# PATCH-FIX-UPSTREAM bgo-530514-check-to-handle-specific-server-response.diff bgo530514 psankar@suse.de -- Fix is in upstream svn from 2.22.2
Patch9: bgo-530514-check-to-handle-specific-server-response.diff
# PATCH-FIX-UPSTREAM evolution-data-server-show-sexp.patch sragavan@novell.com bnc418080 -- hopefully will be obsolete in the next release; only useful for debugging
Patch10: evolution-data-server-show-sexp.patch
# PATCH-FIX-UPSTREAM evolution-data-server-sql-percents.patch sragavan@novell.com -- should go away in the next release
Patch11: evolution-data-server-sql-percents.patch
# PATCH-FIX-UPSTREAM evolution-data-server-updates.patch maw@novell.com -- will go away when we update to 2.24.0.
Patch12: evolution-data-server-updates.patch
# PATCH-FIX-UPSTREAM evolution-data-server-db-fixes.patch maw@novell.com -- courtesy of sragavan@novell.com; should go away in 2.24.0
Patch13: evolution-data-server-db-fixes.patch
# Change patch below if we move away from /opt/gnome
# PATCH-FIX-OPENSUSE libgnomeui-dep.patch -- It avoids a build dependency on libgnomeui to speed up bootstrap
Patch99: libgnomeui-dep.patch
@ -111,10 +111,7 @@ documentation.
%if 0%{opensuse_bs}
%endif
%lang_package
%prep
%setup -q
%patch0
@ -123,8 +120,8 @@ documentation.
###%patch4
###%patch5
%patch9
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch99
%build
@ -186,6 +183,13 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/*
%changelog
* Wed Sep 17 2008 maw@suse.de
- Add evolution-data-server-db-fixes.patch.
* Tue Sep 16 2008 maw@suse.de
- Add evolution-data-server-updates.patch, which comprises the
diff between r9505 and r9557 in GNOME SVN
- Drop evolution-data-server-show-sexp.patch and
evolution-data-server-sql-percents.patch.
* Tue Sep 09 2008 maw@suse.de
- Add evolution-data-server-sql-percents.patch (even more work on
bnc#418080).