[Galago-commits] r2625 - in trunk/galago-sharp: . galago tests
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Fri Mar 24 01:33:02 PST 2006
Author: chipx86
Date: 2006-03-24 01:32:53 -0800 (Fri, 24 Mar 2006)
New Revision: 2625
Added:
trunk/galago-sharp/galago/Status.custom
Modified:
trunk/galago-sharp/ChangeLog
trunk/galago-sharp/galago/Global.custom
trunk/galago-sharp/galago/Makefile.am
trunk/galago-sharp/galago/galago-sharp.metadata
trunk/galago-sharp/tests/Makefile.am
trunk/galago-sharp/tests/presence-feed.cs
Log:
- Added SetAttribute() wrappers for all the SetAttr* functions in Galago.Object.
- Add convenience functions for Global.CreatePerson and CreateService that supply default values.
- Added a constructor to Status that provides default values.
- Perform other cleanups to the resulting API and metadata file.
Modified: trunk/galago-sharp/ChangeLog
===================================================================
--- trunk/galago-sharp/ChangeLog 2006-03-24 09:23:29 UTC (rev 2624)
+++ trunk/galago-sharp/ChangeLog 2006-03-24 09:32:53 UTC (rev 2625)
@@ -1,3 +1,18 @@
+Fri Mar 24 01:29:49 PST 2006 Christian Hammond <chipx86 at chipx86.com>
+
+ A galago/Status.custom:
+ * galago/galago-sharp.metadata:
+ * galago/Global.custom:
+ * galago/Makefile.am:
+ * tests/Makefile.am:
+ * tests/presence-feed.cs:
+ - Added SetAttribute() wrappers for all the SetAttr* functions in
+ Galago.Object.
+ - Add convenience functions for Global.CreatePerson and CreateService
+ that supply default values.
+ - Added a constructor to Status that provides default values.
+ - Perform other cleanups to the resulting API and metadata file.
+
Mon Feb 13 00:22:39 PST 2006 Christian Hammond <chipx86 at chipx86.com>
D debian:
Modified: trunk/galago-sharp/galago/Global.custom
===================================================================
--- trunk/galago-sharp/galago/Global.custom 2006-03-24 09:23:29 UTC (rev 2624)
+++ trunk/galago-sharp/galago/Global.custom 2006-03-24 09:32:53 UTC (rev 2625)
@@ -63,3 +63,18 @@
{
return GetServices(Galago.Origin.Remote);
}
+
+ public static Galago.Person CreatePerson()
+ {
+ return CreatePerson(null);
+ }
+
+ public static Galago.Service CreateService(string id, string name)
+ {
+ return CreateService(id, name, (Galago.ServiceFlags)0);
+ }
+
+ public static Galago.Service CreateService(string id)
+ {
+ return CreateService(id, null);
+ }
Modified: trunk/galago-sharp/galago/Makefile.am
===================================================================
--- trunk/galago-sharp/galago/Makefile.am 2006-03-24 09:23:29 UTC (rev 2624)
+++ trunk/galago-sharp/galago/Makefile.am 2006-03-24 09:32:53 UTC (rev 2625)
@@ -27,7 +27,8 @@
customs = \
Global.custom \
- Service.custom
+ Service.custom \
+ Status.custom
build_customs = $(addprefix $(srcdir)/, $(customs))
Added: trunk/galago-sharp/galago/Status.custom
===================================================================
--- trunk/galago-sharp/galago/Status.custom 2006-03-24 09:23:29 UTC (rev 2624)
+++ trunk/galago-sharp/galago/Status.custom 2006-03-24 09:32:53 UTC (rev 2625)
@@ -0,0 +1,4 @@
+ public Status(Galago.StatusType type, string id, string name)
+ : this(type, id, name, true)
+ {
+ }
Modified: trunk/galago-sharp/galago/galago-sharp.metadata
===================================================================
--- trunk/galago-sharp/galago/galago-sharp.metadata 2006-03-24 09:23:29 UTC (rev 2624)
+++ trunk/galago-sharp/galago/galago-sharp.metadata 2006-03-24 09:32:53 UTC (rev 2625)
@@ -7,21 +7,23 @@
<attr path="/api/namespace/class[@name='Is']/method[@name='Registered']" name="name">IsRegistered</attr>
<attr path="/api/namespace/class[@name='Is']/method[@name='Connected']" name="name">IsConnected</attr>
<attr path="/api/namespace/class[@name='Is']/method[@name='Feed']" name="name">IsFeed</attr>
+ <attr path="/api/namespace/class[@name='Create']/method[@name='Person']" name="name">CreatePerson</attr>
+ <attr path="/api/namespace/class[@name='Create']/method[@name='Service']" name="name">CreateService</attr>
<move-node path="/api/namespace/class[@name='Is']/method[@name='IsInitted']">/api/namespace/class[@name='Global']</move-node>
<move-node path="/api/namespace/class[@name='Is']/method[@name='IsDaemon']">/api/namespace/class[@name='Global']</move-node>
<move-node path="/api/namespace/class[@name='Is']/method[@name='IsRegistered']">/api/namespace/class[@name='Global']</move-node>
<move-node path="/api/namespace/class[@name='Is']/method[@name='IsConnected']">/api/namespace/class[@name='Global']</move-node>
<move-node path="/api/namespace/class[@name='Is']/method[@name='IsFeed']">/api/namespace/class[@name='Global']</move-node>
+ <move-node path="/api/namespace/class[@name='Create']/method[@name='CreatePerson']">/api/namespace/class[@name='Global']</move-node>
+ <move-node path="/api/namespace/class[@name='Create']/method[@name='CreateService']">/api/namespace/class[@name='Global']</move-node>
<attr path="/api/namespace/class[@name='Is']" name="hidden">1</attr>
+ <attr path="/api/namespace/class[@name='Create']" name="hidden">1</attr>
<!-- galago_dbus_* -->
<attr path="/api/namespace/class[@cname='GalagoDbus_']" name="hidden">1</attr>
- <!-- galago_log_* -->
- <attr path="/api/namespace/class[@cname='GalagoLog_']" name="hidden">1</attr>
-
<!-- GalagoObject -->
<attr path="/api/namespace/object[@cname='GalagoObject']/method[@name='GetAttribute']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GalagoObject']/method[@name='SetAttribute']" name="hidden">1</attr>
Modified: trunk/galago-sharp/tests/Makefile.am
===================================================================
--- trunk/galago-sharp/tests/Makefile.am 2006-03-24 09:23:29 UTC (rev 2624)
+++ trunk/galago-sharp/tests/Makefile.am 2006-03-24 09:32:53 UTC (rev 2625)
@@ -5,9 +5,8 @@
-pkg:glib-sharp-2.0
TARGETS = \
- get-presence.exe
-# monitor.exe \
-# presence-feed.exe
+ get-presence.exe \
+ presence-feed.exe
noinst_SCRIPTS = $(TARGETS)
@@ -16,9 +15,6 @@
get-presence.exe: get-presence.cs $(ASSEMBLIES)
$(CSC) /out:$@ $(REFERENCES) $(srcdir)/$<
-monitor.exe: monitor.cs $(ASSEMBLIES)
- $(CSC) /out:$@ $(REFERENCES) $(srcdir)/$<
-
presence-feed.exe: presence-feed.cs $(ASSEMBLIES)
$(CSC) /out:$@ $(REFERENCES) $(srcdir)/$<
Modified: trunk/galago-sharp/tests/presence-feed.cs
===================================================================
--- trunk/galago-sharp/tests/presence-feed.cs 2006-03-24 09:23:29 UTC (rev 2624)
+++ trunk/galago-sharp/tests/presence-feed.cs 2006-03-24 09:32:53 UTC (rev 2625)
@@ -2,17 +2,15 @@
{
using System;
using Galago;
- using Gtk;
+ using GLib;
public class PresenceFeed
{
public static int Main(string[] args)
{
- Application.Init();
+ MainLoop mainloop = new MainLoop();
- DBus.Connection conn = DBus.Bus.GetSessionBus();
-
- if (!Galago.Core.InitFeed("test-feed"))
+ if (!Galago.Global.Init("test-feed", true))
{
Console.WriteLine("Unable to initialize Galago");
@@ -21,10 +19,8 @@
SetupInfo();
- Application.Run();
+ mainloop.Run();
- Galago.Core.Uninit();
-
return 0;
}
@@ -39,17 +35,19 @@
Presence presence;
/* Setup our services */
- aimService = new Service("aim", "AOL Instant Messenger");
- jabberService = new Service("jabber", "Jabber");
+ aimService =
+ Galago.Global.CreateService("aim", "AOL Instant Messenger");
+ jabberService =
+ Galago.Global.CreateService("jabber", "Jabber");
/* Create our local person */
- me = Person.GetMe(true);
+ me = Galago.Global.GetMe(Galago.Origin.Local, false);
/* Setup our person's AIM account */
- account = new Account(aimService, me, "GalagoAIMUser");
- presence = new Presence(account);
+ account = aimService.CreateAccount(me, "GalagoAIMUser");
+ presence = account.CreatePresence();
- presence.SetIdle(true, 60 * 5);
+ presence.SetIdle(true, System.DateTime.Now);
status = new Status(StatusType.Away, "away", "Away");
status.SetAttribute("message", "I'm eating dinner.");
@@ -57,33 +55,33 @@
presence.AddStatus(status);
/* Add contacts to our AIM account */
- person = new Person("gonkulator-1");
- contact = new Account(aimService, person, "lottabs2");
- presence = new Presence(contact);
+ person = Galago.Global.CreatePerson("gonkulator-1");
+ contact = aimService.CreateAccount(person, "lottabs2");
+ presence = contact.CreatePresence();
- presence.SetIdle(true, 60 * 20);
+ presence.SetIdle(true, System.DateTime.Now);
account.AddContact(contact);
/* Setup our person's Jabber account */
- account = new Account(jabberService, me,
- "jabberuser at galago.sf.net");
- presence = new Presence(account);
+ account = jabberService.CreateAccount(me,
+ "jabberuser at galago.sf.net");
+ presence = account.CreatePresence();
status = new Status(StatusType.Available, "available", "Available");
presence.AddStatus(status);
/* Add contacts to our Jabber account */
- person = new Person("cae-1", true);
- contact = new Account(jabberService, person, "caedan at jabber.org");
- presence = new Presence(contact);
+ person = Galago.Global.CreatePerson("cae-1");
+ contact = jabberService.CreateAccount(person, "caedan at jabber.org");
+ presence = contact.CreatePresence();
status = new Status(StatusType.Available, "available", "Available");
presence.AddStatus(status);
account.AddContact(contact);
- contact = new Account(jabberService, person, "caelum at chipx86.com");
- presence = new Presence(contact);
+ contact = jabberService.CreateAccount(person, "caelum at chipx86.com");
+ presence = contact.CreatePresence();
status = new Status(StatusType.Offline, "offline", "Offline");
presence.AddStatus(status);
More information about the galago-commits
mailing list