wok annotate inkscape/stuff/inkscape-0.47-gcc45.patch @ rev 12602

Up apr-util (1.4.1), again
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Apr 29 08:21:34 2012 +0200 (2012-04-29)
parents
children
rev   line source
erjo@5894 1 diff -Naur inkscape-0.47-orig/src/eraser-context.cpp inkscape-0.47/src/eraser-context.cpp
erjo@5894 2 --- inkscape-0.47-orig/src/eraser-context.cpp 2010-02-18 08:45:58.000000000 -0500
erjo@5894 3 +++ inkscape-0.47/src/eraser-context.cpp 2010-02-18 08:46:26.000000000 -0500
erjo@5894 4 @@ -749,7 +749,7 @@
erjo@5894 5 if ( eraserMode ) {
erjo@5894 6 toWorkOn = sp_document_partial_items_in_box(sp_desktop_document(desktop), desktop->dkey, bounds);
erjo@5894 7 } else {
erjo@5894 8 - Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
erjo@5894 9 + Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
erjo@5894 10 toWorkOn = sp_document_items_at_points(sp_desktop_document(desktop), desktop->dkey, r->getPoints());
erjo@5894 11 }
erjo@5894 12 toWorkOn = g_slist_remove( toWorkOn, acid );
erjo@5894 13 diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp inkscape-0.47/src/extension/internal/filter/filter-file.cpp
erjo@5894 14 --- inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp 2010-02-18 08:45:58.000000000 -0500
erjo@5894 15 +++ inkscape-0.47/src/extension/internal/filter/filter-file.cpp 2010-02-18 09:07:54.000000000 -0500
erjo@5894 16 @@ -161,7 +161,7 @@
erjo@5894 17 mywriter writer;
erjo@5894 18 sp_repr_write_stream(node, writer, 0, FALSE, g_quark_from_static_string("svg"), 0, 0);
erjo@5894 19
erjo@5894 20 - Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(g_strdup(writer.c_str())));
erjo@5894 21 + Inkscape::Extension::build_from_mem(xml_str, new Filter(g_strdup(writer.c_str())));
erjo@5894 22 g_free(xml_str);
erjo@5894 23 return;
erjo@5894 24 }
erjo@5894 25 diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter.cpp inkscape-0.47/src/extension/internal/filter/filter.cpp
erjo@5894 26 --- inkscape-0.47-orig/src/extension/internal/filter/filter.cpp 2010-02-18 08:45:58.000000000 -0500
erjo@5894 27 +++ inkscape-0.47/src/extension/internal/filter/filter.cpp 2010-02-18 09:21:06.000000000 -0500
erjo@5894 28 @@ -217,7 +217,7 @@
erjo@5894 29 "<menu-tip>%s</menu-tip>\n"
erjo@5894 30 "</effect>\n"
erjo@5894 31 "</inkscape-extension>\n", name, id, submenu, tip);
erjo@5894 32 - Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(filter));
erjo@5894 33 + Inkscape::Extension::build_from_mem(xml_str, new Filter(filter));
erjo@5894 34 g_free(xml_str);
erjo@5894 35 return;
erjo@5894 36 }
erjo@5894 37 diff -Naur inkscape-0.47-orig/src/flood-context.cpp inkscape-0.47/src/flood-context.cpp
erjo@5894 38 --- inkscape-0.47-orig/src/flood-context.cpp 2010-02-18 08:45:58.000000000 -0500
erjo@5894 39 +++ inkscape-0.47/src/flood-context.cpp 2010-02-18 08:48:16.000000000 -0500
erjo@5894 40 @@ -900,7 +900,7 @@
erjo@5894 41 if (is_point_fill) {
erjo@5894 42 fill_points.push_back(Geom::Point(event->button.x, event->button.y));
erjo@5894 43 } else {
erjo@5894 44 - Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
erjo@5894 45 + Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
erjo@5894 46 fill_points = r->getPoints();
erjo@5894 47 }
erjo@5894 48
erjo@5894 49 @@ -1206,7 +1206,7 @@
erjo@5894 50
erjo@5894 51 case GDK_BUTTON_RELEASE:
erjo@5894 52 if (event->button.button == 1 && !event_context->space_panning) {
erjo@5894 53 - Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
erjo@5894 54 + Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
erjo@5894 55 if (r->is_started()) {
erjo@5894 56 // set "busy" cursor
erjo@5894 57 desktop->setWaitingCursor();
erjo@5894 58 diff -Naur inkscape-0.47-orig/src/gradient-context.cpp inkscape-0.47/src/gradient-context.cpp
erjo@5894 59 --- inkscape-0.47-orig/src/gradient-context.cpp 2010-02-18 08:45:58.000000000 -0500
erjo@5894 60 +++ inkscape-0.47/src/gradient-context.cpp 2010-02-18 08:47:33.000000000 -0500
erjo@5894 61 @@ -641,7 +641,7 @@
erjo@5894 62 if (!event_context->within_tolerance) {
erjo@5894 63 // we've been dragging, either do nothing (grdrag handles that),
erjo@5894 64 // or rubberband-select if we have rubberband
erjo@5894 65 - Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
erjo@5894 66 + Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
erjo@5894 67 if (r->is_started() && !event_context->within_tolerance) {
erjo@5894 68 // this was a rubberband drag
erjo@5894 69 if (r->getMode() == RUBBERBAND_MODE_RECT) {
erjo@5894 70 diff -Naur inkscape-0.47-orig/src/select-context.cpp inkscape-0.47/src/select-context.cpp
erjo@5894 71 --- inkscape-0.47-orig/src/select-context.cpp 2010-02-18 08:45:58.000000000 -0500
erjo@5894 72 +++ inkscape-0.47/src/select-context.cpp 2010-02-18 08:50:11.000000000 -0500
erjo@5894 73 @@ -602,7 +602,7 @@
erjo@5894 74 }
erjo@5894 75 sc->item = NULL;
erjo@5894 76 } else {
erjo@5894 77 - Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
erjo@5894 78 + Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
erjo@5894 79 if (r->is_started() && !within_tolerance) {
erjo@5894 80 // this was a rubberband drag
erjo@5894 81 GSList *items = NULL;