Update for Vala 0.8.0

Work around a 0.8.0 bug in the bridge edit dialog,
see https://bugzilla.gnome.org/show_bug.cgi?id=615940.

diff --git a/configure.ac b/configure.ac
index c3a26c1..8a6845f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ VERSION=0.0.5
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
 AC_PROG_CC
-AM_PROG_VALAC([0.7.9])
+AM_PROG_VALAC([0.8.0])
 AC_STDC_HEADERS
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL

diff --git a/debian/control b/debian/control
index 651ff05..3449036 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: status-area-applet-tor
 Section: user/network
 Priority: extra
 Maintainer: Philipp Zabel <philipp.zabel@gmail.com>
-Build-Depends: vala (>= 0.7.10-maemo1), libconic0-dev, libhildondesktop1-dev, libosso-dev, osso-af-settings
+Build-Depends: vala (>= 0.8.0), libconic0-dev, libhildondesktop1-dev, libosso-dev, osso-af-settings
 Standards-Version: 4
 XSBC-Bugtracker: https://bugs.maemo.org/enter_bug.cgi?product=Tor
 

diff --git a/src/status-area-applet-tor.vala b/src/status-area-applet-tor.vala
index 9b8910f..e2ff9d5 100644 (file)
--- a/src/status-area-applet-tor.vala
+++ b/src/status-area-applet-tor.vala
@@ -465,12 +465,14 @@ class TorStatusMenuItem : HD.StatusMenuItem {
 
                        if (response_id == RESPONSE_DELETE) {
                                if (path != null) {
-                                       store.remove (iter);
+                                       Gtk.TreeIter iter2;
+                                       store.get_iter (out iter2, path);
+                                       store.remove (iter2);
                                        string bridge;
-                                       if (store.get_iter_first (out iter)) do {
-                                               store.@get (iter, 0, out bridge);
+                                       if (store.get_iter_first (out iter2)) do {
+                                               store.@get (iter2, 0, out bridge);
                                                bridges.append (bridge);
-                                       } while (store.iter_next (ref iter));
+                                       } while (store.iter_next (ref iter2));
                                        try {
                                                gconf.set_list (GCONF_KEY_BRIDGES,
                                                                GConf.ValueType.STRING,
@@ -494,10 +496,13 @@ class TorStatusMenuItem : HD.StatusMenuItem {
                                                                        _("Invalid port number"));
                                        return;
                                }
+                               Gtk.TreeIter iter2;
                                if (path == null) {
-                                       store.append (out iter);
+                                       store.append (out iter2);
+                               } else {
+                                       store.get_iter (out iter2, path);
                                }
-                               store.@set (iter, 0, "%s:%d".printf (ip_entry.get_text (), port));
+                               store.@set (iter2, 0, "%s:%d".printf (ip_entry.get_text (), port));
                                try {
                                        bridges = gconf.get_list (GCONF_KEY_BRIDGES,
                                                                  GConf.ValueType.STRING);
@@ -510,10 +515,10 @@ class TorStatusMenuItem : HD.StatusMenuItem {
                                } else {
                                        bridges = null;
                                        string bridge;
-                                       if (store.get_iter_first (out iter)) do {
-                                               store.@get (iter, 0, out bridge);
+                                       if (store.get_iter_first (out iter2)) do {
+                                               store.@get (iter2, 0, out bridge);
                                                bridges.append (bridge);
-                                       } while (store.iter_next (ref iter));
+                                       } while (store.iter_next (ref iter2));
                                }
                                try {
                                        gconf.set_list (GCONF_KEY_BRIDGES,