diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2012-12-05 23:32:43 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2012-12-05 23:32:43 +0000 |
| commit | 56255864c99b77e4c72916c61e783f332e429ba7 (patch) | |
| tree | 15c208eb1422c446bd63944156ba4f913e4b0f0a /src/widgets/desktop-widget.cpp | |
| parent | - fix security bug lp:1025185 (diff) | |
| download | inkscape-56255864c99b77e4c72916c61e783f332e429ba7.tar.gz inkscape-56255864c99b77e4c72916c61e783f332e429ba7.zip | |
can't do a string comparison like that!
(bzr r11932)
Diffstat (limited to 'src/widgets/desktop-widget.cpp')
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 9cd93a871..3791ec73c 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -823,9 +823,9 @@ SPDesktopWidget::updateTitle(gchar const* uri) gchar const *printcolorsnamecomma = N_(", print colors preview"); gchar const *outlinename = N_("outline"); gchar const *nofiltersname = N_("no filters"); - gchar const *colormodename = ""; - gchar const *colormodenamecomma = ""; - gchar const *rendermodename = ""; + gchar const *colormodename = NULL; + gchar const *colormodenamecomma = NULL; + gchar const *rendermodename = NULL; gchar const *modifiedname = ""; SPDocument *doc = this->desktop->doc(); if (doc->isModifiedSinceSave()) { @@ -847,28 +847,28 @@ SPDesktopWidget::updateTitle(gchar const* uri) if (this->desktop->number > 1) { - if (rendermodename != "") { - if (colormodenamecomma != "") { + if (rendermodename) { + if (colormodenamecomma) { g_string_printf (name, _("%s%s: %d (%s%s) - Inkscape"), modifiedname, fname, this->desktop->number, _(rendermodename), _(colormodenamecomma)); } else { g_string_printf (name, _("%s%s: %d (%s) - Inkscape"), modifiedname, fname, this->desktop->number, _(rendermodename)); } } else { - if (colormodename != "") { + if (colormodename) { g_string_printf (name, _("%s%s: %d (%s) - Inkscape"), modifiedname, fname, this->desktop->number, _(colormodename)); } else { g_string_printf (name, _("%s%s: %d - Inkscape"), modifiedname, fname, this->desktop->number); } } } else { - if (rendermodename != "") { - if (colormodenamecomma != "") { + if (rendermodename) { + if (colormodenamecomma) { g_string_printf (name, _("%s%s (%s%s) - Inkscape"), modifiedname, fname, _(rendermodename), _(colormodenamecomma)); } else { g_string_printf (name, _("%s%s (%s) - Inkscape"), modifiedname, fname, _(rendermodename)); } } else { - if (colormodename != "") { + if (colormodename) { g_string_printf (name, _("%s%s (%s) - Inkscape"), modifiedname, fname, _(colormodename)); } else { g_string_printf (name, _("%s%s - Inkscape"), modifiedname, fname); |