Merge lp:~kvalo/indicator-network/vala-style into lp:~indicator-applet-developers/indicator-network/indicator-network

[Kalle Valo]

Some vala style fixes and a small cmcc fix.

[Conor Curran (cjcurran)]

review: Approve

=== added file 'HACKING'
--- HACKING	1970-01-01 00:00:00 +0000
+++ HACKING	2011-02-16 14:17:53 +0000
@@ -0,0 +1,12 @@
+To compile indicator-network:
+
+sudo apt-get build-dep indicator-network
+./autogen (if source taken from bzr)
+./configure
+make
+
+Vala coding style:
+
+o indentation four spaces
+o "if {"
+o "foo()"

=== modified file 'scripts/cmcc'
--- scripts/cmcc	2011-02-16 09:09:57 +0000
+++ scripts/cmcc	2011-02-16 14:17:53 +0000
@@ -163,9 +163,7 @@
 def extract_dict(values):
 	s = ""
 	for k, v in values.items():
-		if type(v) is dbus.Array:
-			v = extract_list(v)
-		s += " %s=%s" % (k,v)
+		s += " %s=%s" % (k, convert_dbus_value(v))
 	return "{ %s }" % s
 
 def extract_list(values):

=== modified file 'src/settings/frontend/widgets/dialogs/edit-connection.vala'
--- src/settings/frontend/widgets/dialogs/edit-connection.vala	2011-02-15 11:27:57 +0000
+++ src/settings/frontend/widgets/dialogs/edit-connection.vala	2011-02-16 14:17:53 +0000
@@ -32,25 +32,25 @@
     private Gtk.Label label_name;
     private Gtk.CheckButton checkbutton_autoconnect;
 
-	/* wifi */
+    /* wifi */
     private Gtk.Label label_mode;
     private Gtk.Label label_security;
     private Gtk.Entry entry_passphrase;
-	
-	/* ipv4 */
+
+    /* ipv4 */
     private Gtk.ComboBox combobox_ipv4_method;
     private Gtk.Entry entry_ipv4_address;
     private Gtk.Entry entry_ipv4_netmask;
     private Gtk.Entry entry_ipv4_gateway;
-	private Gtk.TreeIter ipv4_off_iter;
-	private Gtk.TreeIter ipv4_manual_iter;
-	private Gtk.TreeIter ipv4_dhcp_iter;
+    private Gtk.TreeIter ipv4_off_iter;
+    private Gtk.TreeIter ipv4_manual_iter;
+    private Gtk.TreeIter ipv4_dhcp_iter;
 
     private Gtk.Entry entry_nameservers;
     private Gtk.Entry entry_domains;
 
-	// button_cancel here is an _ugly_ workaround to get signals from
-	// objects working, reason for this is complete unknown
+    // button_cancel here is an _ugly_ workaround to get signals from
+    // objects working, reason for this is complete unknown
     private string[] hint_labels = { "button_cancel" };
 
     public EditConnectionDialog(Connman.Service connection, string datadir) {
@@ -60,7 +60,7 @@
         this.builder = Utils.Gui.new_builder(datadir+"ui/edit_connection_dialog.ui");
         this.get_widgets();
         this.create_extra_widgets();
-        
+
         this.connect_signals();
         this.update_widget_values();
     }
@@ -76,57 +76,57 @@
                                                     });
         }
 
-		var store = new Gtk.ListStore(2, typeof(int), typeof(string));
-		Gtk.TreeIter iter;
-
-		this.combobox_ipv4_method.model = store;
-
-		var cell = new Gtk.CellRendererText();
-		this.combobox_ipv4_method.pack_start(cell, false);
-		this.combobox_ipv4_method.set_attributes(cell, "text", 1);
-
-		store.append(out iter);
-		store.set(iter, 0, Connman.IPv4Method.OFF, 1, "Off");
-		this.ipv4_off_iter = iter;
-
-		store.append(out iter);
-		store.set(iter, 0, Connman.IPv4Method.MANUAL, 1, "Manual");
-		this.ipv4_manual_iter = iter;
-
-		store.append(out iter);
-		store.set(iter, 0, Connman.IPv4Method.DHCP, 1, "DHCP");
-		this.ipv4_dhcp_iter = iter;
+        var store = new Gtk.ListStore(2, typeof(int), typeof(string));
+        Gtk.TreeIter iter;
+
+        this.combobox_ipv4_method.model = store;
+
+        var cell = new Gtk.CellRendererText();
+        this.combobox_ipv4_method.pack_start(cell, false);
+        this.combobox_ipv4_method.set_attributes(cell, "text", 1);
+
+        store.append(out iter);
+        store.set(iter, 0, Connman.IPv4Method.OFF, 1, "Off");
+        this.ipv4_off_iter = iter;
+
+        store.append(out iter);
+        store.set(iter, 0, Connman.IPv4Method.MANUAL, 1, "Manual");
+        this.ipv4_manual_iter = iter;
+
+        store.append(out iter);
+        store.set(iter, 0, Connman.IPv4Method.DHCP, 1, "DHCP");
+        this.ipv4_dhcp_iter = iter;
     }
 
     private void get_widgets() {
-		var b = this.builder;
+        var b = this.builder;
 
         this.dialog = b.get_object("window_main") as Gtk.Window;
         this.table_main = b.get_object("table_main") as Gtk.Table;
         this.button_save = b.get_object("button_save") as Gtk.Button;
         this.button_cancel = b.get_object("button_cancel") as Gtk.Button;
 
-		/* main */
+        /* main */
         this.label_name = b.get_object("label_name") as Gtk.Label;
         this.checkbutton_autoconnect = b.get_object("checkbutton_autoconnect")
-										as Gtk.CheckButton;
+                                        as Gtk.CheckButton;
 
-		/* wifi */
+        /* wifi */
         this.label_mode = b.get_object("label_mode") as Gtk.Label;
         this.label_security = b.get_object("label_security") as Gtk.Label;
         this.entry_passphrase = b.get_object("entry_passphrase") as Gtk.Entry;
 
-		/* ipv4 */
+        /* ipv4 */
         this.combobox_ipv4_method = b.get_object("combobox_ipv4_method")
-						as Gtk.ComboBox;
+                        as Gtk.ComboBox;
         this.entry_ipv4_address = b.get_object("entry_ipv4_address")
-						as Gtk.Entry;
+                        as Gtk.Entry;
         this.entry_ipv4_netmask = b.get_object("entry_ipv4_netmask")
-						as Gtk.Entry;
+                        as Gtk.Entry;
         this.entry_ipv4_gateway = b.get_object("entry_ipv4_gateway")
-						as Gtk.Entry;
+                        as Gtk.Entry;
 
-		/* dns */
+        /* dns */
         this.entry_nameservers = b.get_object("entry_nameservers") as Gtk.Entry;
         this.entry_domains = b.get_object("entry_domains") as Gtk.Entry;
     }
@@ -134,223 +134,222 @@
     private void connect_signals() {
         this.button_save.clicked.connect(this.on_button_save_clicked);
         this.button_cancel.clicked.connect(this.on_button_cancel_clicked);
-		this.combobox_ipv4_method.changed.connect(ipv4_method_changed);
-    }
-
-	private void ipv4_method_changed(Gtk.ComboBox box) {
-		Gtk.TreeIter iter;
-		Gtk.ListStore store;
-		Connman.IPv4Method method;
-
-		if (this.combobox_ipv4_method.get_active_iter(out iter) == false)
-			return;
-
-		store = this.combobox_ipv4_method.model as Gtk.ListStore;
-		store.get(iter, 0, out method);
-
-		switch (method) {
-		case Connman.IPv4Method.MANUAL:
-			this.entry_ipv4_address.sensitive = true;
-			this.entry_ipv4_netmask.sensitive = true;
-			this.entry_ipv4_gateway.sensitive = true;
-			break;
-		case Connman.IPv4Method.OFF:
-		case Connman.IPv4Method.DHCP:
-		default:
-			this.entry_ipv4_address.sensitive = false;
-			this.entry_ipv4_netmask.sensitive = false;
-			this.entry_ipv4_gateway.sensitive = false;
-			break;
-		}
-	}
-
-	private void update_mode() {
-		string mode = "";
-
-		switch (this.connection.mode) {
-		case Connman.ServiceMode.MANAGED:
-			mode = "Infrastructure";
-			break;
-		case Connman.ServiceMode.ADHOC:
-			mode = "Ad-Hoc";
-			break;
-		}
-			
-		this.label_mode.set_text(mode);
-	}
-
-	private void update_name() {
-		this.label_name.set_text(this.connection.name);
-	}
-
-	private void update_autoconnect() {
+        this.combobox_ipv4_method.changed.connect(ipv4_method_changed);
+    }
+
+    private void ipv4_method_changed(Gtk.ComboBox box) {
+        Gtk.TreeIter iter;
+        Gtk.ListStore store;
+        Connman.IPv4Method method;
+
+        if (this.combobox_ipv4_method.get_active_iter(out iter) == false)
+            return;
+
+        store = this.combobox_ipv4_method.model as Gtk.ListStore;
+        store.get(iter, 0, out method);
+
+        switch (method) {
+        case Connman.IPv4Method.MANUAL:
+            this.entry_ipv4_address.sensitive = true;
+            this.entry_ipv4_netmask.sensitive = true;
+            this.entry_ipv4_gateway.sensitive = true;
+            break;
+        case Connman.IPv4Method.OFF:
+        case Connman.IPv4Method.DHCP:
+        default:
+            this.entry_ipv4_address.sensitive = false;
+            this.entry_ipv4_netmask.sensitive = false;
+            this.entry_ipv4_gateway.sensitive = false;
+            break;
+        }
+    }
+
+    private void update_mode() {
+        string mode = "";
+
+        switch (this.connection.mode) {
+        case Connman.ServiceMode.MANAGED:
+            mode = "Infrastructure";
+            break;
+        case Connman.ServiceMode.ADHOC:
+            mode = "Ad-Hoc";
+            break;
+        }
+
+        this.label_mode.set_text(mode);
+    }
+
+    private void update_name() {
+        this.label_name.set_text(this.connection.name);
+    }
+
+    private void update_autoconnect() {
         this.checkbutton_autoconnect.set_active(this.connection.autoconnect);
-	}
+    }
 
-	private void save_autoconnect() {
+    private void save_autoconnect() {
         this.connection.autoconnect = this.checkbutton_autoconnect.get_active();
-	}
-
-	private void update_security() {
-		string security ="";
-
-		
-		/* security */
-		switch (this.connection.security) {
-		case Connman.ServiceSecurity.NONE:
-			security = "None";
-			break;
-		case Connman.ServiceSecurity.WEP:
-			security = "WEP";
-			break;
-		case Connman.ServiceSecurity.PSK:
-			security = "WPA-PSK";
-			break;
-		case Connman.ServiceSecurity.IEEE8021X:
-			security = "WPA-Enterprise";
-			break;
-		}
-
-		this.label_security.set_text(security);
-	}
-
-	private void update_passphrase() {
-		this.entry_passphrase.set_text(this.connection.passphrase);
-	}
-
-	private void save_passphrase() {
-		/* FIXME: fix libconnman */
-		// this.connection.passphrase = this.entry_passphrase.get_text();
-	}
-
-	private void update_ipv4() {
-		var ipv4 = this.connection.get_ipv4_configuration();
-		Gtk.TreeIter iter;
-
-		switch (ipv4.method) {
-		case Connman.IPv4Method.OFF:
-			iter = this.ipv4_off_iter;
-			break;
-		case Connman.IPv4Method.MANUAL:
-			iter = this.ipv4_manual_iter;
-			this.entry_ipv4_address.text = ipv4.address;
-			this.entry_ipv4_netmask.text = ipv4.netmask;
-			this.entry_ipv4_gateway.text = ipv4.gateway;
-			break;
-		case Connman.IPv4Method.DHCP:
-		default:
-			iter = this.ipv4_dhcp_iter;
-			break;
-		}
-
-		this.combobox_ipv4_method.set_active_iter(iter);
-	}
-
-	private void save_ipv4() {
-		Gtk.TreeIter iter;
-		Connman.IPv4Method method;
-		Connman.IPv4 ipv4;
-
-		var store = this.combobox_ipv4_method.model as Gtk.ListStore;
-
-		this.combobox_ipv4_method.get_active_iter(out iter);
-		store.get(iter, 0, out method);
-
-		var address = this.entry_ipv4_address.text;
-		var netmask = this.entry_ipv4_netmask.text;
-		var gateway = this.entry_ipv4_gateway.text;
-
-		try {
-			ipv4 = new Connman.IPv4(method, address, netmask, gateway);
-			this.connection.set_ipv4_configuration(ipv4);
-		} catch (GLib.Error e) {
-			stderr.printf("Failed to create ipv4 object: %s", e.message);
-		}
-	}
-
-	private void update_nameservers() {
-		string s = string.joinv(" ", this.connection.get_nameservers_configuration());
-		this.entry_nameservers.set_text(s);
-	}
-
-	private void save_nameservers() {
-		string[] array = this.entry_nameservers.get_text().split(" ");
-		string[] servers = null;
-
-		foreach (var server in array) {
-			servers += server.strip();
-		}
-
-		this.connection.set_nameservers_configuration(servers);
-	}
-
-	private void update_domains() {
-		string s = string.joinv(" ", this.connection.get_domains_configuration());
-		this.entry_domains.set_text(s);
-	}
-
-	private void save_domains() {
-		string[] array = this.entry_domains.get_text().split(" ");
-		string[] domains = null;
-
-		foreach (var server in array) {
-			domains += server.strip();
-		}
-
-		this.connection.set_domains_configuration(domains);
-	}
+    }
+
+    private void update_security() {
+        string security ="";
+
+        /* security */
+        switch (this.connection.security) {
+        case Connman.ServiceSecurity.NONE:
+            security = "None";
+            break;
+        case Connman.ServiceSecurity.WEP:
+            security = "WEP";
+            break;
+        case Connman.ServiceSecurity.PSK:
+            security = "WPA-PSK";
+            break;
+        case Connman.ServiceSecurity.IEEE8021X:
+            security = "WPA-Enterprise";
+            break;
+        }
+
+        this.label_security.set_text(security);
+    }
+
+    private void update_passphrase() {
+        this.entry_passphrase.set_text(this.connection.passphrase);
+    }
+
+    private void save_passphrase() {
+        /* FIXME: fix libconnman */
+        // this.connection.passphrase = this.entry_passphrase.get_text();
+    }
+
+    private void update_ipv4() {
+        var ipv4 = this.connection.get_ipv4_configuration();
+        Gtk.TreeIter iter;
+
+        switch (ipv4.method) {
+        case Connman.IPv4Method.OFF:
+            iter = this.ipv4_off_iter;
+            break;
+        case Connman.IPv4Method.MANUAL:
+            iter = this.ipv4_manual_iter;
+            this.entry_ipv4_address.text = ipv4.address;
+            this.entry_ipv4_netmask.text = ipv4.netmask;
+            this.entry_ipv4_gateway.text = ipv4.gateway;
+            break;
+        case Connman.IPv4Method.DHCP:
+        default:
+            iter = this.ipv4_dhcp_iter;
+            break;
+        }
+
+        this.combobox_ipv4_method.set_active_iter(iter);
+    }
+
+    private void save_ipv4() {
+        Gtk.TreeIter iter;
+        Connman.IPv4Method method;
+        Connman.IPv4 ipv4;
+
+        var store = this.combobox_ipv4_method.model as Gtk.ListStore;
+
+        this.combobox_ipv4_method.get_active_iter(out iter);
+        store.get(iter, 0, out method);
+
+        var address = this.entry_ipv4_address.text;
+        var netmask = this.entry_ipv4_netmask.text;
+        var gateway = this.entry_ipv4_gateway.text;
+
+        try {
+            ipv4 = new Connman.IPv4(method, address, netmask, gateway);
+            this.connection.set_ipv4_configuration(ipv4);
+        } catch (GLib.Error e) {
+            stderr.printf("Failed to create ipv4 object: %s", e.message);
+        }
+    }
+
+    private void update_nameservers() {
+        string s = string.joinv(" ", this.connection.get_nameservers_configuration());
+        this.entry_nameservers.set_text(s);
+    }
+
+    private void save_nameservers() {
+        string[] array = this.entry_nameservers.get_text().split(" ");
+        string[] servers = null;
+
+        foreach (var server in array) {
+            servers += server.strip();
+        }
+
+        this.connection.set_nameservers_configuration(servers);
+    }
+
+    private void update_domains() {
+        string s = string.joinv(" ", this.connection.get_domains_configuration());
+        this.entry_domains.set_text(s);
+    }
+
+    private void save_domains() {
+        string[] array = this.entry_domains.get_text().split(" ");
+        string[] domains = null;
+
+        foreach (var server in array) {
+            domains += server.strip();
+        }
+
+        this.connection.set_domains_configuration(domains);
+    }
 
     private void update_widget_values() {
-		switch (this.connection.get_service_type()) {
-		case Connman.ServiceType.WIFI:
-			update_name();
-			update_autoconnect();
-			update_mode();
-			update_security();
-			update_passphrase();
-			update_ipv4();
-			update_nameservers();
-			update_domains();
-			break;
-		case Connman.ServiceType.ETHERNET:
-			update_name();
-			update_autoconnect();
-			update_ipv4();
-			update_nameservers();
-			update_domains();
-			break;
-		case Connman.ServiceType.BLUETOOTH:
-			update_name();
-			update_autoconnect();
-			update_ipv4();
-			update_nameservers();
-			update_domains();
-			break;
-		}
+        switch (this.connection.get_service_type()) {
+        case Connman.ServiceType.WIFI:
+            update_name();
+            update_autoconnect();
+            update_mode();
+            update_security();
+            update_passphrase();
+            update_ipv4();
+            update_nameservers();
+            update_domains();
+            break;
+        case Connman.ServiceType.ETHERNET:
+            update_name();
+            update_autoconnect();
+            update_ipv4();
+            update_nameservers();
+            update_domains();
+            break;
+        case Connman.ServiceType.BLUETOOTH:
+            update_name();
+            update_autoconnect();
+            update_ipv4();
+            update_nameservers();
+            update_domains();
+            break;
+        }
     }
-    
+
     private void save_widget_values() {
-		switch (this.connection.get_service_type()) {
-		case Connman.ServiceType.WIFI:
-			save_autoconnect();
-			save_passphrase();
-			save_ipv4();
-			save_nameservers();
-			save_domains();
-			break;
-		case Connman.ServiceType.ETHERNET:
-			save_autoconnect();
-			save_ipv4();
-			save_nameservers();
-			save_domains();
-			break;
-		case Connman.ServiceType.BLUETOOTH:
-			save_autoconnect();
-			save_ipv4();
-			save_nameservers();
-			save_domains();
-			break;
-		}
+        switch (this.connection.get_service_type()) {
+        case Connman.ServiceType.WIFI:
+            save_autoconnect();
+            save_passphrase();
+            save_ipv4();
+            save_nameservers();
+            save_domains();
+            break;
+        case Connman.ServiceType.ETHERNET:
+            save_autoconnect();
+            save_ipv4();
+            save_nameservers();
+            save_domains();
+            break;
+        case Connman.ServiceType.BLUETOOTH:
+            save_autoconnect();
+            save_ipv4();
+            save_nameservers();
+            save_domains();
+            break;
+        }
     }
 
     private void on_button_save_clicked() {
@@ -358,7 +357,7 @@
         this.dialog.destroy();
         this.response(Gtk.ResponseType.APPLY);
     }
-    
+
     private void on_button_cancel_clicked() {
         this.dialog.destroy();
         this.response(Gtk.ResponseType.CANCEL);
@@ -366,6 +365,6 @@
 
     public int run() {
         this.dialog.show_all();
-		return 0;
+        return 0;
     }
 }