Merge lp:~novalis/inkscape/cleanup into lp:~inkscape.dev/inkscape/trunk

[David Turner]

(I'm not sure if I'm doing this pull request right, so please let me know if I've screwed it up)

[Vinipsmaker (vinipsmaker)]

I understand the simplification, but maybe the "paint->value.href->detach();" code changes the value of the expression "paint->value.href". Somebody needs to dig deeper in this function.

[Vinipsmaker (vinipsmaker)]

Anyway, if the simplification can not be done, some comment should be there at least.

Maybe I'll dig deeper soon.

[David Turner (novalis)]

I looked into that, and I don't think it does. None of the code in detach() or its callees seems to reference the owner. Unless it's in something hooked up to _changed_signal, but it looks to me like _changed_signal is totally unused.

[Vinipsmaker (vinipsmaker)]

I've spent more time looking into the code. Surely is okay, thanks for contributing. :)

=== modified file 'src/style.cpp'
--- src/style.cpp	2013-09-28 13:59:58 +0000
+++ src/style.cpp	2013-10-09 03:15:29 +0000
@@ -2469,9 +2469,7 @@
         if (paint->value.href->getObject()){
             paint->value.href->detach();
         }
-    }
 
-    if (paint->value.href) {
         try {
             paint->value.href->attach(*uri);
         } catch (Inkscape::BadURIException &e) {