Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 2 insertions, 5 deletions

diff --git a/src/FbCommands.cc b/src/FbCommands.cc
index 3c69386..f050669 100644
--- a/src/FbCommands.cc
+++ b/src/FbCommands.cc
@@ -144,7 +144,6 @@ int ExecuteCmd::run() {
 
     string displaystring("DISPLAY=");
     displaystring += DisplayString(FbTk::App::instance()->display());
-    char intbuff[64];
     int screen_num = m_screen_num;
     if (screen_num < 0) {
         if (Fluxbox::instance()->mouseScreen() == 0)
@@ -153,8 +152,6 @@ int ExecuteCmd::run() {
             screen_num = Fluxbox::instance()->mouseScreen()->screenNumber();
     }
 
-    sprintf(intbuff, "%d", screen_num);
-
     // get shell path from the environment
     // this process exits immediately, so we don't have to worry about memleaks
     const char *shell = getenv("SHELL");
@@ -163,7 +160,7 @@ int ExecuteCmd::run() {
 
     // remove last number of display and add screen num
     displaystring.erase(displaystring.size()-1);
-    displaystring += intbuff;
+    displaystring += FbTk::StringUtil::number2String(screen_num);
 
     setsid();
     putenv(const_cast<char *>(displaystring.c_str()));
@@ -466,7 +463,7 @@ void SetResourceValueDialogCmd::execute() {
 
     FbTk::FbWindow *win = new CommandDialog(*screen,  "Type resource name and the value", "SetResourceValue ");
     win->show();
-};
+}
 
 REGISTER_UNTRUSTED_COMMAND_WITH_ARGS(bindkey, FbCommands::BindKeyCmd, void);