Fixed bad name clash
authorEnrico Zini <enrico@enricozini.org>
Mon, 17 Aug 2009 09:41:39 +0000 (10:41 +0100)
committerEnrico Zini <enrico@enricozini.org>
Mon, 17 Aug 2009 09:41:43 +0000 (10:41 +0100)
src/app.vala
src/app_gps.vala

index 1a9fc2dbbecda84e32134a864c974b77ec68550d..6bbb2e76f6b54e867ac028a268f078a066ffd6af 100644 (file)
@@ -394,14 +394,11 @@ public class StatusIcon : Gtk.Button
 {
        private Gtk.Image image_widget;
 
-       public signal void activate();
-
        public StatusIcon()
        {
                relief = Gtk.ReliefStyle.NONE;
                image_widget = new Gtk.Image();
                image = image_widget;
-               clicked += on_clicked;
        }
 
        public void set_from_file(string file)
@@ -413,11 +410,6 @@ public class StatusIcon : Gtk.Button
        {
                zavai.ui.main.status.status_icons.pack_start(this, false, false, 0);
        }
-
-       private void on_clicked(Gtk.Button b)
-       {
-               activate();
-       }
 }
 
 public class CommandButton : Gtk.Button
index 694a53680dabaeb033ee1ce20148ddf90141e668..7f919190c21c1aa968da3fed9634e49b4ecdfd96 100644 (file)
@@ -178,7 +178,7 @@ public class GPSRequestLink : Gtk.ToggleButton
                // GPS status icon
                status_icon = new zavai.StatusIcon();
                status_icon.install();
-               status_icon.activate += on_status_activate;
+               status_icon.clicked += on_status_clicked;
                update_icon();
        }
 
@@ -210,7 +210,7 @@ public class GPSRequestLink : Gtk.ToggleButton
                update_icon();
        }
 
-       private void on_status_activate()
+       private void on_status_clicked(Gtk.Button b)
        {
                set_active(!get_active());
        }