* merge mu-msg-contact.[ch] with mu-msg.[ch]

src/mu-msg.c

@@ -187,10 +187,10 @@ get_str_field (MuMsg *self, MuMsgFieldId mfid)
 static gint64
 get_num_field (MuMsg *self, MuMsgFieldId mfid)
 {
-		 guint64 val;
+		guint64 val;
 		 
-		 if (mu_msg_cache_cached (self->_cache, mfid))
-				 return mu_msg_cache_num (self->_cache, mfid);
+		if (mu_msg_cache_cached (self->_cache, mfid))
+				return mu_msg_cache_num (self->_cache, mfid);
 		 
 		/* if we don't have a file object yet, we need to create from
 		 * the file on disk */
@@ -361,3 +361,140 @@ mu_msg_get_field_numeric (MuMsg *self, MuMsgFieldId mfid)
 		g_return_val_if_fail (self, -1);
 		return get_num_field (self, mfid);
 }
+
+
+
+MuMsgContact *
+mu_msg_contact_new (const char *name, const char *address,
+					MuMsgContactType type)
+{
+		MuMsgContact *self;
+	
+		g_return_val_if_fail (name, NULL);
+		g_return_val_if_fail (address, NULL);
+		g_return_val_if_fail (!mu_msg_contact_type_is_valid(type),
+							  NULL);
+
+		self = g_slice_new (MuMsgContact);
+
+		self->name	 = g_strdup(name);
+		self->address = g_strdup(address);
+		self->type    = type;
+
+		return self;	
+}
+
+
+void
+mu_msg_contact_destroy (MuMsgContact *self)
+{
+
+		if (!self)
+				return;
+
+		g_free ((void*)self->name);
+		g_free ((void*)self->address);
+		g_slice_free (MuMsgContact, self);
+}
+	
+
+static gboolean
+fill_contact (MuMsgContact *self, InternetAddress *addr,
+			  MuMsgContactType ctype)
+{
+		if (!addr)
+				return FALSE;
+	
+		self->name = internet_address_get_name (addr);
+		self->type = ctype;  
+	
+		/* we only support internet mailbox addresses; if we don't
+		 * check, g_mime hits an assert
+		 */
+		if (INTERNET_ADDRESS_IS_MAILBOX(addr))
+				self->address = internet_address_mailbox_get_addr
+						(INTERNET_ADDRESS_MAILBOX(addr));
+		else
+				self->address  = NULL;
+	
+		return TRUE;
+}
+
+
+static void
+address_list_foreach (InternetAddressList *addrlist,
+					  MuMsgContactType     ctype,
+					  MuMsgContactForeachFunc func, 
+					  gpointer user_data)
+{
+		int i;
+	
+		if (!addrlist)
+				return;
+	
+		for (i = 0; i != internet_address_list_length(addrlist); ++i) {
+		
+				MuMsgContact contact;
+				if (!fill_contact(&contact,
+								  internet_address_list_get_address (addrlist, i),
+								  ctype)) {
+						MU_WRITE_LOG ("ignoring contact");
+						continue;
+				}
+		
+				if (!(func)(&contact, user_data))
+						break;
+		}
+}
+
+
+
+static void
+get_contacts_from (MuMsg *msg, MuMsgContactForeachFunc func, 
+				   gpointer user_data)
+{
+		InternetAddressList *lst;
+	
+		/* we go through this whole excercise of trying to get a *list*
+		 * of 'From:' address (usually there is only one...), because
+		 * internet_address_parse_string has the nice side-effect of
+		 * splitting in names and addresses for us */
+		lst = internet_address_list_parse_string (
+				g_mime_message_get_sender (msg->_file->_mime_msg));
+
+		if (lst) {
+				address_list_foreach (lst, MU_MSG_CONTACT_TYPE_FROM,
+									  func, user_data);
+				g_object_unref (G_OBJECT(lst));
+		} 
+}
+
+
+void
+mu_msg_contact_foreach (MuMsg *msg, MuMsgContactForeachFunc func, 
+						gpointer user_data)
+{
+		int i;		
+		struct { 
+				GMimeRecipientType     _gmime_type;
+				MuMsgContactType       _type;
+		} ctypes[] = {
+				{GMIME_RECIPIENT_TYPE_TO,  MU_MSG_CONTACT_TYPE_TO},
+				{GMIME_RECIPIENT_TYPE_CC,  MU_MSG_CONTACT_TYPE_CC},
+				{GMIME_RECIPIENT_TYPE_BCC, MU_MSG_CONTACT_TYPE_BCC},
+		};
+
+		g_return_if_fail (func && msg);
+
+		/* first, get the from address(es) */
+		get_contacts_from (msg, func, user_data);
+
+		/* get to, cc, bcc */
+		for (i = 0; i != G_N_ELEMENTS(ctypes); ++i) {
+				InternetAddressList *addrlist;
+				addrlist = g_mime_message_get_recipients (msg->_file->_mime_msg,
+														  ctypes[i]._gmime_type);
+				address_list_foreach (addrlist, ctypes[i]._type, func, user_data);
+		}
+}
+