From a1deb0ff2305541c528ea7e52c1a4b7e12ba2428 Mon Sep 17 00:00:00 2001
From: gregor herrmann <gregoa@debian.org>
Date: Wed, 16 Dec 2009 21:10:13 +0100
Subject: [PATCH] wifi: reference resources directly

---
 src/app_wifi.vala | 17 ++++++-----------
 src/wifi.vala     |  1 -
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/app_wifi.vala b/src/app_wifi.vala
index ccfa874..9618704 100644
--- a/src/app_wifi.vala
+++ b/src/app_wifi.vala
@@ -28,7 +28,6 @@ namespace wifi {
 
 public class WiFiRequest : Gtk.ToggleButton
 {
-	protected string service_name;
 	protected string label_start;
 	protected string label_stop;
 	protected zavai.StatusIcon status_icon;
@@ -36,7 +35,6 @@ public class WiFiRequest : Gtk.ToggleButton
 
 	public WiFiRequest()
 	{
-		service_name = "wifi.wifi";
 		label_start = "Start WiFi";
 		label_stop = "Stop WiFi";
 		set_size_request(0, zavai.config.min_button_height);
@@ -77,15 +75,12 @@ public class WiFiRequest : Gtk.ToggleButton
 
 	private void on_toggled(Gtk.Button src)
 	{
-		Service s = zavai.registry.gets(service_name);
-		if (get_active()) {
-			s.request("servicerequestlink");
-        }
-		else {
-			s.release("servicerequestlink");
-        }
-		set_label(get_active() ? label_stop : label_start);
-		update_icon();
+        if (get_active())
+            zavai.wifi.wifi.request("servicerequestlink");
+        else
+            zavai.wifi.wifi.release("servicerequestlink");
+        set_label(get_active() ? label_stop : label_start);
+        update_icon();
 	}
 
 	private void on_status_clicked(Gtk.Button b)
diff --git a/src/wifi.vala b/src/wifi.vala
index 56f30fd..19a482a 100644
--- a/src/wifi.vala
+++ b/src/wifi.vala
@@ -99,7 +99,6 @@ public zavai.wifi.WiFi wifi = null;
 public void init()
 {
 	wifi = new WiFi();
-	zavai.registry.register_service(wifi);
 }
 
 }
-- 
2.39.5