← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/display/sp-canvas.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/display/sp-canvas.cpp
1291
1291
     * offsets of the fields in the event structures.
1292
1292
     */
1293
1293
 
1294
 
    GdkEvent ev = *event;
 
1294
    GdkEvent *ev = gdk_event_copy(event);
1295
1295
 
1296
 
    switch (ev.type) {
 
1296
    switch (ev->type) {
1297
1297
    case GDK_ENTER_NOTIFY:
1298
1298
    case GDK_LEAVE_NOTIFY:
1299
 
        ev.crossing.x += canvas->x0;
1300
 
        ev.crossing.y += canvas->y0;
 
1299
        ev->crossing.x += canvas->x0;
 
1300
        ev->crossing.y += canvas->y0;
1301
1301
        break;
1302
1302
    case GDK_MOTION_NOTIFY:
1303
1303
    case GDK_BUTTON_PRESS:
1304
1304
    case GDK_2BUTTON_PRESS:
1305
1305
    case GDK_3BUTTON_PRESS:
1306
1306
    case GDK_BUTTON_RELEASE:
1307
 
        ev.motion.x += canvas->x0;
1308
 
        ev.motion.y += canvas->y0;
 
1307
        ev->motion.x += canvas->x0;
 
1308
        ev->motion.y += canvas->y0;
1309
1309
        break;
1310
1310
    default:
1311
1311
        break;
1354
1354
 
1355
1355
    while (item && !finished) {
1356
1356
        gtk_object_ref (GTK_OBJECT (item));
1357
 
        gtk_signal_emit (GTK_OBJECT (item), item_signals[ITEM_EVENT], &ev, &finished);
 
1357
        gtk_signal_emit (GTK_OBJECT (item), item_signals[ITEM_EVENT], ev, &finished);
1358
1358
        SPCanvasItem *parent = item->parent;
1359
1359
        gtk_object_unref (GTK_OBJECT (item));
1360
1360
        item = parent;
1361
1361
    }
1362
1362
 
 
1363
    gdk_event_free(ev);
 
1364
 
1363
1365
    return finished;
1364
1366
}
1365
1367