aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authormarkt <markt>2007-07-03 22:56:46 (GMT)
committermarkt <markt>2007-07-03 22:56:46 (GMT)
commitae3c30423925960fe70262d1d7e4079b73531c37 (patch)
tree5fed3c090d9fd1af3833cfd6e81828781373e7be /src/Screen.cc
parent823ce0d0175b9b14a549117a303cc9e36e81c1a2 (diff)
downloadfluxbox_pavel-ae3c30423925960fe70262d1d7e4079b73531c37.zip
fluxbox_pavel-ae3c30423925960fe70262d1d7e4079b73531c37.tar.bz2
some security fixes for fluxbox-remote, and a minor change for the gvim fix
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 68f928b..dfa986e 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -326,6 +326,7 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
326 altscrname+".overlay.CapStyle"), 326 altscrname+".overlay.CapStyle"),
327 scroll_action(rm, "", scrname+".windowScrollAction", altscrname+".WindowScrollAction"), 327 scroll_action(rm, "", scrname+".windowScrollAction", altscrname+".WindowScrollAction"),
328 scroll_reverse(rm, false, scrname+".windowScrollReverse", altscrname+".WindowScrollReverse"), 328 scroll_reverse(rm, false, scrname+".windowScrollReverse", altscrname+".WindowScrollReverse"),
329 allow_remote_actions(rm, false, scrname+".allowRemoteActions", altscrname+".AllowRemoteActions"),
329 max_over_tabs(rm, false, scrname+".tabs.maxOver", altscrname+".Tabs.MaxOver"), 330 max_over_tabs(rm, false, scrname+".tabs.maxOver", altscrname+".Tabs.MaxOver"),
330 default_internal_tabs(rm, true /* TODO: autoconf option? */ , scrname+".tabs.intitlebar", altscrname+".Tabs.InTitlebar") { 331 default_internal_tabs(rm, true /* TODO: autoconf option? */ , scrname+".tabs.intitlebar", altscrname+".Tabs.InTitlebar") {
331 332
@@ -785,8 +786,8 @@ void BScreen::update(FbTk::Subject *subj) {
785 786
786void BScreen::propertyNotify(Atom atom) { 787void BScreen::propertyNotify(Atom atom) {
787 static Atom fbcmd_atom = XInternAtom(FbTk::App::instance()->display(), 788 static Atom fbcmd_atom = XInternAtom(FbTk::App::instance()->display(),
788 "_FLUXBOX_COMMAND", False); 789 "_FLUXBOX_ACTION", False);
789 if (atom == fbcmd_atom) { 790 if (allowRemoteActions() && atom == fbcmd_atom) {
790 Atom xa_ret_type; 791 Atom xa_ret_type;
791 int ret_format; 792 int ret_format;
792 unsigned long ret_nitems, ret_bytes_after; 793 unsigned long ret_nitems, ret_bytes_after;
@@ -803,7 +804,7 @@ void BScreen::propertyNotify(Atom atom) {
803 &ret_bytes_after, (unsigned char **)&str); 804 &ret_bytes_after, (unsigned char **)&str);
804 } 805 }
805 806
806 FbTk::RefCount<FbTk::Command> cmd(CommandParser::instance().parseLine(str)); 807 FbTk::RefCount<FbTk::Command> cmd(CommandParser::instance().parseLine(str, false));
807 if (cmd.get()) 808 if (cmd.get())
808 cmd->execute(); 809 cmd->execute();
809 XFree(str); 810 XFree(str);