← Back to branch summary

~ubuntu-branches/ubuntu/utopic/inkscape/utopic-proposed

« back to all changes in this revision

Viewing changes to src/sp-image.cpp

  • Committer: Package Import Robot
  • Author(s): Alex Valavanis
  • Date: 2014-08-19 19:10:32 UTC
  • mfrom: (1.6.5) (2.5.14 sid)
  • Revision ID: package-import@ubuntu.com-20140819191032-2eca1qihaszjk9i6
Tags: 0.48.5-2ubuntu1
https://launchpad.net/bugs/1358863
https://launchpad.net/bugs/166371
https://launchpad.net/bugs/966441
https://launchpad.net/bugs/1051017
https://launchpad.net/bugs/1163241
https://launchpad.net/bugs/529843
https://launchpad.net/bugs/1090865
* Merge with Debian Unstable (LP: #1358863). Fixes several Ubuntu bugs:
  - Illustrator CS SVG won't load: namespace URIs in entities (LP: #166371)
  - inkscape crashed with SIGSEGV in
    sp_dtw_color_profile_event() (LP: #966441)
  - inkscape crashed with SIGSEGV (LP: #1051017)
  - inkscape crashed with SIGSEGV in Inkscape::Preferences::_getNode()
    (LP: #1163241)
  - save a copy reverts to save as (LP: #529843)
  - Extension to braille not working on Xubuntu 12.10 (LP: #1090865)
* Remaining changes:
  - debian/control:
    + Set Ubuntu Developer as maintainer,
    + build-depend on dh-translation to handle Ubuntu translation,
    + demote pstoedit from Recommends to Suggests (because it's in universe),
  - debian/patches/0006_add_unity_quicklist_support.patch: add.
  - debian/patches/series: update.
  - debian/rules:
    + add dh_translation to handle Ubuntu translation
* Drop debian/patches/librevenge.patch (superseded by
    debian/patches/0006-Update_to_new_libwpg.patch)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/sp-image.cpp
649
649
    }
650
650
 
651
651
    if (image->pixbuf) {
652
 
        gdk_pixbuf_unref (image->pixbuf);
 
652
        g_object_unref(G_OBJECT(image->pixbuf));
653
653
        image->pixbuf = NULL;
654
654
    }
655
655
 
809
809
 
810
810
    if (flags & SP_IMAGE_HREF_MODIFIED_FLAG) {
811
811
        if (image->pixbuf) {
812
 
            gdk_pixbuf_unref (image->pixbuf);
 
812
            g_object_unref(G_OBJECT(image->pixbuf));
813
813
            image->pixbuf = NULL;
814
814
        }
815
815
        if ( image->pixPath ) {
1267
1267
        result = pixbuf;
1268
1268
    } else {
1269
1269
        result = gdk_pixbuf_add_alpha(pixbuf, FALSE, 0, 0, 0);
1270
 
        gdk_pixbuf_unref(pixbuf);
 
1270
        g_object_unref(G_OBJECT(pixbuf));
1271
1271
    }
1272
1272
    return result;
1273
1273
}
1608
1608
        if ( !val ) {
1609
1609
            // stat call worked. Check time now
1610
1610
            if ( st.st_mtime != image->lastMod ) {
1611
 
                SPCtx *ctx = 0;
1612
 
                unsigned int flags = SP_IMAGE_HREF_MODIFIED_FLAG;
1613
 
                sp_image_update(image, ctx, flags);
 
1611
                image->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_IMAGE_HREF_MODIFIED_FLAG);
1614
1612
            }
1615
1613
        }
1616
1614
    }