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;
MuQuery *xapian;
MuMsgIter *iter;
MuStore *store;
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_signal_emit (G_OBJECT (self),
signals[MUG_ERROR_OCCURED], 0,
@ -334,6 +338,7 @@ run_query (const char *xpath, const char *query, MugMsgListView * self)
g_error_free (err);
return NULL;
}
mu_store_unref (store);
iter = mu_query_run (xapian, query, FALSE, MU_MSG_FIELD_ID_DATE,
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);
mu_msg_iter_next (iter), ++count) {
MuMsg *msg;
msg = mu_msg_iter_get_msg (iter, NULL); /* don't unref */
add_row (store, msg);
}
mu_msg_iter_next (iter), ++count)
add_row (store, mu_msg_iter_get_msg_floating(iter)); /* don't unref */
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)
{
GtkToolItem *btn;
btn = gtk_tool_button_new_from_stock (stock_id);
g_object_set_data (G_OBJECT (btn), "action",
GUINT_TO_POINTER (action));
@ -139,7 +139,7 @@ mug_toolbar (MugData * mugdata)
(tools[i].stock_id, tools[i].action,
mugdata), i);
}
return toolbar;
}
@ -342,7 +342,7 @@ mug_shell (MugData * mugdata)
// gtk_window_set_icon_from_file (GTK_WINDOW (mugdata->win), icon, NULL);
// g_free (icon);
// }
return mugdata->win;
}