Re: PATCH: Load and display gaim aliases

[Matt Jones <mattharrison sbcglobal net>]

> In the future, can you attach patches in unified diff (diff -u) format?
> Much easier to read that way.


Sorry, thought they were. I've reattached to patch made by the command
'cvs -z3 diff -u'

--Matt Jones

Index: Tiles/TileImLog.cs
===================================================================
RCS file: /cvs/gnome/beagle/Tiles/TileImLog.cs,v
retrieving revision 1.6
diff -u -r1.6 TileImLog.cs
--- Tiles/TileImLog.cs	15 Sep 2004 15:02:46 -0000	1.6
+++ Tiles/TileImLog.cs	4 Oct 2004 23:17:40 -0000
@@ -25,6 +25,7 @@
 //
 
 using System;
+using System.IO;
 using BU = Beagle.Util;
 
 namespace Beagle.Tile {
@@ -34,10 +35,16 @@
 	public class TileImLog : TileFromTemplate {
 
 		Hit hit;
+		BU.ImBuddy buddy = null;
+		static BU.GaimBuddyListReader list = null;
 
 		public TileImLog (Hit _hit) : base ("template-im-log.html")
 		{
+			if (list == null) {
+				list = new BU.GaimBuddyListReader ();
+			}
 			hit = _hit;
+			buddy = list.Search (hit ["fixme:speakingto"]);
 		}
 
 		private string niceTime (string str)
@@ -50,6 +57,11 @@
 		{
 			if (key == "Uri")
 				return hit.Uri.ToString ();
+			if (key == "fixme:speakingto") {
+				if (buddy != null && buddy.Alias != "")
+					return buddy.Alias + " (" + hit ["fixme:speakingto"] + ")";
+				return hit["fixme:speakingto"];
+			}
 			if (key == "nice_starttime")
 				return niceTime (hit ["fixme:starttime"]);
 			if (key == "nice_endtime")
Index: Util/Makefile.am
===================================================================
RCS file: /cvs/gnome/beagle/Util/Makefile.am,v
retrieving revision 1.21
diff -u -r1.21 Makefile.am
--- Util/Makefile.am	22 Sep 2004 12:01:43 -0000	1.21
+++ Util/Makefile.am	4 Oct 2004 23:17:41 -0000
@@ -18,6 +18,7 @@
 	$(srcdir)/gnome.cs              \
 	$(srcdir)/Id3.cs                \
 	$(srcdir)/ImLog.cs              \
+	$(srcdir)/ImBuddy.cs		\
 	$(srcdir)/Inotify.cs		\
 	$(srcdir)/Logger.cs             \
 	$(srcdir)/MultiReader.cs        \
@@ -28,7 +29,8 @@
 	$(srcdir)/StringFu.cs           \
 	$(srcdir)/UriFu.cs		\
 	$(srcdir)/GtkUtils.cs		\
-	$(srcdir)/Vfs.cs
+	$(srcdir)/Vfs.cs		\
+	$(srcdir)/../beagled/FileSystemEventMonitor.cs
 
 ASSEMBLIES =				\
 	$(BEAGLE_UI_LIBS)		\