diff --git a/toys/mug/mug-msg-list-view.c b/toys/mug/mug-msg-list-view.c index d0f89f6e..ea09037b 100644 --- a/toys/mug/mug-msg-list-view.c +++ b/toys/mug/mug-msg-list-view.c @@ -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); diff --git a/toys/mug/mug.c b/toys/mug/mug.c index f85bce4c..dbee1728 100644 --- a/toys/mug/mug.c +++ b/toys/mug/mug.c @@ -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; } diff --git a/toys/mug2/mug-msg-list-view.c b/toys/mug2/mug-msg-list-view.c index cfd8e08c..43d0ee9a 100644 --- a/toys/mug2/mug-msg-list-view.c +++ b/toys/mug2/mug-msg-list-view.c @@ -160,7 +160,7 @@ append_col (GtkTreeView * treeview, const char *label, int colidx, sortcolidx = colidx; gtk_tree_view_column_set_sort_column_id (col, sortcolidx); gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_FIXED); - + if (maxwidth) { gtk_tree_view_column_set_fixed_width (col, maxwidth); 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); gtk_tree_view_append_column (treeview, col); - + gtk_tree_view_columns_autosize (treeview); 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, /* flags */ G_TYPE_INT); /* timeval */ - + tview = GTK_TREE_VIEW (obj); gtk_tree_view_set_model (tview, GTK_TREE_MODEL (priv->_store)); 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; 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, @@ -337,6 +340,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, TRUE, MU_MSG_FIELD_ID_DATE, TRUE, &err); @@ -365,7 +369,7 @@ add_row (GtkTreeStore * store, MuMsg *msg, GtkTreeIter *treeiter) from = empty_or_display_contact (mu_msg_get_from (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); - + /* if (0) { */ /* GtkTreeIter myiter; */ /* 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; const MuMsgIterThreadInfo *ti; - MuMsg *msg; ti = mu_msg_iter_get_thread_info (iter); if (!prev_ti || !g_str_has_prefix (ti->threadpath, prev_ti->threadpath)) gtk_tree_store_append (store, &treeiter, NULL); - else + else gtk_tree_store_append (store, &treeiter, &prev_treeiter); - - msg = mu_msg_iter_get_msg (iter, NULL); /* don't unref */ - add_row (store, msg, &treeiter); + + /* don't unref msg */ + add_row (store, mu_msg_iter_get_msg_floating (iter), &treeiter); prev_ti = ti; prev_treeiter = treeiter; @@ -448,9 +451,9 @@ mug_msg_list_view_query (MugMsgListView * self, const char *query) return TRUE; rv = update_model (priv->_store, priv->_xpath, query, self); - + gtk_tree_view_expand_all (GTK_TREE_VIEW(self)); - + return rv; } diff --git a/toys/mug2/mug.c b/toys/mug2/mug.c index 6af87b88..b4bafc92 100644 --- a/toys/mug2/mug.c +++ b/toys/mug2/mug.c @@ -61,6 +61,7 @@ static void reindex (MugData *mugdata) { MuIndex *midx; + MuStore *store; GError *err; if (mu_store_database_is_locked @@ -68,9 +69,10 @@ reindex (MugData *mugdata) return; err = NULL; - midx = mu_index_new (mu_runtime_path(MU_RUNTIME_PATH_XAPIANDB), - mu_runtime_path(MU_RUNTIME_PATH_CONTACTS), - &err); + store = mu_store_new_writable (mu_runtime_path(MU_RUNTIME_PATH_XAPIANDB), + mu_runtime_path(MU_RUNTIME_PATH_CONTACTS), + &err); + midx = store ? mu_index_new (store, &err) : NULL; if (!midx) { if (err && err->code == MU_ERROR_XAPIAN_CANNOT_GET_WRITELOCK) { g_warning ("database busy..."); @@ -86,6 +88,7 @@ reindex (MugData *mugdata) FALSE, NULL, (MuIndexMsgCallback)each_msg, NULL, mugdata); mu_index_destroy (midx); + mu_store_unref (store); }