From caef14f3166ddec68d2e48497970910dbbce6e21 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Tue, 17 May 2011 23:24:29 +0300 Subject: [PATCH] * mu-msg-iter.{cc,h}: updete for mu-msg-data removal --- src/mu-msg-iter.cc | 44 -------------------------------------------- src/mu-msg-iter.h | 17 +---------------- 2 files changed, 1 insertion(+), 60 deletions(-) diff --git a/src/mu-msg-iter.cc b/src/mu-msg-iter.cc index bfdd7618..57e65756 100644 --- a/src/mu-msg-iter.cc +++ b/src/mu-msg-iter.cc @@ -350,47 +350,3 @@ mu_msg_iter_get_prio (MuMsgIter *iter) } -static gchar* -get_field_copy (MuMsgIter *iter, MuMsgFieldId mfid) -{ - const char *s; - - s = get_field (iter, mfid); - return s ? g_strdup (s) : NULL; -} - -MuMsgData* -mu_msg_iter_get_msgdata (MuMsgIter *iter) -{ - MuMsgData *mdata; - - g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL); - - mdata = mu_msg_data_new (); - - try { - mdata->cc = get_field_copy (iter, MU_MSG_FIELD_ID_CC); - mdata->from = get_field_copy (iter, MU_MSG_FIELD_ID_FROM); - mdata->maildir = get_field_copy (iter, MU_MSG_FIELD_ID_MAILDIR); - mdata->msgid = get_field_copy (iter, MU_MSG_FIELD_ID_MSGID); - mdata->path = get_field_copy (iter, MU_MSG_FIELD_ID_PATH); - mdata->refs = get_field_copy (iter, MU_MSG_FIELD_ID_REFS); - mdata->subject = get_field_copy (iter, MU_MSG_FIELD_ID_SUBJECT); - mdata->to = get_field_copy (iter, MU_MSG_FIELD_ID_TO); - - mdata->size = static_cast(get_field_numeric - (iter, MU_MSG_FIELD_ID_SIZE)); - mdata->date = static_cast(get_field_numeric - (iter, MU_MSG_FIELD_ID_DATE)); - mdata->flags = static_cast(get_field_numeric - (iter, MU_MSG_FIELD_ID_FLAGS)); - mdata->prio = static_cast(get_field_numeric - (iter, MU_MSG_FIELD_ID_PRIO)); - - return mdata; - - } MU_XAPIAN_CATCH_BLOCK; - - mu_msg_data_destroy (mdata); /* something bad happended */ - return NULL; -} diff --git a/src/mu-msg-iter.h b/src/mu-msg-iter.h index faa60fe4..03d64384 100644 --- a/src/mu-msg-iter.h +++ b/src/mu-msg-iter.h @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2011 Dirk-Jan C. Binnema +** Copyright (C) 2008-2010 Dirk-Jan C. Binnema ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -22,7 +22,6 @@ #include #include -#include G_BEGIN_DECLS @@ -86,20 +85,6 @@ MuMsg* mu_msg_iter_get_msg (MuMsgIter *iter, GError **err) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; -/** - * get a structure with information about this iter; this struct is - * newly allocated, can be used to keep an in-memory record of a - * message - * - * @param iter a valid msg iterator - * - * @return a newly allocate MuMsgData struct (free with - * mu_msg_data_destroy), or NULL in case of error - */ -MuMsgData* mu_msg_iter_get_msgdata (MuMsgIter *iter) - G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; - - /** * get the document id for the current message