beagle-galago05.patch

   1 diff -aurN beagle-0.2.8.orig/Util/Galago.cs beagle-0.2.8/Util/Galago.cs
   2 --- beagle-0.2.8.orig/Util/Galago.cs    2005-08-14 19:54:17.000000000 +0200
   3 +++ beagle-0.2.8/Util/Galago.cs 2006-08-17 21:11:44.000000000 +0200
   4 @@ -35,15 +35,15 @@
   5
   6                 public static string GetPresence (string service_id, string username)
   7                 {
   8 -                       if (! Galago.Core.Init ("beagle-galago-presence"))
   9 +                       if (! Galago.Global.Init ("beagle-galago-presence"))
  10                                 return null;
  11
  12 -                       Galago.Service service = Galago.Core.GetService (service_id, false, true);
  13 +                       Galago.Service service = Galago.Global.GetService (service_id);
  14
  15                         if (service == null)
  16                                 return null;
  17
  18 -                       Galago.Account account = service.GetAccount (username, true);
  19 +                       Galago.Account account = service.GetAccount (username);
  20
  21                         if (account == null)
  22                                 return null;
  23 @@ -56,14 +56,14 @@
  24
  25                         string user_status = null;
  26
  27 -                       if (presence.Idle == true)
  28 +                       if (presence == null)
  29 +                               user_status = ("No presence");
  30 +                       else
  31                                 // FIXME: We need to translate this
  32                                 user_status = String.Format ("Idle {0}",
  33 -                                                            StringFu.DurationToPrettyString (DateTime.Now.AddSeconds (presence.IdleTime), DateTime.Now));
  34 -                       else
  35 -                               user_status = presence.ActiveStatus.Name;
  36 +                                                            StringFu.DurationToPrettyString (presence.IdleTime, DateTime.Now));
  37
  38 -                       Galago.Core.Uninit();
  39 +                       Galago.Global.Uninit();
  40
  41                         return user_status;
  42                 }
  43 diff -aurN beagle-0.2.8.orig/configure.in beagle-0.2.8/configure.in
  44 --- beagle-0.2.8.orig/configure.in      2006-08-17 18:16:25.000000000 +0200
  45 +++ beagle-0.2.8/configure.in   2006-08-17 21:12:20.000000000 +0200
  46 @@ -487,7 +487,7 @@
  47
  48  dnl Galago
  49
  50 -PKG_CHECK_MODULES(GALAGO, galago-sharp <= 0.3.4 , enable_galago=yes, enable_galago=no)
  51 +PKG_CHECK_MODULES(GALAGO, galago-sharp >= 0.5.0 , enable_galago=yes, enable_galago=no)
  52  AM_CONDITIONAL(ENABLE_GALAGO, test "x$enable_galago" = "xyes")
  53  AC_SUBST(GALAGO_LIBS)
  54