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

* mug: update for api changes

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-08-30 22:03:29 +03:00
parent fec0092312
commit b8447cde47
4 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
toys/mug/mug-msg-list-view.c
View File

@ -323,10 +323,14 @@ run_query (const char *xpath, const char *query, MugMsgListView * self)
GError *err; GError *err;
MuQuery *xapian; MuQuery *xapian;
MuMsgIter *iter; MuMsgIter *iter;
MuStore *store;
err = NULL; err = NULL;
xapian = mu_query_new (xpath, &err);
if (!xapian) { if (! (store = mu_store_new_read_only (xpath, &err)) ||
! (xapian = mu_query_new (store, &err))) {
if (store)
mu_store_unref (store);
g_warning ("Error: %s", err->message); g_warning ("Error: %s", err->message);
g_signal_emit (G_OBJECT (self), g_signal_emit (G_OBJECT (self),
signals[MUG_ERROR_OCCURED], 0, signals[MUG_ERROR_OCCURED], 0,
@ -334,6 +338,7 @@ run_query (const char *xpath, const char *query, MugMsgListView * self)
g_error_free (err); g_error_free (err);
return NULL; return NULL;
} }
mu_store_unref (store);
iter = mu_query_run (xapian, query, FALSE, MU_MSG_FIELD_ID_DATE, iter = mu_query_run (xapian, query, FALSE, MU_MSG_FIELD_ID_DATE,
TRUE, &err); TRUE, &err);
@ -394,11 +399,8 @@ update_model (GtkListStore * store, const char *xpath, const char *query,
} }
for (count = 0; !mu_msg_iter_is_done (iter); for (count = 0; !mu_msg_iter_is_done (iter);
mu_msg_iter_next (iter), ++count) { mu_msg_iter_next (iter), ++count)
MuMsg *msg; add_row (store, mu_msg_iter_get_msg_floating(iter)); /* don't unref */
msg = mu_msg_iter_get_msg (iter, NULL); /* don't unref */
add_row (store, msg);
}
mu_msg_iter_destroy (iter); mu_msg_iter_destroy (iter);

6
toys/mug/mug.c
View File

@ -101,7 +101,7 @@ get_connected_tool_button (const char* stock_id, ToolAction action,
MugData *mugdata) MugData *mugdata)
{ {
GtkToolItem *btn; GtkToolItem *btn;
btn = gtk_tool_button_new_from_stock (stock_id); btn = gtk_tool_button_new_from_stock (stock_id);
g_object_set_data (G_OBJECT (btn), "action", g_object_set_data (G_OBJECT (btn), "action",
GUINT_TO_POINTER (action)); GUINT_TO_POINTER (action));
@ -139,7 +139,7 @@ mug_toolbar (MugData * mugdata)
(tools[i].stock_id, tools[i].action, (tools[i].stock_id, tools[i].action,
mugdata), i); mugdata), i);
} }
return toolbar; return toolbar;
} }
@ -342,7 +342,7 @@ mug_shell (MugData * mugdata)
// gtk_window_set_icon_from_file (GTK_WINDOW (mugdata->win), icon, NULL); // gtk_window_set_icon_from_file (GTK_WINDOW (mugdata->win), icon, NULL);
// g_free (icon); // g_free (icon);
// } // }
return mugdata->win; return mugdata->win;
} }

29
toys/mug2/mug-msg-list-view.c
View File

@ -160,7 +160,7 @@ append_col (GtkTreeView * treeview, const char *label, int colidx,
sortcolidx = colidx; sortcolidx = colidx;
gtk_tree_view_column_set_sort_column_id (col, sortcolidx); gtk_tree_view_column_set_sort_column_id (col, sortcolidx);
gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_FIXED); gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_FIXED);
if (maxwidth) { if (maxwidth) {
gtk_tree_view_column_set_fixed_width (col, maxwidth); gtk_tree_view_column_set_fixed_width (col, maxwidth);
gtk_tree_view_column_set_expand (col, FALSE); gtk_tree_view_column_set_expand (col, FALSE);
@ -172,7 +172,7 @@ append_col (GtkTreeView * treeview, const char *label, int colidx,
treecell_func, NULL, NULL); treecell_func, NULL, NULL);
gtk_tree_view_append_column (treeview, col); gtk_tree_view_append_column (treeview, col);
gtk_tree_view_columns_autosize (treeview); gtk_tree_view_columns_autosize (treeview);
gtk_tree_view_set_fixed_height_mode (treeview, TRUE); gtk_tree_view_set_fixed_height_mode (treeview, TRUE);
} }
@ -196,7 +196,7 @@ mug_msg_list_view_init (MugMsgListView * obj)
G_TYPE_UINT, /* prio */ G_TYPE_UINT, /* prio */
G_TYPE_UINT, /* flags */ G_TYPE_UINT, /* flags */
G_TYPE_INT); /* timeval */ G_TYPE_INT); /* timeval */
tview = GTK_TREE_VIEW (obj); tview = GTK_TREE_VIEW (obj);
gtk_tree_view_set_model (tview, GTK_TREE_MODEL (priv->_store)); gtk_tree_view_set_model (tview, GTK_TREE_MODEL (priv->_store));
gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW (obj), TRUE); gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW (obj), TRUE);
@ -326,10 +326,13 @@ run_query (const char *xpath, const char *query, MugMsgListView * self)
GError *err; GError *err;
MuQuery *xapian; MuQuery *xapian;
MuMsgIter *iter; MuMsgIter *iter;
MuStore *store;
err = NULL; err = NULL;
xapian = mu_query_new (xpath, &err); if (! (store = mu_store_new_read_only (xpath, &err)) ||
if (!xapian) { ! (xapian = mu_query_new (store, &err))) {
if (store)
mu_store_unref (store);
g_warning ("Error: %s", err->message); g_warning ("Error: %s", err->message);
g_signal_emit (G_OBJECT (self), g_signal_emit (G_OBJECT (self),
signals[MUG_ERROR_OCCURED], 0, signals[MUG_ERROR_OCCURED], 0,
@ -337,6 +340,7 @@ run_query (const char *xpath, const char *query, MugMsgListView * self)
g_error_free (err); g_error_free (err);
return NULL; return NULL;
} }
mu_store_unref (store);
iter = mu_query_run (xapian, query, TRUE, MU_MSG_FIELD_ID_DATE, iter = mu_query_run (xapian, query, TRUE, MU_MSG_FIELD_ID_DATE,
TRUE, &err); TRUE, &err);
@ -365,7 +369,7 @@ add_row (GtkTreeStore * store, MuMsg *msg, GtkTreeIter *treeiter)
from = empty_or_display_contact (mu_msg_get_from (msg)); from = empty_or_display_contact (mu_msg_get_from (msg));
to = empty_or_display_contact (mu_msg_get_to (msg)); to = empty_or_display_contact (mu_msg_get_to (msg));
flagstr = mu_flags_to_str_s (mu_msg_get_flags (msg), MU_FLAG_TYPE_ANY); flagstr = mu_flags_to_str_s (mu_msg_get_flags (msg), MU_FLAG_TYPE_ANY);
/* if (0) { */ /* if (0) { */
/* GtkTreeIter myiter; */ /* GtkTreeIter myiter; */
/* if (!gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL(store), */ /* if (!gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL(store), */
@ -408,18 +412,17 @@ update_model (GtkTreeStore *store, const char *xpath, const char *query,
GtkTreeIter treeiter, prev_treeiter; GtkTreeIter treeiter, prev_treeiter;
const MuMsgIterThreadInfo *ti; const MuMsgIterThreadInfo *ti;
MuMsg *msg;
ti = mu_msg_iter_get_thread_info (iter); ti = mu_msg_iter_get_thread_info (iter);
if (!prev_ti || !g_str_has_prefix (ti->threadpath, if (!prev_ti || !g_str_has_prefix (ti->threadpath,
prev_ti->threadpath)) prev_ti->threadpath))
gtk_tree_store_append (store, &treeiter, NULL); gtk_tree_store_append (store, &treeiter, NULL);
else else
gtk_tree_store_append (store, &treeiter, &prev_treeiter); gtk_tree_store_append (store, &treeiter, &prev_treeiter);
msg = mu_msg_iter_get_msg (iter, NULL); /* don't unref */ /* don't unref msg */
add_row (store, msg, &treeiter); add_row (store, mu_msg_iter_get_msg_floating (iter), &treeiter);
prev_ti = ti; prev_ti = ti;
prev_treeiter = treeiter; prev_treeiter = treeiter;
@ -448,9 +451,9 @@ mug_msg_list_view_query (MugMsgListView * self, const char *query)
return TRUE; return TRUE;
rv = update_model (priv->_store, priv->_xpath, query, self); rv = update_model (priv->_store, priv->_xpath, query, self);
gtk_tree_view_expand_all (GTK_TREE_VIEW(self)); gtk_tree_view_expand_all (GTK_TREE_VIEW(self));
return rv; return rv;
} }

9
toys/mug2/mug.c
View File

@ -61,6 +61,7 @@ static void
reindex (MugData *mugdata) reindex (MugData *mugdata)
{ {
MuIndex *midx; MuIndex *midx;
MuStore *store;
GError *err; GError *err;
if (mu_store_database_is_locked if (mu_store_database_is_locked
@ -68,9 +69,10 @@ reindex (MugData *mugdata)
return; return;
err = NULL; err = NULL;
midx = mu_index_new (mu_runtime_path(MU_RUNTIME_PATH_XAPIANDB), store = mu_store_new_writable (mu_runtime_path(MU_RUNTIME_PATH_XAPIANDB),
mu_runtime_path(MU_RUNTIME_PATH_CONTACTS), mu_runtime_path(MU_RUNTIME_PATH_CONTACTS),
&err); &err);
midx = store ? mu_index_new (store, &err) : NULL;
if (!midx) { if (!midx) {
if (err && err->code == MU_ERROR_XAPIAN_CANNOT_GET_WRITELOCK) { if (err && err->code == MU_ERROR_XAPIAN_CANNOT_GET_WRITELOCK) {
g_warning ("database busy..."); g_warning ("database busy...");
@ -86,6 +88,7 @@ reindex (MugData *mugdata)
FALSE, NULL, (MuIndexMsgCallback)each_msg, NULL, mugdata); FALSE, NULL, (MuIndexMsgCallback)each_msg, NULL, mugdata);
mu_index_destroy (midx); mu_index_destroy (midx);
mu_store_unref (store);
} }