• Stephan Bergmann's avatar
    Straighten the removeFragment code again · 0522b847
    Stephan Bergmann yazdı
    ...what apparently happened is:
    
    (1) First, 2c6363eb "Be less pathetic" replaced
        MediaDescriptor::impl_normalizeURL with removeFragment.
    
    (2) Then, b378e754 "CMIS: fix file saving issue"
        (plus follow-up b50d3727 "WaE: unused
        function 'removeFragment'") removed calling removeFragment at all (but re-
        introduced a now bogus "Parse URL! ..." comment that (1) had removed), which
    
    (3) 34f4d257 "CMIS file picker: it really does
        not like ID Mark" tried to revert again (but kept the bogus comment in), and
    
    (4) odd commit 319b1603 "CMIS file picker: it
        really does not like ID Mark" (that looks like a merge conflict resolution
        gone wrong) erroneously re-introduced MediaDescriptor::impl_normalizeURL
        that (1) had removed, which caused a -Wunused-variable warning that
    
    (5) 706c5a54 "-Werror,-Wunused-variable" tried
        to fix, but working under wrong assumptions.
    
    The solution is to go effectively back to the code as it was after (1).
    
    Change-Id: I62dfa9fa3adbea6b2cb10a509416fe3797c577b9
    0522b847
mediadescriptor.cxx 22.9 KB