alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* update mu-guile for other changes

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-08-30 21:59:25 +03:00
parent c9d4111915
commit 2c92018484
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libmuguile/mu-guile-common.c
View File

@ -27,7 +27,7 @@
void
mu_guile_error (const char *func_name, int status,
const char *fmt, SCM args)
const char *fmt, SCM args)
{
scm_error_scm (scm_from_locale_symbol ("MuError"),
scm_from_utf8_string (func_name ? func_name : "<nameless>"),
@ -40,12 +40,11 @@ mu_guile_g_error (const char *func_name, GError *err)
{
scm_error_scm (scm_from_locale_symbol ("MuError"),
scm_from_utf8_string (func_name),
scm_from_utf8_string (err->message),
scm_from_utf8_string (err ? err->message : "error"),
SCM_UNDEFINED, SCM_UNDEFINED);
}
void
mu_guile_init (void)
{

23
libmuguile/mu-guile-store.c
View File

@ -29,13 +29,21 @@ static MuQuery*
get_query (void)
{
MuQuery *query;
MuStore *store;
GError *err;
err = NULL;
query = mu_query_new (mu_runtime_path(MU_RUNTIME_PATH_XAPIANDB), &err);
if (err) {
store = mu_store_new_read_only (mu_runtime_path(MU_RUNTIME_PATH_XAPIANDB),
&err);
query = store ? mu_query_new (store, &err) : NULL;
if (store)
mu_store_unref (store);
if (!query) {
mu_guile_g_error ("<internal error>", err);
g_error_free (err);
if (err)
g_error_free (err);
return NULL;
}
@ -67,15 +75,8 @@ call_func (SCM FUNC, MuMsgIter *iter, const char* func_name)
{
SCM msgsmob;
MuMsg *msg;
GError *err;
err = NULL;
msg = mu_msg_iter_get_msg (iter, &err);
if (err) {
mu_guile_g_error (func_name, err);
g_error_free (err);
return;
}
msg = mu_msg_iter_get_msg_floating (iter); /* don't unref */
msgsmob = mu_guile_msg_to_scm (mu_msg_ref(msg));
scm_call_1 (FUNC, msgsmob);