← Back to branch summary

~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2ubuntu4

« back to all changes in this revision

Viewing changes to src/live_effects/lpeobject-reference.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook, Ted Gould, Kees Cook
  • Date: 2009-06-24 14:00:43 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090624140043-07stp20mry48hqup
Tags: 0.47~pre0-0ubuntu1
* New upstream release

[ Ted Gould ]
* debian/control: Adding libgsl0 and removing version specifics on boost

[ Kees Cook ]
* debian/watch: updated to run uupdate and mangle pre-release versions.
* Dropped patches that have been taken upstream:
  - 01_mips
  - 02-poppler-0.8.3
  - 03-chinese-inkscape
  - 05_fix_latex_patch
  - 06_gcc-4.4
  - 07_cdr2svg
  - 08_skip-bad-utf-on-pdf-import
  - 09_gtk-clist
  - 10_belarussian
  - 11_libpng
  - 12_desktop
  - 13_slider
  - 100_svg_import_improvements
  - 102_sp_pattern_painter_free
  - 103_bitmap_type_print

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/live_effects/lpeobject-reference.cpp
11
11
#include "enums.h"
12
12
#include "live_effects/lpeobject-reference.h"
13
13
#include "live_effects/lpeobject.h"
14
 
 
15
 
#include "prefs-utils.h"
16
14
#include "uri.h"
17
15
 
18
16
namespace Inkscape {
59
57
}
60
58
 
61
59
void
62
 
LPEObjectReference::link(char *to)
 
60
LPEObjectReference::link(const char *to)
63
61
{
64
62
    if ( to == NULL ) {
65
63
        quit_listening();
128
126
static void
129
127
lpeobjectreference_delete_self(SPObject */*deleted*/, LPEObjectReference *lpeobjref)
130
128
{
131
 
    guint const mode = prefs_get_int_attribute("options.cloneorphans", "value", SP_CLONE_ORPHANS_UNLINK);
132
 
 
133
 
    if (mode == SP_CLONE_ORPHANS_UNLINK) {
134
 
        // leave it be. just forget about the source
135
129
        lpeobjref->quit_listening();
136
130
        lpeobjref->unlink();
137
131
        if (lpeobjref->user_unlink)
138
 
            lpeobjref->user_unlink(lpeobjref->owner);
139
 
    } else if (mode == SP_CLONE_ORPHANS_DELETE) {
140
 
        lpeobjref->owner->deleteObject();
141
 
    }
 
132
            lpeobjref->user_unlink(lpeobjref, lpeobjref->owner);
142
133
}
143
134
 
144
135
static void