summaryrefslogtreecommitdiffstats
path: root/src/ink-comboboxentry-action.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2013-02-12 19:50:08 +0000
committerJabiertxo Arraiza Zenotz <jtx@jtx.marker.es>2013-02-12 19:50:08 +0000
commit43a8037ff382f0d7ac5c8ff367db0286676558f1 (patch)
treef23ffee6f812b562cec7ef52d7d000ee1614dd6d /src/ink-comboboxentry-action.cpp
parentFix po files (diff)
parentUpdate from trunk (diff)
downloadinkscape-43a8037ff382f0d7ac5c8ff367db0286676558f1.tar.gz
inkscape-43a8037ff382f0d7ac5c8ff367db0286676558f1.zip
Start proyect, Merge from Trunk
(bzr r11950.1.27)
Diffstat (limited to 'src/ink-comboboxentry-action.cpp')
-rw-r--r--src/ink-comboboxentry-action.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ink-comboboxentry-action.cpp b/src/ink-comboboxentry-action.cpp
index 5adc3e73a..fd146926f 100644
--- a/src/ink-comboboxentry-action.cpp
+++ b/src/ink-comboboxentry-action.cpp
@@ -497,8 +497,8 @@ gboolean ink_comboboxentry_action_set_active_text( Ink_ComboBoxEntry_Action* ink
// Show or hide warning -- this might be better moved to text-toolbox.cpp
bool clear = true;
- if( ink_comboboxentry_action->active == -1 &&
- ink_comboboxentry_action->warning != NULL ) {
+
+ if( ink_comboboxentry_action->warning != NULL ) {
Glib::ustring missing = check_comma_separated_text( ink_comboboxentry_action );
if( !missing.empty() ) {