SliTaz Repositories

1 diff -Naur inkscape-0.47-orig/src/eraser-context.cpp inkscape-0.47/src/eraser-context.cpp

2 --- inkscape-0.47-orig/src/eraser-context.cpp 2010-02-18 08:45:58.000000000 -0500

3 +++ inkscape-0.47/src/eraser-context.cpp 2010-02-18 08:46:26.000000000 -0500

4 @@ -749,7 +749,7 @@

5 if ( eraserMode ) {

6 toWorkOn = sp_document_partial_items_in_box(sp_desktop_document(desktop), desktop->dkey, bounds);

7 } else {

8 - Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);

9 + Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);

10 toWorkOn = sp_document_items_at_points(sp_desktop_document(desktop), desktop->dkey, r->getPoints());

11 }

12 toWorkOn = g_slist_remove( toWorkOn, acid );

13 diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp inkscape-0.47/src/extension/internal/filter/filter-file.cpp

14 --- inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp 2010-02-18 08:45:58.000000000 -0500

15 +++ inkscape-0.47/src/extension/internal/filter/filter-file.cpp 2010-02-18 09:07:54.000000000 -0500

16 @@ -161,7 +161,7 @@

17 mywriter writer;

18 sp_repr_write_stream(node, writer, 0, FALSE, g_quark_from_static_string("svg"), 0, 0);

19

20 - Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(g_strdup(writer.c_str())));

21 + Inkscape::Extension::build_from_mem(xml_str, new Filter(g_strdup(writer.c_str())));

22 g_free(xml_str);

23 return;

24 }

25 diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter.cpp inkscape-0.47/src/extension/internal/filter/filter.cpp

26 --- inkscape-0.47-orig/src/extension/internal/filter/filter.cpp 2010-02-18 08:45:58.000000000 -0500

27 +++ inkscape-0.47/src/extension/internal/filter/filter.cpp 2010-02-18 09:21:06.000000000 -0500

28 @@ -217,7 +217,7 @@

29 "<menu-tip>%s</menu-tip>\n"

30 "</effect>\n"

31 "</inkscape-extension>\n", name, id, submenu, tip);

32 - Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(filter));

33 + Inkscape::Extension::build_from_mem(xml_str, new Filter(filter));

34 g_free(xml_str);

35 return;

36 }

37 diff -Naur inkscape-0.47-orig/src/flood-context.cpp inkscape-0.47/src/flood-context.cpp

38 --- inkscape-0.47-orig/src/flood-context.cpp 2010-02-18 08:45:58.000000000 -0500

39 +++ inkscape-0.47/src/flood-context.cpp 2010-02-18 08:48:16.000000000 -0500

40 @@ -900,7 +900,7 @@

41 if (is_point_fill) {

42 fill_points.push_back(Geom::Point(event->button.x, event->button.y));

43 } else {

44 - Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);

45 + Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);

46 fill_points = r->getPoints();

47 }

48

49 @@ -1206,7 +1206,7 @@

50

51 case GDK_BUTTON_RELEASE:

52 if (event->button.button == 1 && !event_context->space_panning) {

53 - Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);

54 + Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);

55 if (r->is_started()) {

56 // set "busy" cursor

57 desktop->setWaitingCursor();

58 diff -Naur inkscape-0.47-orig/src/gradient-context.cpp inkscape-0.47/src/gradient-context.cpp

59 --- inkscape-0.47-orig/src/gradient-context.cpp 2010-02-18 08:45:58.000000000 -0500

60 +++ inkscape-0.47/src/gradient-context.cpp 2010-02-18 08:47:33.000000000 -0500

61 @@ -641,7 +641,7 @@

62 if (!event_context->within_tolerance) {

63 // we've been dragging, either do nothing (grdrag handles that),

64 // or rubberband-select if we have rubberband

65 - Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);

66 + Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);

67 if (r->is_started() && !event_context->within_tolerance) {

68 // this was a rubberband drag

69 if (r->getMode() == RUBBERBAND_MODE_RECT) {

70 diff -Naur inkscape-0.47-orig/src/select-context.cpp inkscape-0.47/src/select-context.cpp

71 --- inkscape-0.47-orig/src/select-context.cpp 2010-02-18 08:45:58.000000000 -0500

72 +++ inkscape-0.47/src/select-context.cpp 2010-02-18 08:50:11.000000000 -0500

73 @@ -602,7 +602,7 @@

74 }

75 sc->item = NULL;

76 } else {

77 - Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);

78 + Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);

79 if (r->is_started() && !within_tolerance) {

80 // this was a rubberband drag

81 GSList *items = NULL;