Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 3 insertions, 7 deletions

diff --git a/src/SystemTray.cc b/src/SystemTray.cc
index 0c3e550..3a38bb1 100644
--- a/src/SystemTray.cc
+++ b/src/SystemTray.cc
@@ -25,13 +25,13 @@
 #include "FbTk/ImageControl.hh"
 #include "FbTk/TextUtils.hh"
 #include "FbTk/MemFun.hh"
+#include "FbTk/SimpleObserver.hh"
 
 #include "AtomHandler.hh"
 #include "fluxbox.hh"
 #include "WinClient.hh"
 #include "Screen.hh"
 #include "ButtonTheme.hh"
-#include "SimpleObserver.hh"
 
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
@@ -180,10 +180,8 @@ SystemTray::SystemTray(const FbTk::FbWindow& parent,
     Display *disp = fluxbox->display();
 
     // setup atom name to _NET_SYSTEM_TRAY_S<screen number>
-    char intbuff[16];
-    sprintf(intbuff, "%d", m_window.screenNumber());
     string atom_name("_NET_SYSTEM_TRAY_S");
-    atom_name += intbuff; // append number
+    atom_name += FbTk::StringUtil::number2String(m_window.screenNumber());
 
     // get selection owner and see if it's free
     Atom tray_atom = XInternAtom(disp, atom_name.c_str(), False);
@@ -232,10 +230,8 @@ SystemTray::~SystemTray() {
     fluxbox->removeAtomHandler(m_handler.get());
     Display *disp = fluxbox->display();
     // setup atom name to _NET_SYSTEM_TRAY_S<screen number>
-    char intbuff[16];
-    sprintf(intbuff, "%d", m_window.screenNumber());
     string atom_name("_NET_SYSTEM_TRAY_S");
-    atom_name += intbuff; // append number
+    atom_name += FbTk::StringUtil::number2String(m_window.screenNumber());
 
     // get selection owner and see if it's free
     Atom tray_atom = XInternAtom(disp, atom_name.c_str(), False);