Merge lp:~victored/granite/remove-conditional-compilation into lp:~elementary-pantheon/granite/granite

[Victor Martinez]

[SourceList] Remove workaround for https://bugzilla.gnome.org/show_bug.cgi?id=685177 because it was fixed in vala 0.20.

This also allows valadoc to compile documentation without errors, as it does not support conditional compilation directives.

[SourceList] Remove workaround for https://bugzilla.gnome.org/show_bug.cgi?id=685177 because it was fixed in vala 0.20.

This also allows valadoc to compile documentation without errors, as it does not support conditional compilation directives.

[Cody Garver (codygarver)]

review: Approve

=== modified file 'lib/Widgets/SourceList.vala'
--- lib/Widgets/SourceList.vala	2013-05-30 09:13:43 +0000
+++ lib/Widgets/SourceList.vala	2013-08-16 22:56:23 +0000
@@ -820,18 +820,8 @@
             // and its handlers could potentially depend on one of the methods mentioned above.
             items.unset (item);
 
-            if (child_iter != null) {
-#if VALA_0_18
-                // Workaround for a bug in valac 0.18 that tries to pass an invalid pointer type
-                // (GtkTreeIter** instead of GtkTreeIter*) to gtk_tree_store_remove() in the
-                // generated C code. https://bugzilla.gnome.org/show_bug.cgi?id=685177
-                Gtk.TreeIter iter = child_iter;
-
-                child_tree.remove (ref iter);
-#else
-                child_tree.remove (child_iter);
-#endif
-            }
+            if (child_iter != null)
+                child_tree.remove (ref child_iter);
 
             push_parent_update (item.parent);