diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-06-01 21:47:04 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-06-01 21:47:04 +0000 |
| commit | 6c85e7bc3b136ad5f831a4c289e04fdbe7451297 (patch) | |
| tree | a026eaf58deb09da7b04db6a266dfb7516f21c9a /src/ui/dialog/floating-behavior.cpp | |
| parent | opening kaleidscope (diff) | |
| parent | Mark user-visible messages for translation (diff) | |
| download | inkscape-6c85e7bc3b136ad5f831a4c289e04fdbe7451297.tar.gz inkscape-6c85e7bc3b136ad5f831a4c289e04fdbe7451297.zip | |
update to trunk
(bzr r13708.1.29)
Diffstat (limited to 'src/ui/dialog/floating-behavior.cpp')
| -rw-r--r-- | src/ui/dialog/floating-behavior.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp index 11db14801..55ef0c5bb 100644 --- a/src/ui/dialog/floating-behavior.cpp +++ b/src/ui/dialog/floating-behavior.cpp @@ -14,10 +14,6 @@ # include "config.h" #endif -#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H -#include <glibmm/threads.h> -#endif - #include <gtkmm/dialog.h> #include <gtkmm/stock.h> #include <glibmm/main.h> @@ -116,7 +112,7 @@ bool FloatingBehavior::_trans_timer (void) { } float goal, current; - goal = current = _d->get_opacity(); + current = _d->get_opacity(); if (_dialog_active.get_value()) { goal = _trans_focus; |