Attachment #225373 for bug #311499

View | Details | Raw Unified | Return to bug 311499
Collapse All | Expand All




                        indexable.AddProperty (Property.NewUnsearched ("fixme:folder", this.folder_name));

			GMime.InternetAddressList addrs;
			
			if (this.folder_name == "Sent") {
				addrs = message.GetRecipients (GMime.RecipientType.To);
				foreach (GMime.InternetAddress ia in addrs) {
					if (ia is GMime.InternetAddressMailbox) {
						GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
						
						indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
					}
				}
				
				addrs.Dispose ();
			}
			
			if (this.folder_name == "Sent") {
				addrs = message.GetRecipients (GMime.RecipientType.Cc);
				foreach (GMime.InternetAddress ia in addrs) {
					if (ia is GMime.InternetAddressMailbox) {
						GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
						
						indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
					}
				}
				
				addrs.Dispose ();
			}
			
			if (this.folder_name != "Sent") {
				addrs = GMime.InternetAddressList.Parse (message.Sender);
				foreach (GMime.InternetAddress ia in addrs) {
					if (ia is GMime.InternetAddressMailbox) {
						GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
					
						indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", mailbox.Address));
					}
				}
				
				addrs.Dispose ();
			}
			

			if (this.folder_name == "Sent")
				indexable.AddProperty (Property.NewFlag ("fixme:isSent"));


			}

			GMime.InternetAddressList addrs;
			addrs = GMime.InternetAddressList.Parse (messageInfo.to);
			foreach (GMime.InternetAddress ia in addrs) {
				GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
				
				if (!have_content) {
					indexable.AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));
					if (ia is GMime.InternetAddressMailbox)
						indexable.AddProperty (Property.New ("fixme:to_address", mailbox.Address));
					
					indexable.AddProperty (Property.New ("fixme:to_name", ia.Name));
				}
				
				if (this.folder_name == "Sent" && ia is GMime.InternetAddressMailbox)
					indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
			}
			addrs.Dispose ();

			addrs = GMime.InternetAddressList.Parse (messageInfo.cc);
			foreach (GMime.InternetAddress ia in addrs) {
				GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
				
				if (!have_content) {
					indexable.AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));
					if (ia is GMime.InternetAddressMailbox)
						indexable.AddProperty (Property.New ("fixme:cc_address", mailbox.Address));
					
					indexable.AddProperty (Property.New ("fixme:cc_name", ia.Name));
				}
				
				if (this.folder_name == "Sent" && ia is GMime.InternetAddressMailbox)
					indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
			}
			addrs.Dispose ();

			addrs = GMime.InternetAddressList.Parse (messageInfo.from);
			foreach (GMime.InternetAddress ia in addrs) {
				GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
				
				if (!have_content) {
					indexable.AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));
					if (ia is GMime.InternetAddressMailbox)
						indexable.AddProperty (Property.New ("fixme:from_address", mailbox.Address));
					
					indexable.AddProperty (Property.New ("fixme:from_name", ia.Name));
				}

				if (this.folder_name != "Sent" && ia is GMime.InternetAddressMailbox)
					indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", mailbox.Address));
			}
			addrs.Dispose ();





			hit.AddProperty (Property.NewDate ("fixme:date", message.Date.ToUniversalTime ()));

			GMime.InternetAddressList addrs;
			addrs = message.GetRecipients (GMime.RecipientType.To);
			foreach (GMime.InternetAddress ia in addrs) {
				hit.AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));
				if (ia is GMime.InternetAddressMailbox) {
					GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
					
					hit.AddProperty (Property.New ("fixme:to_address", mailbox.Address));
				}
				
				hit.AddProperty (Property.New ("fixme:to_name", ia.Name));
			}
			addrs.Dispose ();

			addrs = message.GetRecipients (GMime.RecipientType.Cc);
			foreach (GMime.InternetAddress ia in addrs) {
				hit.AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));
				if (ia is GMime.InternetAddressMailbox) {
					GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
					
					hit.AddProperty (Property.New ("fixme:cc_address", mailbox.Address));
				}
				
				hit.AddProperty (Property.New ("fixme:cc_name", ia.Name));
			}
			addrs.Dispose ();

			addrs = GMime.InternetAddressList.Parse (message.Sender);
			foreach (GMime.InternetAddress ia in addrs) {
				hit.AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));
				if (ia is GMime.InternetAddressMailbox) {
					GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
					
					hit.AddProperty (Property.New ("fixme:from_address", mailbox.Address));
				}
				
				hit.AddProperty (Property.New ("fixme:from_name", ia.Name));
			}
			addrs.Dispose ();

			foreach (GMime.References refs in message.References)
				hit.AddProperty (Property.NewUnsearched ("fixme:reference", refs.MessageId));

			string list_id = message.GetHeader ("List-Id");
			if (list_id != null)




                        indexable.AddProperty (Property.NewUnsearched ("fixme:folder", folder_name));

			GMime.InternetAddressList addrs;
			
			if (folder_name == Queryable.SentMailFolderName) {
				addrs = message.GetRecipients (GMime.RecipientType.To);
				foreach (GMime.InternetAddress ia in addrs) {
					if (ia is GMime.InternetAddressMailbox) {
						GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
						
						indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", mailbox.Address));
					}
				}
				
				addrs.Dispose ();
			}
			addrs.Dispose ();

			addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender));
			foreach (GMime.InternetAddress ia in addrs) {
				if (folder_name != Queryable.SentMailFolderName && ia.AddressType != GMime.InternetAddressType.Group)
					indexable.AddProperty (Property.NewKeyword ("fixme:gotFrom", ia.Addr));
			}
			
			if (folder_name == Queryable.SentMailFolderName) {
				addrs = message.GetRecipients (GMime.RecipientType.Cc);
				foreach (GMime.InternetAddress ia in addrs) {
					if (ia is GMime.InternetAddressMailbox) {
						GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
						
						indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", mailbox.Address));
					}
				}
				
				addrs.Dispose ();
			}
			
			if (folder_name != Queryable.SentMailFolderName) {
				addrs = GMime.InternetAddressList.Parse (message.Sender);
				foreach (GMime.InternetAddress ia in addrs) {
					if (ia is GMime.InternetAddressMailbox) {
						GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
						
						indexable.AddProperty (Property.NewKeyword ("fixme:gotFrom", mailbox.Address));
					}
				}
				
				addrs.Dispose ();
			}
			
			if (folder_name == Queryable.SentMailFolderName)
				indexable.AddProperty (Property.NewFlag ("fixme:isSent"));
			else {

Lines 367-375 namespace Beagle.Daemon.ThunderbirdQuery Link Here

(-)beagle-0.3.9.orign/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs (-6 / +11 lines)
367	message.Subject = Mime.HeaderDecodeText (GetText (document, "Subject"));	367	message.Subject = Mime.HeaderDecodeText (GetText (document, "Subject"));
368	message.Sender = Mime.HeaderDecodePhrase (GetText (document, "Author"));	368	message.Sender = Mime.HeaderDecodePhrase (GetText (document, "Author"));
369	message.MessageId = GetText (document, "MessageId");	369	message.MessageId = GetText (document, "MessageId");
370	message.SetDate (DateTimeUtil.UnixToDateTimeUtc (Convert.ToInt64 (GetText (document, "Date"))), 0);	370	message.Date = DateTimeUtil.UnixToDateTimeUtc (Convert.ToInt64 (GetText (document, "Date")));
371	message.AddRecipientsFromString ("To", Mime.HeaderDecodePhrase (GetText (document, "Recipients")));	371
372		372	string str = GetText (document, "Recipients");
		373	GMime.InternetAddressList recipients = GMime.InternetAddressList.Parse (str);
		374	foreach (GMime.InternetAddress ia in recipients)
		375	message.To.Add (ia);
		376	recipients.Dispose ();
		377
373	return message;	378	return message;
374	}	379	}
375		380
Lines 434-440 namespace Beagle.Daemon.ThunderbirdQuery Link Here
434		439
435	// We _know_ that the stream comes from a StreamReader, which uses UTF8 by	440	// We _know_ that the stream comes from a StreamReader, which uses UTF8 by
436	// default. So we use that here when parsing our string.	441	// default. So we use that here when parsing our string.
437	return (str != null ? Encoding.UTF8.GetString (str, 0, pos) : string.Empty);	442	return (str != null ? System.Text.Encoding.UTF8.GetString (str, 0, pos) : string.Empty);
438	}	443	}
439		444
440	// This spell "charset="	445	// This spell "charset="
Lines 462-468 namespace Beagle.Daemon.ThunderbirdQuery Link Here
462	// instead of UTF-8 in some cases and that will really mess things up.	467	// instead of UTF-8 in some cases and that will really mess things up.
463	byte[] buffer = null;	468	byte[] buffer = null;
464	int c, header_length = 0, newlines = 0, charset_pos = 0;	469	int c, header_length = 0, newlines = 0, charset_pos = 0;
465	Encoding enc = Encoding.UTF8;	470	System.Text.Encoding enc = System.Text.Encoding.UTF8;
466	try {	471	try {
467	do {	472	do {
468	c = stream.BaseStream.ReadByte ();	473	c = stream.BaseStream.ReadByte ();
Lines 491-497 namespace Beagle.Daemon.ThunderbirdQuery Link Here
491	stream.BaseStream.Read (buffer, 0, buffer.Length);	496	stream.BaseStream.Read (buffer, 0, buffer.Length);
492		497
493	// We need to use correct encoding	498	// We need to use correct encoding
494	enc = Encoding.GetEncoding (encoding_str);	499	enc = System.Text.Encoding.GetEncoding (encoding_str);
495	} catch {	500	} catch {
496	} finally {	501	} finally {
497	stream.Close ();	502	stream.Close ();




NDESK_DBUS_REQUIRED=0.5.2
NDESK_DBUS_GLIB_REQUIRED=0.3.0
GTK_SHARP_REQUIRED=2.10.0
GMIME_SHARP_REQUIRED=2.4.0
EVOLUTION_SHARP_REQUIRED=0.13.3
GSF_SHARP_REQUIRED=0.6
GTK_REQUIRED=2.10.0

	glade-sharp-2.0 >= \$GTK_SHARP_REQUIRED
	gnome-sharp-2.0 >= \$GTK_SHARP_REQUIRED
	gnome-vfs-sharp-2.0 >= \$GTK_SHARP_REQUIRED
	gmime-sharp-2.6 >= \$GMIME_SHARP_REQUIRED
\"") >&5
  ($PKG_CONFIG --exists --print-errors "
	gtk-sharp-2.0 >= $GTK_SHARP_REQUIRED

	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
") 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5

	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
" 2>/dev/null`
else
  pkg_failed=yes

	glade-sharp-2.0 >= \$GTK_SHARP_REQUIRED
	gnome-sharp-2.0 >= \$GTK_SHARP_REQUIRED
	gnome-vfs-sharp-2.0 >= \$GTK_SHARP_REQUIRED
	gmime-sharp-2.6 >= \$GMIME_SHARP_REQUIRED
\"") >&5
  ($PKG_CONFIG --exists --print-errors "
	gtk-sharp-2.0 >= $GTK_SHARP_REQUIRED

	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
") 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5

	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
" 2>/dev/null`
else
  pkg_failed=yes

	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
"`
        else
	        BEAGLE_UI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "

	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
"`
        fi
	# Put the nasty error message in config.log where it belongs

	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
) were not met:

$BEAGLE_UI_PKG_ERRORS

	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
) were not met:

$BEAGLE_UI_PKG_ERRORS

    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-sharp >= \$EVOLUTION_SHARP_REQUIRED 	\\
                  gconf-sharp-2.0 >= \$GTK_SHARP_REQUIRED	\\
		  glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED
                  gmime-sharp-2.6 >= \$GMIME_SHARP_REQUIRED\"") >&5
  ($PKG_CONFIG --exists --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
                  gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
		  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
                  gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED") 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; then
  pkg_cv_EVO_CFLAGS=`$PKG_CONFIG --cflags "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
                  gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
		  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
                  gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED" 2>/dev/null`
else
  pkg_failed=yes
fi

    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-sharp >= \$EVOLUTION_SHARP_REQUIRED 	\\
                  gconf-sharp-2.0 >= \$GTK_SHARP_REQUIRED	\\
		  glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED
                  gmime-sharp-2.6 >= \$GMIME_SHARP_REQUIRED\"") >&5
  ($PKG_CONFIG --exists --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
                  gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
		  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
                  gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED") 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; then
  pkg_cv_EVO_LIBS=`$PKG_CONFIG --libs "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
                  gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
		  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
                  gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED" 2>/dev/null`
else
  pkg_failed=yes
fi

	        EVO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
                  gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
		  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
                  gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED"`
        else
	        EVO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
                  gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
		  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
                  gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED"`
        fi
	# Put the nasty error message in config.log where it belongs
	echo "$EVO_PKG_ERRORS" >&5

        if test -n "$PKG_CONFIG" && \
    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
	shared-mime-info
	gmime-sharp-2.6 >= \$GMIME_SHARP_REQUIRED
	glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED
\"") >&5
  ($PKG_CONFIG --exists --print-errors "
	shared-mime-info
	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
") 2>&5
  ac_status=$?

  (exit $ac_status); }; then
  pkg_cv_BEAGLED_CFLAGS=`$PKG_CONFIG --cflags "
	shared-mime-info
	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
" 2>/dev/null`
else

        if test -n "$PKG_CONFIG" && \
    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
	shared-mime-info
	gmime-sharp-2.6 >= \$GMIME_SHARP_REQUIRED
	glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED
\"") >&5
  ($PKG_CONFIG --exists --print-errors "
	shared-mime-info
	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
") 2>&5
  ac_status=$?

  (exit $ac_status); }; then
  pkg_cv_BEAGLED_LIBS=`$PKG_CONFIG --libs "
	shared-mime-info
	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
" 2>/dev/null`
else

        if test $_pkg_short_errors_supported = yes; then
	        BEAGLED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
	shared-mime-info
	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
"`
        else
	        BEAGLED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
	shared-mime-info
	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
"`
        fi


	{ { echo "$as_me:$LINENO: error: Package requirements (
	shared-mime-info
	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
) were not met:


" >&5
echo "$as_me: error: Package requirements (
	shared-mime-info
	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
) were not met:




GSF_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gsf-sharp`
GMIME_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gmime-sharp-2.6`


# Check whether --enable-epiphany-extension was given.





			// Messages that are multipart/alternative shouldn't be considered as having
			// attachments.  Unless of course they do.
			if (mime_part is GMime.Multipart && mime_part.ContentType.MediaSubtype.ToLower () != "alternative")
				return true;

			return false;

			AddProperty (Property.NewDate ("fixme:date", message.Date.ToUniversalTime ()));

			GMime.InternetAddressList addrs;
			addrs = this.message.GetRecipients (GMime.RecipientType.To);
			foreach (GMime.InternetAddress ia in addrs) {
				AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));
				if (ia is GMime.InternetAddressMailbox) {
					GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
					
					AddProperty (Property.New ("fixme:to_address", mailbox.Address));
				}
				
				AddProperty (Property.New ("fixme:to_name", ia.Name));
				AddEmailLink (ia);
			}
			addrs.Dispose ();

			addrs = this.message.GetRecipients (GMime.RecipientType.Cc);
			foreach (GMime.InternetAddress ia in addrs) {
				AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));
				if (ia is GMime.InternetAddressMailbox) {
					GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
					
					AddProperty (Property.New ("fixme:cc_address", mailbox.Address));
				}
				
				AddProperty (Property.New ("fixme:cc_name", ia.Name));
				AddEmailLink (ia);
			}
			addrs.Dispose ();

			addrs = GMime.InternetAddressList.Parse (this.message.Sender);
			foreach (GMime.InternetAddress ia in addrs) {
				AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));
				if (ia is GMime.InternetAddressMailbox) {
					GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
					
					AddProperty (Property.New ("fixme:from_address", mailbox.Address));
				}
				
				AddProperty (Property.New ("fixme:from_name", ia.Name));
				AddEmailLink (ia);
			}

				AddProperty (Property.NewUnsearched ("fixme:msgid", GMime.Utils.DecodeMessageId (msgid)));

			foreach (GMime.References refs in this.message.References)
				AddProperty (Property.NewUnsearched ("fixme:reference", refs.MessageId));

			string list_id = this.message.GetHeader ("List-Id");
			if (list_id != null)

					}
				} else if (mime_part is GMime.Multipart) {
					GMime.Multipart multipart = (GMime.Multipart) mime_part;
					int num_parts = multipart.Count;
					int num_parts = multipart.Number;

					// If the mimetype is multipart/alternative, we only want to index
					// one part -- the richest one we can filter.
					if (mime_part.ContentType.MediaSubtype.ToLower () == "alternative") {
						// The richest formats are at the end, so work from there
						// backward.
						for (int i = num_parts - 1; i >= 0; i--) {
							GMime.Object subpart = multipart[i];

							if (IsMimeTypeHandled (subpart.ContentType.ToString ())) {
								part = subpart;

					// the parts, treat them like a bunch of attachments.
					if (part == null) {
						for (int i = 0; i < num_parts; i++) {
							using (GMime.Object subpart = multipart[i])
								this.OnEachPart (subpart);
						}
					}

						} else if (mime_type == "text/html") {
							no_child_needed = true;
							html_part = true;
							string enc = part.ContentType.GetParameter ("charset"); 
							// DataWrapper.Stream is a very limited stream
							// and does not allow Seek or Tell
							// HtmlFilter requires Stream.Position=0.

							if (length != -1)
								child.AddProperty (Property.NewUnsearched ("fixme:filesize", length));

							if (part.ContentType.MediaType.ToLower () == "text")
								child.SetTextReader (new StreamReader (stream));
							else
								child.SetBinaryStream (stream);

Return to bug 311499

Lines 333-360 namespace Beagle.Daemon.EvolutionMailQue Link Here

(-)beagle-0.3.9.orign/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs (-39 / +63 lines)
333	indexable.AddProperty (Property.NewUnsearched ("fixme:folder", this.folder_name));	333	indexable.AddProperty (Property.NewUnsearched ("fixme:folder", this.folder_name));
334		334
335	GMime.InternetAddressList addrs;	335	GMime.InternetAddressList addrs;
336		336
337	addrs = message.GetRecipients (GMime.Message.RecipientType.To);	337	if (this.folder_name == "Sent") {
338	foreach (GMime.InternetAddress ia in addrs) {	338	addrs = message.GetRecipients (GMime.RecipientType.To);
339	if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group)	339	foreach (GMime.InternetAddress ia in addrs) {
340	indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr));	340	if (ia is GMime.InternetAddressMailbox) {
		341	GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
		342
		343	indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
		344	}
		345	}
		346
		347	addrs.Dispose ();
341	}	348	}
342	addrs.Dispose ();	349
343		350	if (this.folder_name == "Sent") {
344	addrs = message.GetRecipients (GMime.Message.RecipientType.Cc);	351	addrs = message.GetRecipients (GMime.RecipientType.Cc);
345	foreach (GMime.InternetAddress ia in addrs) {	352	foreach (GMime.InternetAddress ia in addrs) {
346	if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group)	353	if (ia is GMime.InternetAddressMailbox) {
347	indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr));	354	GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
		355
		356	indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
		357	}
		358	}
		359
		360	addrs.Dispose ();
348	}	361	}
349	addrs.Dispose ();	362
350		363	if (this.folder_name != "Sent") {
351	addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender));	364	addrs = GMime.InternetAddressList.Parse (message.Sender);
352	foreach (GMime.InternetAddress ia in addrs) {	365	foreach (GMime.InternetAddress ia in addrs) {
353	if (this.folder_name != "Sent" && ia.AddressType != GMime.InternetAddressType.Group)	366	if (ia is GMime.InternetAddressMailbox) {
354	indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", ia.Addr));	367	GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
		368
		369	indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", mailbox.Address));
		370	}
		371	}
		372
		373	addrs.Dispose ();
355	}	374	}
356	addrs.Dispose ();	375
357
358	if (this.folder_name == "Sent")	376	if (this.folder_name == "Sent")
359	indexable.AddProperty (Property.NewFlag ("fixme:isSent"));	377	indexable.AddProperty (Property.NewFlag ("fixme:isSent"));
360		378
Lines 750-797 namespace Beagle.Daemon.EvolutionMailQue Link Here
750	}	768	}
751		769
752	GMime.InternetAddressList addrs;	770	GMime.InternetAddressList addrs;
753	addrs = GMime.InternetAddressList.ParseString (messageInfo.to);	771	addrs = GMime.InternetAddressList.Parse (messageInfo.to);
754	foreach (GMime.InternetAddress ia in addrs) {	772	foreach (GMime.InternetAddress ia in addrs) {
		773	GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
		774
755	if (!have_content) {	775	if (!have_content) {
756	indexable.AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));	776	indexable.AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));
757	if (ia.AddressType != GMime.InternetAddressType.Group)	777	if (ia is GMime.InternetAddressMailbox)
758	indexable.AddProperty (Property.New ("fixme:to_address", ia.Addr));	778	indexable.AddProperty (Property.New ("fixme:to_address", mailbox.Address));
759		779
760	indexable.AddProperty (Property.New ("fixme:to_name", ia.Name));	780	indexable.AddProperty (Property.New ("fixme:to_name", ia.Name));
761	}	781	}
762		782
763	if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group)	783	if (this.folder_name == "Sent" && ia is GMime.InternetAddressMailbox)
764	indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr));	784	indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
765	}	785	}
766	addrs.Dispose ();	786	addrs.Dispose ();
767		787
768	addrs = GMime.InternetAddressList.ParseString (messageInfo.cc);	788	addrs = GMime.InternetAddressList.Parse (messageInfo.cc);
769	foreach (GMime.InternetAddress ia in addrs) {	789	foreach (GMime.InternetAddress ia in addrs) {
		790	GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
		791
770	if (!have_content) {	792	if (!have_content) {
771	indexable.AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));	793	indexable.AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));
772	if (ia.AddressType != GMime.InternetAddressType.Group)	794	if (ia is GMime.InternetAddressMailbox)
773	indexable.AddProperty (Property.New ("fixme:cc_address", ia.Addr));	795	indexable.AddProperty (Property.New ("fixme:cc_address", mailbox.Address));
774		796
775	indexable.AddProperty (Property.New ("fixme:cc_name", ia.Name));	797	indexable.AddProperty (Property.New ("fixme:cc_name", ia.Name));
776	}	798	}
777		799
778	if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group)	800	if (this.folder_name == "Sent" && ia is GMime.InternetAddressMailbox)
779	indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr));	801	indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
780	}	802	}
781	addrs.Dispose ();	803	addrs.Dispose ();
782		804
783	addrs = GMime.InternetAddressList.ParseString (messageInfo.from);	805	addrs = GMime.InternetAddressList.Parse (messageInfo.from);
784	foreach (GMime.InternetAddress ia in addrs) {	806	foreach (GMime.InternetAddress ia in addrs) {
		807	GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
		808
785	if (!have_content) {	809	if (!have_content) {
786	indexable.AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));	810	indexable.AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));
787	if (ia.AddressType != GMime.InternetAddressType.Group)	811	if (ia is GMime.InternetAddressMailbox)
788	indexable.AddProperty (Property.New ("fixme:from_address", ia.Addr));	812	indexable.AddProperty (Property.New ("fixme:from_address", mailbox.Address));
789		813
790	indexable.AddProperty (Property.New ("fixme:from_name", ia.Name));	814	indexable.AddProperty (Property.New ("fixme:from_name", ia.Name));
791	}	815	}
792		816
793	if (this.folder_name != "Sent" && ia.AddressType != GMime.InternetAddressType.Group)	817	if (this.folder_name != "Sent" && ia is GMime.InternetAddressMailbox)
794	indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", ia.Addr));	818	indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", mailbox.Address));
795	}	819	}
796	addrs.Dispose ();	820	addrs.Dispose ();
797		821

Lines 322-359 namespace Beagle.Daemon.GoogleBackend { Link Here

(-)beagle-0.3.9.orign/beagled/GoogleBackends/GMailSearchDriver.cs (-13 / +22 lines)
322	hit.AddProperty (Property.NewDate ("fixme:date", message.Date.ToUniversalTime ()));	322	hit.AddProperty (Property.NewDate ("fixme:date", message.Date.ToUniversalTime ()));
323		323
324	GMime.InternetAddressList addrs;	324	GMime.InternetAddressList addrs;
325	addrs = message.GetRecipients (GMime.Message.RecipientType.To);	325	addrs = message.GetRecipients (GMime.RecipientType.To);
326	foreach (GMime.InternetAddress ia in addrs) {	326	foreach (GMime.InternetAddress ia in addrs) {
327	hit.AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));	327	hit.AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));
328	if (ia.AddressType != GMime.InternetAddressType.Group)	328	if (ia is GMime.InternetAddressMailbox) {
329	hit.AddProperty (Property.New ("fixme:to_address", ia.Addr));	329	GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
330		330
		331	hit.AddProperty (Property.New ("fixme:to_address", mailbox.Address));
		332	}
		333
331	hit.AddProperty (Property.New ("fixme:to_name", ia.Name));	334	hit.AddProperty (Property.New ("fixme:to_name", ia.Name));
332	}	335	}
333	addrs.Dispose ();	336	addrs.Dispose ();
334		337
335	addrs = message.GetRecipients (GMime.Message.RecipientType.Cc);	338	addrs = message.GetRecipients (GMime.RecipientType.Cc);
336	foreach (GMime.InternetAddress ia in addrs) {	339	foreach (GMime.InternetAddress ia in addrs) {
337	hit.AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));	340	hit.AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));
338	if (ia.AddressType != GMime.InternetAddressType.Group)	341	if (ia is GMime.InternetAddressMailbox) {
339	hit.AddProperty (Property.New ("fixme:cc_address", ia.Addr));	342	GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
340		343
		344	hit.AddProperty (Property.New ("fixme:cc_address", mailbox.Address));
		345	}
		346
341	hit.AddProperty (Property.New ("fixme:cc_name", ia.Name));	347	hit.AddProperty (Property.New ("fixme:cc_name", ia.Name));
342	}	348	}
343	addrs.Dispose ();	349	addrs.Dispose ();
344		350
345	addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender));	351	addrs = GMime.InternetAddressList.Parse (message.Sender);
346	foreach (GMime.InternetAddress ia in addrs) {	352	foreach (GMime.InternetAddress ia in addrs) {
347	hit.AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));	353	hit.AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));
348	if (ia.AddressType != GMime.InternetAddressType.Group)	354	if (ia is GMime.InternetAddressMailbox) {
349	hit.AddProperty (Property.New ("fixme:from_address", ia.Addr));	355	GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
350		356
		357	hit.AddProperty (Property.New ("fixme:from_address", mailbox.Address));
		358	}
		359
351	hit.AddProperty (Property.New ("fixme:from_name", ia.Name));	360	hit.AddProperty (Property.New ("fixme:from_name", ia.Name));
352	}	361	}
353	addrs.Dispose ();	362	addrs.Dispose ();
354		363
355	foreach (GMime.References refs in message.References)	364	foreach (GMime.References refs in message.References)
356	hit.AddProperty (Property.NewUnsearched ("fixme:reference", refs.Msgid));	365	hit.AddProperty (Property.NewUnsearched ("fixme:reference", refs.MessageId));
357		366
358	string list_id = message.GetHeader ("List-Id");	367	string list_id = message.GetHeader ("List-Id");
359	if (list_id != null)	368	if (list_id != null)

Lines 407-434 namespace Beagle.Daemon.KMailQueryable { Link Here

(-)beagle-0.3.9.orign/beagled/KMailQueryable/KMailIndexer.cs (-21 / +39 lines)
407	indexable.AddProperty (Property.NewUnsearched ("fixme:folder", folder_name));	407	indexable.AddProperty (Property.NewUnsearched ("fixme:folder", folder_name));
408		408
409	GMime.InternetAddressList addrs;	409	GMime.InternetAddressList addrs;
410		410
411	addrs = message.GetRecipients (GMime.Message.RecipientType.To);	411	if (folder_name == Queryable.SentMailFolderName) {
412	foreach (GMime.InternetAddress ia in addrs) {	412	addrs = message.GetRecipients (GMime.RecipientType.To);
413	if (folder_name == Queryable.SentMailFolderName && ia.AddressType != GMime.InternetAddressType.Group)	413	foreach (GMime.InternetAddress ia in addrs) {
414	indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", ia.Addr));	414	if (ia is GMime.InternetAddressMailbox) {
415	}	415	GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
416	addrs.Dispose ();	416
417		417	indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", mailbox.Address));
418	addrs = message.GetRecipients (GMime.Message.RecipientType.Cc);	418	}
419	foreach (GMime.InternetAddress ia in addrs) {	419	}
420	if (folder_name == Queryable.SentMailFolderName && ia.AddressType != GMime.InternetAddressType.Group)	420
421	indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", ia.Addr));	421	addrs.Dispose ();
422	}
423	addrs.Dispose ();
424
425	addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender));
426	foreach (GMime.InternetAddress ia in addrs) {
427	if (folder_name != Queryable.SentMailFolderName && ia.AddressType != GMime.InternetAddressType.Group)
428	indexable.AddProperty (Property.NewKeyword ("fixme:gotFrom", ia.Addr));
429	}	422	}
430	addrs.Dispose ();	423
431		424	if (folder_name == Queryable.SentMailFolderName) {
		425	addrs = message.GetRecipients (GMime.RecipientType.Cc);
		426	foreach (GMime.InternetAddress ia in addrs) {
		427	if (ia is GMime.InternetAddressMailbox) {
		428	GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
		429
		430	indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", mailbox.Address));
		431	}
		432	}
		433
		434	addrs.Dispose ();
		435	}
		436
		437	if (folder_name != Queryable.SentMailFolderName) {
		438	addrs = GMime.InternetAddressList.Parse (message.Sender);
		439	foreach (GMime.InternetAddress ia in addrs) {
		440	if (ia is GMime.InternetAddressMailbox) {
		441	GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
		442
		443	indexable.AddProperty (Property.NewKeyword ("fixme:gotFrom", mailbox.Address));
		444	}
		445	}
		446
		447	addrs.Dispose ();
		448	}
		449
432	if (folder_name == Queryable.SentMailFolderName)	450	if (folder_name == Queryable.SentMailFolderName)
433	indexable.AddProperty (Property.NewFlag ("fixme:isSent"));	451	indexable.AddProperty (Property.NewFlag ("fixme:isSent"));
434	else {	452	else {

Lines 126-132 namespace Beagle.Filters { Link Here

(-)beagle-0.3.9.orign/Filters/FilterMail.cs (-21 / +29 lines)
126		126
127	// Messages that are multipart/alternative shouldn't be considered as having	127	// Messages that are multipart/alternative shouldn't be considered as having
128	// attachments. Unless of course they do.	128	// attachments. Unless of course they do.
129	if (mime_part is GMime.Multipart && mime_part.ContentType.Subtype.ToLower () != "alternative")	129	if (mime_part is GMime.Multipart && mime_part.ContentType.MediaSubtype.ToLower () != "alternative")
130	return true;	130	return true;
131		131
132	return false;	132	return false;
Lines 140-173 namespace Beagle.Filters { Link Here
140	AddProperty (Property.NewDate ("fixme:date", message.Date.ToUniversalTime ()));	140	AddProperty (Property.NewDate ("fixme:date", message.Date.ToUniversalTime ()));
141		141
142	GMime.InternetAddressList addrs;	142	GMime.InternetAddressList addrs;
143	addrs = this.message.GetRecipients (GMime.Message.RecipientType.To);	143	addrs = this.message.GetRecipients (GMime.RecipientType.To);
144	foreach (GMime.InternetAddress ia in addrs) {	144	foreach (GMime.InternetAddress ia in addrs) {
145	AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));	145	AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));
146	if (ia.AddressType != GMime.InternetAddressType.Group)	146	if (ia is GMime.InternetAddressMailbox) {
147	AddProperty (Property.New ("fixme:to_address", ia.Addr));	147	GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
148		148
		149	AddProperty (Property.New ("fixme:to_address", mailbox.Address));
		150	}
		151
149	AddProperty (Property.New ("fixme:to_name", ia.Name));	152	AddProperty (Property.New ("fixme:to_name", ia.Name));
150	AddEmailLink (ia);	153	AddEmailLink (ia);
151	}	154	}
152	addrs.Dispose ();	155	addrs.Dispose ();
153		156
154	addrs = this.message.GetRecipients (GMime.Message.RecipientType.Cc);	157	addrs = this.message.GetRecipients (GMime.RecipientType.Cc);
155	foreach (GMime.InternetAddress ia in addrs) {	158	foreach (GMime.InternetAddress ia in addrs) {
156	AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));	159	AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));
157	if (ia.AddressType != GMime.InternetAddressType.Group)	160	if (ia is GMime.InternetAddressMailbox) {
158	AddProperty (Property.New ("fixme:cc_address", ia.Addr));	161	GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
159		162
		163	AddProperty (Property.New ("fixme:cc_address", mailbox.Address));
		164	}
		165
160	AddProperty (Property.New ("fixme:cc_name", ia.Name));	166	AddProperty (Property.New ("fixme:cc_name", ia.Name));
161	AddEmailLink (ia);	167	AddEmailLink (ia);
162	}	168	}
163	addrs.Dispose ();	169	addrs.Dispose ();
164		170
165	addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (this.message.Sender));	171	addrs = GMime.InternetAddressList.Parse (this.message.Sender);
166	foreach (GMime.InternetAddress ia in addrs) {	172	foreach (GMime.InternetAddress ia in addrs) {
167	AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));	173	AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));
168	if (ia.AddressType != GMime.InternetAddressType.Group)	174	if (ia is GMime.InternetAddressMailbox) {
169	AddProperty (Property.New ("fixme:from_address", ia.Addr));	175	GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
170		176
		177	AddProperty (Property.New ("fixme:from_address", mailbox.Address));
		178	}
		179
171	AddProperty (Property.New ("fixme:from_name", ia.Name));	180	AddProperty (Property.New ("fixme:from_name", ia.Name));
172	AddEmailLink (ia);	181	AddEmailLink (ia);
173	}	182	}
Lines 184-190 namespace Beagle.Filters { Link Here
184	AddProperty (Property.NewUnsearched ("fixme:msgid", GMime.Utils.DecodeMessageId (msgid)));	193	AddProperty (Property.NewUnsearched ("fixme:msgid", GMime.Utils.DecodeMessageId (msgid)));
185		194
186	foreach (GMime.References refs in this.message.References)	195	foreach (GMime.References refs in this.message.References)
187	AddProperty (Property.NewUnsearched ("fixme:reference", refs.Msgid));	196	AddProperty (Property.NewUnsearched ("fixme:reference", refs.MessageId));
188		197
189	string list_id = this.message.GetHeader ("List-Id");	198	string list_id = this.message.GetHeader ("List-Id");
190	if (list_id != null)	199	if (list_id != null)
Lines 345-360 namespace Beagle.Filters { Link Here
345	}	354	}
346	} else if (mime_part is GMime.Multipart) {	355	} else if (mime_part is GMime.Multipart) {
347	GMime.Multipart multipart = (GMime.Multipart) mime_part;	356	GMime.Multipart multipart = (GMime.Multipart) mime_part;
348		357	int num_parts = multipart.Count;
349	int num_parts = multipart.Number;
350		358
351	// If the mimetype is multipart/alternative, we only want to index	359	// If the mimetype is multipart/alternative, we only want to index
352	// one part -- the richest one we can filter.	360	// one part -- the richest one we can filter.
353	if (mime_part.ContentType.Subtype.ToLower () == "alternative") {	361	if (mime_part.ContentType.MediaSubtype.ToLower () == "alternative") {
354	// The richest formats are at the end, so work from there	362	// The richest formats are at the end, so work from there
355	// backward.	363	// backward.
356	for (int i = num_parts - 1; i >= 0; i--) {	364	for (int i = num_parts - 1; i >= 0; i--) {
357	GMime.Object subpart = multipart.GetPart (i);	365	GMime.Object subpart = multipart[i];
358		366
359	if (IsMimeTypeHandled (subpart.ContentType.ToString ())) {	367	if (IsMimeTypeHandled (subpart.ContentType.ToString ())) {
360	part = subpart;	368	part = subpart;
Lines 370-376 namespace Beagle.Filters { Link Here
370	// the parts, treat them like a bunch of attachments.	378	// the parts, treat them like a bunch of attachments.
371	if (part == null) {	379	if (part == null) {
372	for (int i = 0; i < num_parts; i++) {	380	for (int i = 0; i < num_parts; i++) {
373	using (GMime.Object subpart = multipart.GetPart (i))	381	using (GMime.Object subpart = multipart[i])
374	this.OnEachPart (subpart);	382	this.OnEachPart (subpart);
375	}	383	}
376	}	384	}
Lines 400-406 namespace Beagle.Filters { Link Here
400	} else if (mime_type == "text/html") {	408	} else if (mime_type == "text/html") {
401	no_child_needed = true;	409	no_child_needed = true;
402	html_part = true;	410	html_part = true;
403	string enc = part.GetContentTypeParameter ("charset");	411	string enc = part.ContentType.GetParameter ("charset");
404	// DataWrapper.Stream is a very limited stream	412	// DataWrapper.Stream is a very limited stream
405	// and does not allow Seek or Tell	413	// and does not allow Seek or Tell
406	// HtmlFilter requires Stream.Position=0.	414	// HtmlFilter requires Stream.Position=0.
Lines 473-479 namespace Beagle.Filters { Link Here
473	if (length != -1)	481	if (length != -1)
474	child.AddProperty (Property.NewUnsearched ("fixme:filesize", length));	482	child.AddProperty (Property.NewUnsearched ("fixme:filesize", length));
475		483
476	if (part.ContentType.Type.ToLower () == "text")	484	if (part.ContentType.MediaType.ToLower () == "text")
477	child.SetTextReader (new StreamReader (stream));	485	child.SetTextReader (new StreamReader (stream));
478	else	486	else
479	child.SetBinaryStream (stream);	487	child.SetBinaryStream (stream);

Lines 2791-2797 MONODOC_REQUIRED=1.2.4 Link Here

(-)beagle-0.3.9.orign/configure (-30 / +30 lines)
2791	NDESK_DBUS_REQUIRED=0.5.2	2791	NDESK_DBUS_REQUIRED=0.5.2
2792	NDESK_DBUS_GLIB_REQUIRED=0.3.0	2792	NDESK_DBUS_GLIB_REQUIRED=0.3.0
2793	GTK_SHARP_REQUIRED=2.10.0	2793	GTK_SHARP_REQUIRED=2.10.0
2794	GMIME_SHARP_REQUIRED=2.2.0	2794	GMIME_SHARP_REQUIRED=2.4.0
2795	EVOLUTION_SHARP_REQUIRED=0.13.3	2795	EVOLUTION_SHARP_REQUIRED=0.13.3
2796	GSF_SHARP_REQUIRED=0.6	2796	GSF_SHARP_REQUIRED=0.6
2797	GTK_REQUIRED=2.10.0	2797	GTK_REQUIRED=2.10.0
Lines 25660-25666 if test -n "$PKG_CONFIG"; then Link Here
25660	glade-sharp-2.0 >= \$GTK_SHARP_REQUIRED	25660	glade-sharp-2.0 >= \$GTK_SHARP_REQUIRED
25661	gnome-sharp-2.0 >= \$GTK_SHARP_REQUIRED	25661	gnome-sharp-2.0 >= \$GTK_SHARP_REQUIRED
25662	gnome-vfs-sharp-2.0 >= \$GTK_SHARP_REQUIRED	25662	gnome-vfs-sharp-2.0 >= \$GTK_SHARP_REQUIRED
25663	gmime-sharp >= \$GMIME_SHARP_REQUIRED	25663	gmime-sharp-2.6 >= \$GMIME_SHARP_REQUIRED
25664	\"") >&5	25664	\"") >&5
25665	($PKG_CONFIG --exists --print-errors "	25665	($PKG_CONFIG --exists --print-errors "
25666	gtk-sharp-2.0 >= $GTK_SHARP_REQUIRED	25666	gtk-sharp-2.0 >= $GTK_SHARP_REQUIRED
Lines 25668-25674 if test -n "$PKG_CONFIG"; then Link Here
25668	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED	25668	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
25669	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED	25669	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
25670	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED	25670	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
25671	gmime-sharp >= $GMIME_SHARP_REQUIRED	25671	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
25672	") 2>&5	25672	") 2>&5
25673	ac_status=$?	25673	ac_status=$?
25674	echo "$as_me:$LINENO: \$? = $ac_status" >&5	25674	echo "$as_me:$LINENO: \$? = $ac_status" >&5
Lines 25679-25685 if test -n "$PKG_CONFIG"; then Link Here
25679	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED	25679	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
25680	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED	25680	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
25681	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED	25681	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
25682	gmime-sharp >= $GMIME_SHARP_REQUIRED	25682	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
25683	" 2>/dev/null`	25683	" 2>/dev/null`
25684	else	25684	else
25685	pkg_failed=yes	25685	pkg_failed=yes
Lines 25699-25705 if test -n "$PKG_CONFIG"; then Link Here
25699	glade-sharp-2.0 >= \$GTK_SHARP_REQUIRED	25699	glade-sharp-2.0 >= \$GTK_SHARP_REQUIRED
25700	gnome-sharp-2.0 >= \$GTK_SHARP_REQUIRED	25700	gnome-sharp-2.0 >= \$GTK_SHARP_REQUIRED
25701	gnome-vfs-sharp-2.0 >= \$GTK_SHARP_REQUIRED	25701	gnome-vfs-sharp-2.0 >= \$GTK_SHARP_REQUIRED
25702	gmime-sharp >= \$GMIME_SHARP_REQUIRED	25702	gmime-sharp-2.6 >= \$GMIME_SHARP_REQUIRED
25703	\"") >&5	25703	\"") >&5
25704	($PKG_CONFIG --exists --print-errors "	25704	($PKG_CONFIG --exists --print-errors "
25705	gtk-sharp-2.0 >= $GTK_SHARP_REQUIRED	25705	gtk-sharp-2.0 >= $GTK_SHARP_REQUIRED
Lines 25707-25713 if test -n "$PKG_CONFIG"; then Link Here
25707	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED	25707	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
25708	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED	25708	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
25709	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED	25709	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
25710	gmime-sharp >= $GMIME_SHARP_REQUIRED	25710	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
25711	") 2>&5	25711	") 2>&5
25712	ac_status=$?	25712	ac_status=$?
25713	echo "$as_me:$LINENO: \$? = $ac_status" >&5	25713	echo "$as_me:$LINENO: \$? = $ac_status" >&5
Lines 25718-25724 if test -n "$PKG_CONFIG"; then Link Here
25718	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED	25718	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
25719	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED	25719	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
25720	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED	25720	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
25721	gmime-sharp >= $GMIME_SHARP_REQUIRED	25721	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
25722	" 2>/dev/null`	25722	" 2>/dev/null`
25723	else	25723	else
25724	pkg_failed=yes	25724	pkg_failed=yes
Lines 25744-25750 fi Link Here
25744	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED	25744	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
25745	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED	25745	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
25746	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED	25746	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
25747	gmime-sharp >= $GMIME_SHARP_REQUIRED	25747	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
25748	"`	25748	"`
25749	else	25749	else
25750	BEAGLE_UI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "	25750	BEAGLE_UI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
Lines 25753-25759 fi Link Here
25753	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED	25753	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
25754	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED	25754	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
25755	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED	25755	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
25756	gmime-sharp >= $GMIME_SHARP_REQUIRED	25756	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
25757	"`	25757	"`
25758	fi	25758	fi
25759	# Put the nasty error message in config.log where it belongs	25759	# Put the nasty error message in config.log where it belongs
Lines 25765-25771 fi Link Here
25765	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED	25765	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
25766	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED	25766	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
25767	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED	25767	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
25768	gmime-sharp >= $GMIME_SHARP_REQUIRED	25768	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
25769	) were not met:	25769	) were not met:
25770		25770
25771	$BEAGLE_UI_PKG_ERRORS	25771	$BEAGLE_UI_PKG_ERRORS
Lines 25783-25789 echo "$as_me: error: Package requirement Link Here
25783	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED	25783	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
25784	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED	25784	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
25785	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED	25785	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
25786	gmime-sharp >= $GMIME_SHARP_REQUIRED	25786	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
25787	) were not met:	25787	) were not met:
25788		25788
25789	$BEAGLE_UI_PKG_ERRORS	25789	$BEAGLE_UI_PKG_ERRORS
Lines 26167-26184 if test -n "$PKG_CONFIG"; then Link Here
26167	{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-sharp >= \$EVOLUTION_SHARP_REQUIRED \\	26167	{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-sharp >= \$EVOLUTION_SHARP_REQUIRED \\
26168	gconf-sharp-2.0 >= \$GTK_SHARP_REQUIRED \\	26168	gconf-sharp-2.0 >= \$GTK_SHARP_REQUIRED \\
26169	glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED	26169	glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED
26170	gmime-sharp >= \$GMIME_SHARP_REQUIRED\"") >&5	26170	gmime-sharp-2.6 >= \$GMIME_SHARP_REQUIRED\"") >&5
26171	($PKG_CONFIG --exists --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \	26171	($PKG_CONFIG --exists --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \
26172	gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \	26172	gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \
26173	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED	26173	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
26174	gmime-sharp >= $GMIME_SHARP_REQUIRED") 2>&5	26174	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED") 2>&5
26175	ac_status=$?	26175	ac_status=$?
26176	echo "$as_me:$LINENO: \$? = $ac_status" >&5	26176	echo "$as_me:$LINENO: \$? = $ac_status" >&5
26177	(exit $ac_status); }; then	26177	(exit $ac_status); }; then
26178	pkg_cv_EVO_CFLAGS=`$PKG_CONFIG --cflags "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \	26178	pkg_cv_EVO_CFLAGS=`$PKG_CONFIG --cflags "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \
26179	gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \	26179	gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \
26180	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED	26180	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
26181	gmime-sharp >= $GMIME_SHARP_REQUIRED" 2>/dev/null`	26181	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED" 2>/dev/null`
26182	else	26182	else
26183	pkg_failed=yes	26183	pkg_failed=yes
26184	fi	26184	fi
Lines 26194-26211 if test -n "$PKG_CONFIG"; then Link Here
26194	{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-sharp >= \$EVOLUTION_SHARP_REQUIRED \\	26194	{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-sharp >= \$EVOLUTION_SHARP_REQUIRED \\
26195	gconf-sharp-2.0 >= \$GTK_SHARP_REQUIRED \\	26195	gconf-sharp-2.0 >= \$GTK_SHARP_REQUIRED \\
26196	glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED	26196	glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED
26197	gmime-sharp >= \$GMIME_SHARP_REQUIRED\"") >&5	26197	gmime-sharp-2.6 >= \$GMIME_SHARP_REQUIRED\"") >&5
26198	($PKG_CONFIG --exists --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \	26198	($PKG_CONFIG --exists --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \
26199	gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \	26199	gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \
26200	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED	26200	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
26201	gmime-sharp >= $GMIME_SHARP_REQUIRED") 2>&5	26201	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED") 2>&5
26202	ac_status=$?	26202	ac_status=$?
26203	echo "$as_me:$LINENO: \$? = $ac_status" >&5	26203	echo "$as_me:$LINENO: \$? = $ac_status" >&5
26204	(exit $ac_status); }; then	26204	(exit $ac_status); }; then
26205	pkg_cv_EVO_LIBS=`$PKG_CONFIG --libs "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \	26205	pkg_cv_EVO_LIBS=`$PKG_CONFIG --libs "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \
26206	gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \	26206	gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \
26207	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED	26207	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
26208	gmime-sharp >= $GMIME_SHARP_REQUIRED" 2>/dev/null`	26208	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED" 2>/dev/null`
26209	else	26209	else
26210	pkg_failed=yes	26210	pkg_failed=yes
26211	fi	26211	fi
Lines 26227-26238 fi Link Here
26227	EVO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \	26227	EVO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \
26228	gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \	26228	gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \
26229	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED	26229	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
26230	gmime-sharp >= $GMIME_SHARP_REQUIRED"`	26230	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED"`
26231	else	26231	else
26232	EVO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \	26232	EVO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \
26233	gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \	26233	gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \
26234	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED	26234	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
26235	gmime-sharp >= $GMIME_SHARP_REQUIRED"`	26235	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED"`
26236	fi	26236	fi
26237	# Put the nasty error message in config.log where it belongs	26237	# Put the nasty error message in config.log where it belongs
26238	echo "$EVO_PKG_ERRORS" >&5	26238	echo "$EVO_PKG_ERRORS" >&5
Lines 26781-26792 if test -n "$PKG_CONFIG"; then Link Here
26781	if test -n "$PKG_CONFIG" && \	26781	if test -n "$PKG_CONFIG" && \
26782	{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"	26782	{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
26783	shared-mime-info	26783	shared-mime-info
26784	gmime-sharp >= \$GMIME_SHARP_REQUIRED	26784	gmime-sharp-2.6 >= \$GMIME_SHARP_REQUIRED
26785	glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED	26785	glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED
26786	\"") >&5	26786	\"") >&5
26787	($PKG_CONFIG --exists --print-errors "	26787	($PKG_CONFIG --exists --print-errors "
26788	shared-mime-info	26788	shared-mime-info
26789	gmime-sharp >= $GMIME_SHARP_REQUIRED	26789	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
26790	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED	26790	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
26791	") 2>&5	26791	") 2>&5
26792	ac_status=$?	26792	ac_status=$?
Lines 26794-26800 if test -n "$PKG_CONFIG"; then Link Here
26794	(exit $ac_status); }; then	26794	(exit $ac_status); }; then
26795	pkg_cv_BEAGLED_CFLAGS=`$PKG_CONFIG --cflags "	26795	pkg_cv_BEAGLED_CFLAGS=`$PKG_CONFIG --cflags "
26796	shared-mime-info	26796	shared-mime-info
26797	gmime-sharp >= $GMIME_SHARP_REQUIRED	26797	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
26798	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED	26798	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
26799	" 2>/dev/null`	26799	" 2>/dev/null`
26800	else	26800	else
Lines 26811-26822 if test -n "$PKG_CONFIG"; then Link Here
26811	if test -n "$PKG_CONFIG" && \	26811	if test -n "$PKG_CONFIG" && \
26812	{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"	26812	{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
26813	shared-mime-info	26813	shared-mime-info
26814	gmime-sharp >= \$GMIME_SHARP_REQUIRED	26814	gmime-sharp-2.6 >= \$GMIME_SHARP_REQUIRED
26815	glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED	26815	glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED
26816	\"") >&5	26816	\"") >&5
26817	($PKG_CONFIG --exists --print-errors "	26817	($PKG_CONFIG --exists --print-errors "
26818	shared-mime-info	26818	shared-mime-info
26819	gmime-sharp >= $GMIME_SHARP_REQUIRED	26819	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
26820	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED	26820	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
26821	") 2>&5	26821	") 2>&5
26822	ac_status=$?	26822	ac_status=$?
Lines 26824-26830 if test -n "$PKG_CONFIG"; then Link Here
26824	(exit $ac_status); }; then	26824	(exit $ac_status); }; then
26825	pkg_cv_BEAGLED_LIBS=`$PKG_CONFIG --libs "	26825	pkg_cv_BEAGLED_LIBS=`$PKG_CONFIG --libs "
26826	shared-mime-info	26826	shared-mime-info
26827	gmime-sharp >= $GMIME_SHARP_REQUIRED	26827	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
26828	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED	26828	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
26829	" 2>/dev/null`	26829	" 2>/dev/null`
26830	else	26830	else
Lines 26847-26859 fi Link Here
26847	if test $_pkg_short_errors_supported = yes; then	26847	if test $_pkg_short_errors_supported = yes; then
26848	BEAGLED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "	26848	BEAGLED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
26849	shared-mime-info	26849	shared-mime-info
26850	gmime-sharp >= $GMIME_SHARP_REQUIRED	26850	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
26851	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED	26851	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
26852	"`	26852	"`
26853	else	26853	else
26854	BEAGLED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "	26854	BEAGLED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
26855	shared-mime-info	26855	shared-mime-info
26856	gmime-sharp >= $GMIME_SHARP_REQUIRED	26856	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
26857	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED	26857	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
26858	"`	26858	"`
26859	fi	26859	fi
Lines 26862-26868 fi Link Here
26862		26862
26863	{ { echo "$as_me:$LINENO: error: Package requirements (	26863	{ { echo "$as_me:$LINENO: error: Package requirements (
26864	shared-mime-info	26864	shared-mime-info
26865	gmime-sharp >= $GMIME_SHARP_REQUIRED	26865	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
26866	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED	26866	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
26867	) were not met:	26867	) were not met:
26868		26868
Lines 26877-26883 See the pkg-config man page for more det Link Here
26877	" >&5	26877	" >&5
26878	echo "$as_me: error: Package requirements (	26878	echo "$as_me: error: Package requirements (
26879	shared-mime-info	26879	shared-mime-info
26880	gmime-sharp >= $GMIME_SHARP_REQUIRED	26880	gmime-sharp-2.6 >= $GMIME_SHARP_REQUIRED
26881	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED	26881	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
26882	) were not met:	26882	) were not met:
26883		26883
Lines 26924-26930 BEAGLED_LIBS="$BEAGLED_LIBS $GSF_SHARP_L Link Here
26924		26924
26925		26925
26926	GSF_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gsf-sharp`	26926	GSF_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gsf-sharp`
26927	GMIME_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gmime-sharp`	26927	GMIME_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gmime-sharp-2.6`
26928		26928
26929		26929
26930	# Check whether --enable-epiphany-extension was given.	26930	# Check whether --enable-epiphany-extension was given.