diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2013-04-29 00:51:29 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2013-04-29 00:51:29 +0000 |
| commit | c317c1f79519f0ee961842ffb9feac4494af5377 (patch) | |
| tree | 28187bf8ccee447689430f1c0243700e0565e958 /src/widgets | |
| parent | Temporily fix abiguous macros before later removal. (diff) | |
| download | inkscape-c317c1f79519f0ee961842ffb9feac4494af5377.tar.gz inkscape-c317c1f79519f0ee961842ffb9feac4494af5377.zip | |
Fixed logic error confusing bitwise and with logical and.
Whitespace cleanup to make the issue easier to spot.
(bzr r12311)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/sp-attribute-widget.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/sp-color-notebook.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp index 4196e62bf..fb7eb1420 100644 --- a/src/widgets/sp-attribute-widget.cpp +++ b/src/widgets/sp-attribute-widget.cpp @@ -259,7 +259,7 @@ static void sp_attribute_table_object_modified ( SPObject */*object*/, guint flags, SPAttributeTable *spat ) { - if (flags && SP_OBJECT_MODIFIED_FLAG) + if (flags & SP_OBJECT_MODIFIED_FLAG) { std::vector<Glib::ustring> attributes = spat->get_attributes(); std::vector<Gtk::Entry *> entries = spat->get_entries(); @@ -270,7 +270,7 @@ static void sp_attribute_table_object_modified ( SPObject */*object*/, text = e->get_text (); if (val || !text.empty()) { if (text != val) { - /* We are different */ + // We are different spat->blocked = true; e->set_text (val ? val : (const gchar *) ""); spat->blocked = false; diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp index 89c5ed76a..f75521e2c 100644 --- a/src/widgets/sp-color-notebook.cpp +++ b/src/widgets/sp-color-notebook.cpp @@ -129,7 +129,7 @@ void ColorNotebook::switchPage(GtkNotebook*, csel->base->getColorAlpha(_color, _alpha); } widget = gtk_notebook_get_nth_page (GTK_NOTEBOOK (_book), page_num); - if ( widget && SP_IS_COLOR_SELECTOR (widget) ) + if ( widget && SP_IS_COLOR_SELECTOR(widget) ) { csel = SP_COLOR_SELECTOR (widget); csel->base->setColorAlpha( _color, _alpha ); @@ -232,7 +232,7 @@ void ColorNotebook::init() { guint howmany = 1; gpointer klass = g_type_class_ref (selector_types[i]); - if ( klass && SP_IS_COLOR_SELECTOR_CLASS (klass) ) + if ( klass && SP_IS_COLOR_SELECTOR_CLASS(klass) ) { SPColorSelectorClass *ck = SP_COLOR_SELECTOR_CLASS (klass); howmany = MAX (1, ck->submode_count); |