X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdocument-subset.cpp;h=04b3d9b0629cdc22965e88bb1cc0ef185b121b1e;hb=5d67bd380afd0885c8b4656cb3383aea24aedfcb;hp=217176f4e78dff0e2631ef1ac829326f771aae22;hpb=8f9fc892f53e932a79afe15bd7039b5578983cb2;p=inkscape.git

diff --git a/src/document-subset.cpp b/src/document-subset.cpp
index 217176f4e..04b3d9b06 100644
--- a/src/document-subset.cpp
+++ b/src/document-subset.cpp
@@ -36,10 +36,10 @@ struct DocumentSubset::Relations : public GC::Managed<GC::ATOMIC>,
         SPObject *parent;
         Siblings children;
 
-        gulong release_connection;
+        sigc::connection release_connection;
         sigc::connection position_changed_connection;
 
-        Record() : parent(NULL), release_connection(0) {}
+        Record() : parent(NULL) {}
 
         unsigned childIndex(SPObject *obj) {
             Siblings::iterator found;
@@ -57,17 +57,31 @@ struct DocumentSubset::Relations : public GC::Managed<GC::ATOMIC>,
             } else {
                 Siblings::const_iterator first=children.begin();
                 Siblings::const_iterator last=children.end() - 1;
+
                 while ( first != last ) {
-                    Siblings::const_iterator mid=first + ( last - first + 1 ) / 2;
-                    int pos=sp_object_compare_position(*mid, obj);
+                    Siblings::const_iterator mid = first + ( last - first + 1 ) / 2;
+                    int pos = sp_object_compare_position(*mid, obj);
                     if ( pos < 0 ) {
                         first = mid;
                     } else if ( pos > 0 ) {
-                        last = mid;
+                        if ( last == mid ) {
+                            last = mid - 1; // already at the top limit
+                        } else {
+                            last = mid;
+                        }
                     } else {
                         g_assert_not_reached();
                     }
                 }
+
+                if ( first == last ) {
+                    // compare to the single possiblity left
+                    int pos = sp_object_compare_position(*last, obj);
+                    if ( pos < 0 ) {
+                        last++;
+                    }
+                }
+
                 return last - children.begin();
             }
         }
@@ -126,7 +140,8 @@ struct DocumentSubset::Relations : public GC::Managed<GC::ATOMIC>,
         for ( Map::iterator iter=records.begin()
             ; iter != records.end() ; ++iter )
         {
-            sp_object_unref((*iter).first);
+            if ((*iter).first)
+                sp_object_unref((*iter).first);
         }
     }
 
@@ -149,8 +164,9 @@ private:
         sp_object_ref(obj);
         Record &record=records[obj];
         record.release_connection
-          = g_signal_connect(obj, "release",
-                             (GCallback)&Relations::_release_object, this);
+          = obj->connectRelease(
+              sigc::mem_fun(this, &Relations::_release_object)
+            );
         record.position_changed_connection
           = obj->connectPositionChanged(
               sigc::mem_fun(this, &Relations::reorder)
@@ -164,10 +180,7 @@ private:
 
     void _doRemove(SPObject *obj) {
         Record &record=records[obj];
-        if (record.release_connection) {
-            g_signal_handler_disconnect(obj, record.release_connection);
-            record.release_connection = 0;
-        }
+        record.release_connection.disconnect();
         record.position_changed_connection.disconnect();
         records.erase(obj);
 
@@ -198,10 +211,9 @@ private:
         }
     }
 
-    static void _release_object(SPObject *obj, void *relations_p) {
-        Relations &relations=*static_cast<Relations *>(relations_p);
-        if (relations.get(obj)) {
-            relations.remove(obj, true);
+    void _release_object(SPObject *obj) {
+        if (get(obj)) {
+            remove(obj, true);
         }
     }
 };