Merge lp:~jbicha/dee/fix-misleading-indent into lp:dee

[Jeremy Bícha]

Fix pos variable being incorrectly incremented due to missing braces.

Found by a compiler warning that noticed the indentation looked suspicious.

This fixes the build.

dee-serializable-model.c: In function ‘dee_serializable_model_get_position’:
dee-serializable-model.c:1329:3: error: this ‘while’ clause does not guard... [-Werror=misleading-indentation]
   while (!dee_model_is_last (self, iter) && iter != _iter)
   ^~~~~
dee-serializable-model.c:1331:5: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘while’
     pos++;

https://launchpadlibrarian.net/324288486/buildlog_ubuntu-artful-amd64.dee_1.2.7+15.04.20150304-0ubuntu4~ubuntu17.10.1_BUILDING.txt.gz

It's just a warning but these flags are set:
-Werror -Wall -Wno-error=deprecated-declarations

[Robert Ancell (robert-ancell)]

I updated the commit message to reflect this is actually a code change and potentially fixes a bug. I don't know if any code currently uses this or relies on the broken behaviour (I suspect not).

review: Approve

=== modified file 'src/dee-serializable-model.c'
--- src/dee-serializable-model.c	2013-09-16 18:50:51 +0000
+++ src/dee-serializable-model.c	2017-06-16 22:19:02 +0000
@@ -1327,8 +1327,10 @@
   pos = 0;
   _iter = dee_model_get_first_iter (self);
   while (!dee_model_is_last (self, iter) && iter != _iter)
-    _iter = dee_model_next (self, _iter);
-    pos++;
+    {
+      _iter = dee_model_next (self, _iter);
+      pos++;
+    }
 
   if (iter == _iter)
     return pos;