diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2009-12-31 07:28:06 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2009-12-31 07:28:06 +0000 |
| commit | 4783d8c0eb412679dad7eef0ee3732e68a2d1dd8 (patch) | |
| tree | ba94d5de8164f2f6b95f049e288ca98ca02bdd8e /src/sp-flowtext.cpp | |
| parent | Restore files that shouldn't have been touched. Grrr (diff) | |
| download | inkscape-4783d8c0eb412679dad7eef0ee3732e68a2d1dd8.tar.gz inkscape-4783d8c0eb412679dad7eef0ee3732e68a2d1dd8.zip | |
Warning cleanup for char const*
(bzr r8929)
Diffstat (limited to 'src/sp-flowtext.cpp')
| -rw-r--r-- | src/sp-flowtext.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp index feb79cd9a..53bcd425d 100644 --- a/src/sp-flowtext.cpp +++ b/src/sp-flowtext.cpp @@ -375,15 +375,13 @@ static gchar *sp_flowtext_description(SPItem *item) Inkscape::Text::Layout const &layout = SP_FLOWTEXT(item)->layout; int const nChars = layout.iteratorToCharIndex(layout.end()); - char *trunc = ""; - if (layout.inputTruncated()) { - trunc = _(" [truncated]"); - } + char const *trunc = (layout.inputTruncated()) ? _(" [truncated]") : ""; - if (SP_FLOWTEXT(item)->has_internal_frame()) + if (SP_FLOWTEXT(item)->has_internal_frame()) { return g_strdup_printf(ngettext("<b>Flowed text</b> (%d character%s)", "<b>Flowed text</b> (%d characters%s)", nChars), nChars, trunc); - else + } else { return g_strdup_printf(ngettext("<b>Linked flowed text</b> (%d character%s)", "<b>Linked flowed text</b> (%d characters%s)", nChars), nChars, trunc); + } } static void sp_flowtext_snappoints(SPItem const *item, bool const target, SnapPointsWithType &p, Inkscape::SnapPreferences const */*snapprefs*/) |