X-Git-Url: https://git.toastfreeware.priv.at/gregoa/zavai.git/blobdiff_plain/8ead97831e25f820bd093a6e2717bf63aab17a09..eabaaf35d0f9ccdd238fbd4585e2d2c051d66bcc:/test/test-gsm-receive.vala?ds=sidebyside

diff --git a/test/test-gsm-receive.vala b/test/test-gsm-receive.vala
index b1110f8..2d8a963 100644
--- a/test/test-gsm-receive.vala
+++ b/test/test-gsm-receive.vala
@@ -20,27 +20,43 @@
 
 using GLib;
 
+public DBus.Connection sbus;
+
 //string VERSION = "0.1";
 
-public class GSMReceive: Object, zavai.Resource
+public class GSMReceive: Object //, zavai.Resource
 {
+    public dynamic DBus.Object device;
     public dynamic DBus.Object network;
     public dynamic DBus.Object call;
 
     public GSMReceive()
     {
-        zavai.gsm.gsm.request("GSMReceive");
+        //zavai.gsm.gsm.request("GSMReceive");
+
+        device = sbus.get_object(
+		    "org.freesmartphone.ogsmd",
+		    "/org/freesmartphone/GSM/Device",
+		    "org.freesmartphone.GSM.Device");
 
-        network = zavai.registry.sbus.get_object(
+        network = sbus.get_object(
             "org.freesmartphone.ogsmd", 
             "/org/freesmartphone/GSM/Device",
             "org.freesmartphone.GSM.Network");
 
-        call = zavai.registry.sbus.get_object(
+        call = sbus.get_object(
                 "org.freesmartphone.ogsmd",
                 "/org/freesmartphone/GSM/Device",
                 "org.freesmartphone.GSM.Call");
 
+	stderr.printf("Registering\n");
+	network.Register();
+	stderr.printf("Registered\n");
+
+	stderr.printf("Antenna is %s\n", device.GetAntennaPower() ? "on" : "off");
+	stderr.printf("Signal strength: %d\n", network.GetSignalStrength());
+	stderr.printf("Calling identification: %s\n", network.GetCallingIdentification());
+
         network.Status += on_network_Status;
         network.SignalStrength += on_network_SignalStrength;
         call.CallStatus += on_call_Status;
@@ -48,7 +64,7 @@ public class GSMReceive: Object, zavai.Resource
 
     public void shutdown()
     {
-        zavai.gsm.gsm.release("GSMReceive");
+        //zavai.gsm.gsm.release("GSMReceive");
     }
 
     public void on_network_SignalStrength(int strength)
@@ -381,25 +397,27 @@ public class GSMReceive: Object, zavai.Resource
 
 static int main (string[] args) {
 	Gtk.init (ref args);
-    Gst.init (ref args);
+    // Gst.init (ref args);
 
 	// Set up zavai
+	sbus = DBus.Bus.get(DBus.BusType.SYSTEM);
 
     // Core infrastructure
-	zavai.config = new zavai.Config();
-	zavai.config.argv0 = args[0];
-	zavai.registry = new zavai.Registry();
+//	zavai.config = new zavai.Config();
+//	zavai.config.argv0 = args[0];
+//	zavai.registry = new zavai.Registry();
 
     // Additional infrastructure
-	zavai.gsm.init();
-	zavai.log.init();
+	//zavai.gsm.init();
+	//zavai.log.init();
 
     // PLAY here
+    var gr = new GSMReceive();
 
 	Gtk.main();
 
 	// zavai.info("Shutting down")
-	zavai.registry.shutdown();
+	// zavai.registry.shutdown();
 
 	return 0;
 }