diff options
| author | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
|---|---|---|
| committer | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
| commit | 839ea523164caecd8c779e60539b78c2a748a81f (patch) | |
| tree | 0019d04f27a1a258bc7a900e3cf77b916dca6493 /src/FbTk/Signal.hh | |
| parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
| parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
| download | fluxbox_lack-testing/argb.zip fluxbox_lack-testing/argb.tar.bz2 | |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/FbTk/Signal.hh')
| -rw-r--r-- | src/FbTk/Signal.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/FbTk/Signal.hh b/src/FbTk/Signal.hh index df30cda..7ad4d00 100644 --- a/src/FbTk/Signal.hh +++ b/src/FbTk/Signal.hh | |||
| @@ -203,7 +203,7 @@ public: | |||
| 203 | /// @return A tracking ID ( not unique ) | 203 | /// @return A tracking ID ( not unique ) |
| 204 | template <typename Signal, typename Functor> | 204 | template <typename Signal, typename Functor> |
| 205 | TrackID join(Signal& sig, const Functor& functor) { | 205 | TrackID join(Signal& sig, const Functor& functor) { |
| 206 | ValueType value = std::make_pair(&sig, sig.connect(functor)); | 206 | ValueType value = ValueType(&sig, sig.connect(functor)); |
| 207 | std::pair<TrackID, bool> ret = m_connections.insert(value); | 207 | std::pair<TrackID, bool> ret = m_connections.insert(value); |
| 208 | if ( !ret.second ) { | 208 | if ( !ret.second ) { |
| 209 | // failed to insert this functor | 209 | // failed to insert this functor |