Hello community, here is the log from the commit of package beagle checked in at Mon May 15 12:43:57 CEST 2006. -------- --- GNOME/beagle/beagle.changes 2006-05-03 01:08:39.000000000 +0200 +++ STABLE/beagle/beagle.changes 2006-05-11 20:01:38.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 11 20:01:02 CEST 2006 - danw@suse.de + +- Update calendar tile patch to only show the first line of events + with very long descriptions. #174398 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ beagle.spec ++++++ --- /var/tmp/diff_new_pack.eWqmz9/_old 2006-05-15 12:43:46.000000000 +0200 +++ /var/tmp/diff_new_pack.eWqmz9/_new 2006-05-15 12:43:46.000000000 +0200 @@ -18,7 +18,7 @@ Group: Productivity/Other Autoreqprov: on Version: 0.2.3 -Release: 38 +Release: 40 Summary: Desktop Search Application URL: http://www.gnome.org/projects/beagle/ Source: %{name}-%{version}.tar.gz @@ -469,6 +469,9 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n beagle +* Thu May 11 2006 - danw@suse.de +- Update calendar tile patch to only show the first line of events + with very long descriptions. #174398 * Wed May 03 2006 - joeshaw@suse.de - Add a patch to detect audio/x-vorbis+ogg as a valid music mime type. (Beagle equivalent of bnc #169616) ++++++ beagle-calendar-contact-tiles.patch ++++++ --- /var/tmp/diff_new_pack.eWqmz9/_old 2006-05-15 12:43:46.000000000 +0200 +++ /var/tmp/diff_new_pack.eWqmz9/_new 2006-05-15 12:43:46.000000000 +0200 @@ -1,11 +1,8 @@ Index: search/GroupView.cs -=================================================================== -RCS file: /cvs/gnome/beagle/search/GroupView.cs,v -retrieving revision 1.6 -diff -u -p -u -r1.6 GroupView.cs ---- search/GroupView.cs 3 Mar 2006 20:04:40 -0000 1.6 -+++ search/GroupView.cs 24 Apr 2006 18:13:13 -0000 -@@ -142,6 +142,9 @@ namespace Search { +================================================================================ +--- search/GroupView.cs ++++ search/GroupView.cs +@@ -142,6 +142,9 @@ case ScopeType.Applications: return group == TileGroup.Application; @@ -15,14 +12,9 @@ case ScopeType.Contacts: return group == TileGroup.Contact; -Index: search/Makefile.am -=================================================================== -RCS file: /cvs/gnome/beagle/search/Makefile.am,v -retrieving revision 1.15 -diff -u -p -u -r1.15 Makefile.am ---- search/Makefile.am 24 Mar 2006 21:55:23 -0000 1.15 -+++ search/Makefile.am 24 Apr 2006 18:13:13 -0000 -@@ -31,6 +31,7 @@ TILES = \ +--- search/Makefile.am ++++ search/Makefile.am +@@ -31,6 +31,7 @@ $(srcdir)/Tiles/Application.cs \ $(srcdir)/Tiles/Audio.cs \ $(srcdir)/Tiles/CApplet.cs \ @@ -30,115 +22,9 @@ $(srcdir)/Tiles/Contact.cs \ $(srcdir)/Tiles/DetailsPane.cs \ $(srcdir)/Tiles/File.cs \ -Index: search/UIManager.cs -=================================================================== -RCS file: /cvs/gnome/beagle/search/UIManager.cs,v -retrieving revision 1.9 -diff -u -p -u -r1.9 UIManager.cs ---- search/UIManager.cs 10 Apr 2006 14:16:35 -0000 1.9 -+++ search/UIManager.cs 24 Apr 2006 18:13:13 -0000 -@@ -8,6 +8,7 @@ namespace Search { - public enum ScopeType { - Everywhere, - Applications, -+ Calendar, - Contacts, - Documents, - Conversations, -@@ -89,6 +90,11 @@ namespace Search { - null, - Catalog.GetString ("Search contacts"), - (int)ScopeType.Contacts), -+ new RadioActionEntry ("Calendar", null, -+ Catalog.GetString ("Ca_lendar events"), -+ null, -+ Catalog.GetString ("Search calendar events"), -+ (int)ScopeType.Contacts), - new RadioActionEntry ("Documents", null, - Catalog.GetString ("_Documents"), - null, -@@ -100,12 +106,12 @@ namespace Search { - Catalog.GetString ("Search E-Mail and Instant Messaging logs"), - (int)ScopeType.Conversations), - new RadioActionEntry ("Images", null, -- Catalog.GetString ("Images"), -+ Catalog.GetString ("_Images"), - null, - Catalog.GetString ("Search images"), - (int)ScopeType.Images), - new RadioActionEntry ("Media", null, -- Catalog.GetString ("Media"), -+ Catalog.GetString ("_Media"), - null, - Catalog.GetString ("Search sound and video files"), - (int)ScopeType.Media), -@@ -162,6 +168,7 @@ namespace Search { - " <menuitem action='Everywhere'/>" + - " <menuitem action='Applications'/>" + - " <menuitem action='Contacts'/>" + -+ " <menuitem action='Calendar'/>" + - " <menuitem action='Documents'/>" + - " <menuitem action='Conversations'/>" + - " <menuitem action='Images'/>" + -Index: search/Tiles/Contact.cs -=================================================================== -RCS file: /cvs/gnome/beagle/search/Tiles/Contact.cs,v -retrieving revision 1.4 -diff -u -p -u -r1.4 Contact.cs ---- search/Tiles/Contact.cs 23 Feb 2006 19:13:24 -0000 1.4 -+++ search/Tiles/Contact.cs 24 Apr 2006 18:13:13 -0000 -@@ -25,6 +25,9 @@ namespace Search.Tiles { - - Title = hit.GetFirstProperty ("fixme:Name"); - Description = hit.GetFirstProperty ("fixme:Email"); -+ -+ if (Hit.GetFirstProperty ("fixme:Email") != null) -+ AddAction (new TileAction (Catalog.GetString ("Send Mail"), SendMail)); - } - - private Gdk.Pixbuf GetIcon (int size) -@@ -67,6 +70,23 @@ namespace Search.Tiles { - } - - return details; -+ } -+ -+ public override void Open () -+ { -+ SafeProcess p = new SafeProcess (); -+ p.Arguments = new string [] { "evolution", Hit.UriAsString }; -+ -+ try { -+ p.Start (); -+ } catch (SafeProcessException e) { -+ Console.WriteLine (e.Message); -+ } -+ } -+ -+ private void SendMail () -+ { -+ OpenFromUri ("mailto:" + Hit.GetFirstProperty ("fixme:Email")); - } - } - } -Index: search/Tiles/TileGroup.cs -=================================================================== -RCS file: /cvs/gnome/beagle/search/Tiles/TileGroup.cs,v -retrieving revision 1.1 -diff -u -p -u -r1.1 TileGroup.cs ---- search/Tiles/TileGroup.cs 13 Jan 2006 19:53:03 -0000 1.1 -+++ search/Tiles/TileGroup.cs 24 Apr 2006 18:13:13 -0000 -@@ -4,6 +4,7 @@ namespace Search.Tiles { - - public enum TileGroup { - Application, -+ Calendar, - Contact, - Folder, - Image, ---- /dev/null 2006-04-07 15:25:18.000000000 -0400 -+++ search/Tiles/Calendar.cs 2006-04-24 14:01:57.000000000 -0400 -@@ -0,0 +1,65 @@ +--- search/Tiles/Calendar.cs ++++ search/Tiles/Calendar.cs +@@ -0,0 +1,74 @@ +using System; +using Mono.Unix; +using Beagle.Util; @@ -162,13 +48,22 @@ + + public Calendar (Beagle.Hit hit, Beagle.Query query) : base (hit, query) + { ++ string description; ++ int newline; ++ + Group = TileGroup.Calendar; + + string summary = hit.GetFirstProperty ("fixme:summary"); + string time = Utils.NiceShortDate (hit.GetFirstProperty ("fixme:starttime")); + + Title = (time == "") ? summary : time + ": " + summary; -+ Description = hit.GetFirstProperty ("fixme:description"); ++ ++ description = hit.GetFirstProperty ("fixme:description"); ++ newline = description.IndexOf ('\n'); ++ if (newline == -1) ++ Description = description; ++ else ++ Description = description.Substring (0, newline); + } + + protected override void LoadIcon (Gtk.Image image, int size) @@ -204,20 +99,60 @@ + } + } +} -Index: search/Tiles/Utils.cs -=================================================================== -RCS file: /cvs/gnome/beagle/search/Tiles/Utils.cs,v -retrieving revision 1.3 -diff -u -p -r1.3 Utils.cs ---- search/Tiles/Utils.cs 15 Feb 2006 20:47:30 -0000 1.3 -+++ search/Tiles/Utils.cs 24 Apr 2006 19:58:07 -0000 +--- search/Tiles/Contact.cs ++++ search/Tiles/Contact.cs +@@ -25,6 +25,9 @@ + + Title = hit.GetFirstProperty ("fixme:Name"); + Description = hit.GetFirstProperty ("fixme:Email"); ++ ++ if (Hit.GetFirstProperty ("fixme:Email") != null) ++ AddAction (new TileAction (Catalog.GetString ("Send Mail"), SendMail)); + } + + private Gdk.Pixbuf GetIcon (int size) +@@ -68,5 +71,22 @@ + + return details; + } ++ ++ public override void Open () ++ { ++ SafeProcess p = new SafeProcess (); ++ p.Arguments = new string [] { "evolution", Hit.UriAsString }; ++ ++ try { ++ p.Start (); ++ } catch (SafeProcessException e) { ++ Console.WriteLine (e.Message); ++ } ++ } ++ ++ private void SendMail () ++ { ++ OpenFromUri ("mailto:" + Hit.GetFirstProperty ("fixme:Email")); ++ } + } + } +--- search/Tiles/TileGroup.cs ++++ search/Tiles/TileGroup.cs +@@ -4,6 +4,7 @@ + + public enum TileGroup { + Application, ++ Calendar, + Contact, + Folder, + Image, +--- search/Tiles/Utils.cs ++++ search/Tiles/Utils.cs @@ -1,4 +1,5 @@ using System; +using System.Globalization; using Mono.Unix; namespace Search.Tiles { -@@ -23,6 +24,8 @@ namespace Search.Tiles { +@@ -23,6 +24,8 @@ Catalog.GetString ("Application"), 1), new TileGroupInfo (TileGroup.Contact, Catalog.GetString ("Contact"), 2), @@ -226,7 +161,7 @@ new TileGroupInfo (TileGroup.Folder, Catalog.GetString ("Folder"), 2), new TileGroupInfo (TileGroup.Image, -@@ -55,6 +58,12 @@ namespace Search.Tiles { +@@ -55,6 +58,12 @@ return dt; } @@ -239,7 +174,7 @@ public static string NiceShortDate (string timestamp) { DateTime dt; -@@ -75,18 +84,30 @@ namespace Search.Tiles { +@@ -75,18 +84,30 @@ dt = dt.ToLocalTime (); DateTime today = DateTime.Today; @@ -276,7 +211,7 @@ } public static string NiceLongDate (string timestamp) -@@ -109,18 +130,30 @@ namespace Search.Tiles { +@@ -109,18 +130,30 @@ dt = dt.ToLocalTime (); DateTime today = DateTime.Today; @@ -313,7 +248,7 @@ } public static string NiceVeryLongDate (string timestamp) -@@ -143,20 +176,38 @@ namespace Search.Tiles { +@@ -143,20 +176,38 @@ dt = dt.ToLocalTime (); DateTime today = DateTime.Today; @@ -360,3 +295,48 @@ } } } +--- search/UIManager.cs ++++ search/UIManager.cs +@@ -8,6 +8,7 @@ + public enum ScopeType { + Everywhere, + Applications, ++ Calendar, + Contacts, + Documents, + Conversations, +@@ -86,6 +87,11 @@ + null, + Catalog.GetString ("Search contacts"), + (int)ScopeType.Contacts), ++ new RadioActionEntry ("Calendar", null, ++ Catalog.GetString ("Ca_lendar events"), ++ null, ++ Catalog.GetString ("Search calendar events"), ++ (int)ScopeType.Contacts), + new RadioActionEntry ("Documents", null, + Catalog.GetString ("_Documents"), + null, +@@ -97,12 +103,12 @@ + Catalog.GetString ("Search E-Mail and Instant Messaging logs"), + (int)ScopeType.Conversations), + new RadioActionEntry ("Images", null, +- Catalog.GetString ("Images"), ++ Catalog.GetString ("_Images"), + null, + Catalog.GetString ("Search images"), + (int)ScopeType.Images), + new RadioActionEntry ("Media", null, +- Catalog.GetString ("Media"), ++ Catalog.GetString ("_Media"), + null, + Catalog.GetString ("Search sound and video files"), + (int)ScopeType.Media), +@@ -159,6 +165,7 @@ + " <menuitem action='Everywhere'/>" + + " <menuitem action='Applications'/>" + + " <menuitem action='Contacts'/>" + ++ " <menuitem action='Calendar'/>" + + " <menuitem action='Documents'/>" + + " <menuitem action='Conversations'/>" + + " <menuitem action='Images'/>" + ++++++ beagle-filter-stop-pulling-on-error.patch ++++++ --- /var/tmp/diff_new_pack.eWqmz9/_old 2006-05-15 12:43:46.000000000 +0200 +++ /var/tmp/diff_new_pack.eWqmz9/_new 2006-05-15 12:43:46.000000000 +0200 @@ -1,12 +1,8 @@ Index: beagled/Filter.cs -=================================================================== -RCS file: /cvs/gnome/beagle/beagled/Filter.cs,v -retrieving revision 1.44 -retrieving revision 1.45 -diff -u -p -r1.44 -r1.45 ---- beagled/Filter.cs 2 Apr 2006 19:55:54 -0000 1.44 -+++ beagled/Filter.cs 3 Apr 2006 16:51:03 -0000 1.45 -@@ -579,13 +579,16 @@ namespace Beagle.Daemon { +================================================================================ +--- beagled/Filter.cs ++++ beagled/Filter.cs +@@ -555,13 +555,16 @@ private bool Pull () { @@ -24,14 +20,14 @@ return true; } -@@ -628,6 +631,10 @@ namespace Beagle.Daemon { - private bool PullFromArray (ArrayList array, StringBuilder sb) +@@ -605,6 +608,10 @@ { while (array.Count == 0 && Pull ()) { } -+ + + // FIXME: Do we want to try to extract as much data as + // possible from the filter if we get an error, or + // should we just give up afterward entirely? - ++ if (array.Count > 0) { foreach (string str in array) + sb.Append (str); ++++++ beagle-gaim-note-markup.patch ++++++ --- /var/tmp/diff_new_pack.eWqmz9/_old 2006-05-15 12:43:46.000000000 +0200 +++ /var/tmp/diff_new_pack.eWqmz9/_new 2006-05-15 12:43:46.000000000 +0200 @@ -1,11 +1,8 @@ Index: Util/ImLog.cs -=================================================================== -RCS file: /cvs/gnome/beagle/Util/ImLog.cs,v -retrieving revision 1.23 -diff -u -p -u -r1.23 ImLog.cs ---- Util/ImLog.cs 21 Feb 2006 21:19:05 -0000 1.23 -+++ Util/ImLog.cs 26 Apr 2006 19:29:48 -0000 -@@ -133,48 +133,6 @@ namespace Beagle.Util { +================================================================================ +--- Util/ImLog.cs ++++ Util/ImLog.cs +@@ -133,48 +133,6 @@ public const string MimeType = "beagle/x-gaim-log"; @@ -54,7 +51,7 @@ /////////////////////////////////////// public GaimLog (FileInfo file, TextReader reader) : base ("gaim", file, reader) -@@ -300,7 +258,7 @@ namespace Beagle.Util { +@@ -300,7 +258,7 @@ while ((line = TextReader.ReadLine ()) != null) { if (isHtml) @@ -63,13 +60,8 @@ ProcessLine (line); } -Index: Util/Note.cs -=================================================================== -RCS file: /cvs/gnome/beagle/Util/Note.cs,v -retrieving revision 1.3 -diff -u -p -u -r1.3 Note.cs ---- Util/Note.cs 4 Nov 2005 15:35:34 -0000 1.3 -+++ Util/Note.cs 26 Apr 2006 19:29:48 -0000 +--- Util/Note.cs ++++ Util/Note.cs @@ -27,6 +27,7 @@ using System; @@ -78,7 +70,7 @@ using System.Xml; namespace Beagle.Util { -@@ -93,37 +94,40 @@ namespace Beagle.Util { +@@ -93,37 +94,40 @@ XmlTextReader doc = new XmlTextReader (reader); doc.Namespaces = false; @@ -140,14 +132,9 @@ } } -Index: Util/StringFu.cs -=================================================================== -RCS file: /cvs/gnome/beagle/Util/StringFu.cs,v -retrieving revision 1.41 -diff -u -p -u -r1.41 StringFu.cs ---- Util/StringFu.cs 6 Feb 2006 02:51:20 -0000 1.41 -+++ Util/StringFu.cs 26 Apr 2006 19:29:48 -0000 -@@ -612,5 +612,79 @@ namespace Beagle.Util { +--- Util/StringFu.cs ++++ Util/StringFu.cs +@@ -612,5 +612,79 @@ return sb.ToString (); } @@ -227,14 +214,9 @@ + } } } -Index: beagled/GaimLogQueryable/GaimLogQueryable.cs -=================================================================== -RCS file: /cvs/gnome/beagle/beagled/GaimLogQueryable/GaimLogQueryable.cs,v -retrieving revision 1.50 -diff -u -p -u -r1.50 GaimLogQueryable.cs ---- beagled/GaimLogQueryable/GaimLogQueryable.cs 21 Feb 2006 19:27:17 -0000 1.50 -+++ beagled/GaimLogQueryable/GaimLogQueryable.cs 26 Apr 2006 19:29:48 -0000 -@@ -268,6 +268,19 @@ namespace Beagle.Daemon.GaimLogQueryable +--- beagled/GaimLogQueryable/GaimLogQueryable.cs ++++ beagled/GaimLogQueryable/GaimLogQueryable.cs +@@ -268,6 +268,19 @@ return true; } ++++++ beagle-imlogviewer-kopete-fixes.patch ++++++ --- /var/tmp/diff_new_pack.eWqmz9/_old 2006-05-15 12:43:46.000000000 +0200 +++ /var/tmp/diff_new_pack.eWqmz9/_new 2006-05-15 12:43:46.000000000 +0200 @@ -1,11 +1,8 @@ Index: ImLogWindow.cs -=================================================================== -RCS file: /cvs/gnome/beagle/ImLogViewer/ImLogWindow.cs,v -retrieving revision 1.11 -diff -u -p -r1.11 ImLogViewer/ImLogWindow.cs ---- ImLogViewer/ImLogWindow.cs 28 Feb 2006 20:42:37 -0000 1.11 -+++ ImLogViewer/ImLogWindow.cs 2 May 2006 21:26:45 -0000 -@@ -168,22 +168,32 @@ namespace ImLogViewer { +================================================================================ +--- ImLogViewer/ImLogWindow.cs ++++ ImLogViewer/ImLogWindow.cs +@@ -168,22 +168,32 @@ foreach (string file in Directory.GetFiles (log_path)) { ImLog log = null; StreamReader reader = new StreamReader (file); ++++++ beagle-safe-process-redirect.patch ++++++ --- /var/tmp/diff_new_pack.eWqmz9/_old 2006-05-15 12:43:46.000000000 +0200 +++ /var/tmp/diff_new_pack.eWqmz9/_new 2006-05-15 12:43:46.000000000 +0200 @@ -1,12 +1,8 @@ Index: Util/SafeProcess.cs -=================================================================== -RCS file: /cvs/gnome/beagle/Util/SafeProcess.cs,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -p -r1.1 -r1.2 ---- Util/SafeProcess.cs 13 Apr 2006 18:31:00 -0000 1.1 -+++ Util/SafeProcess.cs 21 Apr 2006 21:08:27 -0000 1.2 -@@ -79,9 +79,9 @@ namespace Beagle.Util { +================================================================================ +--- Util/SafeProcess.cs ++++ Util/SafeProcess.cs +@@ -79,9 +79,9 @@ IntPtr child_setup, IntPtr child_data, IntPtr pid, @@ -19,7 +15,7 @@ out IntPtr error); public void Start () -@@ -98,28 +98,51 @@ namespace Beagle.Util { +@@ -98,28 +98,51 @@ args = tmp_args; } ++++++ beagle-settings-no-hardcoded-size.patch ++++++ --- /var/tmp/diff_new_pack.eWqmz9/_old 2006-05-15 12:43:46.000000000 +0200 +++ /var/tmp/diff_new_pack.eWqmz9/_new 2006-05-15 12:43:46.000000000 +0200 @@ -1,10 +1,7 @@ Index: tools/settings.glade -=================================================================== -RCS file: /cvs/gnome/beagle/tools/settings.glade,v -retrieving revision 1.10 -diff -u -p -r1.10 settings.glade ---- tools/settings.glade 8 Mar 2006 21:01:51 -0000 1.10 -+++ tools/settings.glade 25 Apr 2006 17:42:06 -0000 +================================================================================ +--- tools/settings.glade ++++ tools/settings.glade @@ -4,13 +4,13 @@ <glade-interface> ++++++ beagle-vorbis-mime-type.patch ++++++ --- /var/tmp/diff_new_pack.eWqmz9/_old 2006-05-15 12:43:46.000000000 +0200 +++ /var/tmp/diff_new_pack.eWqmz9/_new 2006-05-15 12:43:46.000000000 +0200 @@ -1,12 +1,8 @@ Index: Filters/FilterMusic.cs -=================================================================== -RCS file: /cvs/gnome/beagle/Filters/FilterMusic.cs,v -retrieving revision 1.14 -retrieving revision 1.15 -diff -u -p -r1.14 -r1.15 ---- Filters/FilterMusic.cs 2 Apr 2006 19:55:54 -0000 1.14 -+++ Filters/FilterMusic.cs 10 Apr 2006 22:40:49 -0000 1.15 -@@ -53,8 +53,9 @@ namespace Beagle.Filters { +================================================================================ +--- Filters/FilterMusic.cs ++++ Filters/FilterMusic.cs +@@ -53,8 +53,9 @@ AddSupportedFlavor (FilterFlavor.NewFromMimeType ("audio/x-m4a")); AddSupportedFlavor (FilterFlavor.NewFromExtension (".m4p")); @@ -17,15 +13,9 @@ // Tracker / Amiga Audio AddSupportedFlavor (FilterFlavor.NewFromMimeType ("audio/x-s3m")); -Index: Filters/entagged-sharp/EncodingInfo.cs -=================================================================== -RCS file: /cvs/gnome/beagle/Filters/entagged-sharp/EncodingInfo.cs,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -p -r1.2 -r1.3 ---- Filters/entagged-sharp/EncodingInfo.cs 11 Dec 2005 23:52:09 -0000 1.2 -+++ Filters/entagged-sharp/EncodingInfo.cs 24 Apr 2006 14:49:27 -0000 1.3 -@@ -78,7 +78,15 @@ namespace Entagged.Audioformats +--- Filters/entagged-sharp/EncodingInfo.cs ++++ Filters/entagged-sharp/EncodingInfo.cs +@@ -78,7 +78,15 @@ //Sets the length of the song in seconds public TimeSpan Duration { set { content["DURATION"] = value; } @@ -42,15 +32,9 @@ } public bool Vbr { -Index: Filters/entagged-sharp/Mp3/Util/Id3frames/Id3Frame.cs -=================================================================== -RCS file: /cvs/gnome/beagle/Filters/entagged-sharp/Mp3/Util/Id3frames/Id3Frame.cs,v -retrieving revision 1.3 -retrieving revision 1.4 -diff -u -p -r1.3 -r1.4 ---- Filters/entagged-sharp/Mp3/Util/Id3frames/Id3Frame.cs 15 Mar 2006 20:17:33 -0000 1.3 -+++ Filters/entagged-sharp/Mp3/Util/Id3frames/Id3Frame.cs 24 Apr 2006 14:49:28 -0000 1.4 -@@ -147,16 +147,16 @@ namespace Entagged.Audioformats.Mp3.Util +--- Filters/entagged-sharp/Mp3/Util/Id3frames/Id3Frame.cs ++++ Filters/entagged-sharp/Mp3/Util/Id3frames/Id3Frame.cs +@@ -147,16 +147,16 @@ zerochars = 2; } if (b[offset] == (byte) 0xFE && b[offset + 1] == (byte) 0xFF) { @@ -70,7 +54,7 @@ } } else { int zerochars = 0; -@@ -179,7 +179,7 @@ namespace Entagged.Audioformats.Mp3.Util +@@ -179,7 +179,7 @@ protected byte[] GetBytes(string s, string encoding) { byte[] result = null; if (encoding == "UTF-16") { @@ -79,15 +63,9 @@ // 2 for BOM and 2 for terminal character byte[] tmp = new byte[result.Length + 4]; Copy(result, tmp, 2); -Index: Filters/entagged-sharp/Ogg/OggFileReader.cs -=================================================================== -RCS file: /cvs/gnome/beagle/Filters/entagged-sharp/Ogg/OggFileReader.cs,v -retrieving revision 1.3 -retrieving revision 1.4 -diff -u -p -r1.3 -r1.4 ---- Filters/entagged-sharp/Ogg/OggFileReader.cs 15 Mar 2006 20:17:34 -0000 1.3 -+++ Filters/entagged-sharp/Ogg/OggFileReader.cs 24 Apr 2006 14:49:28 -0000 1.4 -@@ -33,6 +33,7 @@ namespace Entagged.Audioformats.Ogg +--- Filters/entagged-sharp/Ogg/OggFileReader.cs ++++ Filters/entagged-sharp/Ogg/OggFileReader.cs +@@ -33,6 +33,7 @@ [SupportedMimeType ("application/x-ogg")] [SupportedMimeType ("audio/vorbis")] [SupportedMimeType ("audio/x-vorbis")] @@ -95,15 +73,9 @@ [SupportedMimeType ("audio/ogg")] [SupportedMimeType ("audio/x-ogg")] [SupportedMimeType ("entagged/ogg")] -Index: Filters/entagged-sharp/Util/Utils.cs -=================================================================== -RCS file: /cvs/gnome/beagle/Filters/entagged-sharp/Util/Utils.cs,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -p -r1.2 -r1.3 ---- Filters/entagged-sharp/Util/Utils.cs 11 Dec 2005 23:52:16 -0000 1.2 -+++ Filters/entagged-sharp/Util/Utils.cs 24 Apr 2006 14:49:28 -0000 1.3 -@@ -100,13 +100,9 @@ namespace Entagged.Audioformats.Util +--- Filters/entagged-sharp/Util/Utils.cs ++++ Filters/entagged-sharp/Util/Utils.cs +@@ -100,13 +100,9 @@ string[] ret = new string[taglist.Count]; int i = 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...