From ebfa46cf0116cd4e5151611fad5f2ba66ae90a29 Mon Sep 17 00:00:00 2001 From: Karl Cheng Date: Tue, 19 Feb 2019 22:11:31 +1100 Subject: Fix incorrect string literal comparisons --- src/extension/internal/gdkpixbuf-input.cpp | 4 ++-- src/ui/dialog/attrdialog.cpp | 2 +- src/ui/dialog/object-properties.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp index 26d5a3b85..9a1ed40e7 100644 --- a/src/extension/internal/gdkpixbuf-input.cpp +++ b/src/extension/internal/gdkpixbuf-input.cpp @@ -51,9 +51,9 @@ GdkpixbufInput::open(Inkscape::Extension::Input *mod, char const *uri) Glib::ustring scale = prefs->getString("/dialogs/import/scale"); // If we asked about import preferences, get values and update preferences. - if( ask ) { + if (ask) { ask = !mod->get_param_bool("do_not_ask"); - forcexdpi = (mod->get_param_optiongroup("dpi") == "from_default"); + forcexdpi = (strcmp(mod->get_param_optiongroup("dpi"), "from_default") == 0); link = mod->get_param_optiongroup("link"); scale = mod->get_param_optiongroup("scale"); diff --git a/src/ui/dialog/attrdialog.cpp b/src/ui/dialog/attrdialog.cpp index 4ccb037ef..a943f4b23 100644 --- a/src/ui/dialog/attrdialog.cpp +++ b/src/ui/dialog/attrdialog.cpp @@ -236,7 +236,7 @@ void AttrDialog::onAttrChanged(Inkscape::XML::Node *repr, const gchar * name, co } if (new_value) { if ((repr->type() == Inkscape::XML::TEXT_NODE || repr->type() == Inkscape::XML::COMMENT_NODE) && - name != "content") + strcmp(name, "content") != 0) { return; } else { diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp index 7ec9ccafa..c89d96230 100644 --- a/src/ui/dialog/object-properties.cpp +++ b/src/ui/dialog/object-properties.cpp @@ -315,7 +315,7 @@ void ObjectProperties::update() return; } _blocked = true; - _cb_aspect_ratio.set_active(item->getAttribute("preserveAspectRatio") == "true"); + _cb_aspect_ratio.set_active(strcmp(item->getAttribute("preserveAspectRatio"), "true") == 0); _cb_lock.set_active(item->isLocked()); /* Sensitive */ _cb_hide.set_active(item->isExplicitlyHidden()); /* Hidden */ -- cgit v1.2.3