From 8b04d0db6c55e36935690d37defb6f9b68945796 Mon Sep 17 00:00:00 2001 From: johnce Date: Wed, 5 Aug 2009 05:40:36 +0000 Subject: SPDocument->Document (bzr r8404) --- src/sp-item.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/sp-item.cpp') diff --git a/src/sp-item.cpp b/src/sp-item.cpp index 662dc1cac..16efe677f 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -83,7 +83,7 @@ static void sp_item_class_init(SPItemClass *klass); static void sp_item_init(SPItem *item); -static void sp_item_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr); +static void sp_item_build(SPObject *object, Document *document, Inkscape::XML::Node *repr); static void sp_item_release(SPObject *object); static void sp_item_set(SPObject *object, unsigned key, gchar const *value); static void sp_item_update(SPObject *object, SPCtx *ctx, guint flags); @@ -401,7 +401,7 @@ void SPItem::lowerToBottom() { } static void -sp_item_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) +sp_item_build(SPObject *object, Document *document, Inkscape::XML::Node *repr) { sp_object_read_attr(object, "style"); sp_object_read_attr(object, "transform"); -- cgit v1.2.3 From 51c2905fd3e99955db2d823b79abb763d8097028 Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Thu, 6 Aug 2009 14:17:17 +0000 Subject: Revert recent refactoring changes by johnce because they break the build, which cannot be fixed easily. (bzr r8422) --- src/sp-item.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/sp-item.cpp') diff --git a/src/sp-item.cpp b/src/sp-item.cpp index 16efe677f..662dc1cac 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -83,7 +83,7 @@ static void sp_item_class_init(SPItemClass *klass); static void sp_item_init(SPItem *item); -static void sp_item_build(SPObject *object, Document *document, Inkscape::XML::Node *repr); +static void sp_item_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr); static void sp_item_release(SPObject *object); static void sp_item_set(SPObject *object, unsigned key, gchar const *value); static void sp_item_update(SPObject *object, SPCtx *ctx, guint flags); @@ -401,7 +401,7 @@ void SPItem::lowerToBottom() { } static void -sp_item_build(SPObject *object, Document *document, Inkscape::XML::Node *repr) +sp_item_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { sp_object_read_attr(object, "style"); sp_object_read_attr(object, "transform"); -- cgit v1.2.3 From 89abf2d35ba202b184df4e791da3903c16d1d91c Mon Sep 17 00:00:00 2001 From: bulia byak Date: Sun, 6 Sep 2009 02:34:31 +0000 Subject: textual patch from bug 408093 (bzr r8563) --- src/sp-item.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sp-item.cpp') diff --git a/src/sp-item.cpp b/src/sp-item.cpp index 662dc1cac..395048280 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -1062,7 +1062,7 @@ sp_item_description(SPItem *item) const gchar *label = SP_OBJECT_STYLE(item)->filter.href->getObject()->label(); gchar *snew; if (label) { - snew = g_strdup_printf (_("%s; filtered (%s)"), s, label); + snew = g_strdup_printf (_("%s; filtered (%s)"), s, _(label)); } else { snew = g_strdup_printf (_("%s; filtered"), s); } -- cgit v1.2.3