wifi: reference resources directly

diff --git a/src/app_wifi.vala b/src/app_wifi.vala
index ccfa874e9a480e7eced85192c3d95bca337255e4..96187043d7c7c14a0ff6e52b8c5a098169fce818 100644 (file)
--- 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 56f30fde9f1054ce329cb096e848686d1ada6a43..19a482a4f1f099363ae54619b8f62916bf4fd458 100644 (file)
--- 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);
 }
 
 }