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/ThemeItems.cc | |
| parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
| parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
| download | fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.zip fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.tar.bz2 | |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/FbTk/ThemeItems.cc')
| -rw-r--r-- | src/FbTk/ThemeItems.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/FbTk/ThemeItems.cc b/src/FbTk/ThemeItems.cc index b4e7096..56efb1b 100644 --- a/src/FbTk/ThemeItems.cc +++ b/src/FbTk/ThemeItems.cc | |||
| @@ -120,7 +120,7 @@ void ThemeItem<unsigned int>::setDefaultValue() { | |||
| 120 | 120 | ||
| 121 | template <> | 121 | template <> |
| 122 | void ThemeItem<unsigned int>::setFromString(const char *str) { | 122 | void ThemeItem<unsigned int>::setFromString(const char *str) { |
| 123 | sscanf(str, "%d", &m_value); | 123 | sscanf(str, "%u", &m_value); |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | template <> | 126 | template <> |