Safari_Al's patch which fixes inconsistent capitalization in some actions.

diff --git a/util/epist/actions.hh b/util/epist/actions.hh
index 6fdd48f0e9820e7407af7eef68cb3d899a97bde9..ac6d62b5f2c75b466d94fcb93212f05742f75d70 100644 (file)
--- a/util/epist/actions.hh
+++ b/util/epist/actions.hh
@@ -39,8 +39,8 @@ public:
     raise, //done
     lower, //done
     close, //done
-    toggleshade, //done
-    toggleomnipresent, //done
+    toggleShade, //done
+    toggleOmnipresent, //done
     moveWindowUp, //done
     moveWindowDown, //done
     moveWindowLeft, //done

diff --git a/util/epist/epistrc b/util/epist/epistrc
index ca3a82ba62a9c6232274ff9941500e2fc59e3805..04094ed299b046ea734ea6bf38ec90fbdf91c791 100644 (file)
--- a/util/epist/epistrc
+++ b/util/epist/epistrc
@@ -29,8 +29,8 @@ Control-Mod1-Shift-x {
     r raise;
     l lower;
     k close;
-    s toggleshade;
-    o toggleomnipresent;
+    s toggleShade;
+    o toggleOmnipresent;
 
     1 sendToWorkspace 1;
     2 sendToWorkspace 2;

diff --git a/util/epist/parser.cc b/util/epist/parser.cc
index d7ac2c13bd3a49eeab9e421c6b5101ea19482e91..7741d2f7c09eb57e73ba4b9b00c36f72a12693cc 100644 (file)
--- a/util/epist/parser.cc
+++ b/util/epist/parser.cc
@@ -68,8 +68,8 @@ void parser::setAction(string act)
     { "raise", Action::raise },
     { "lower", Action::lower },
     { "close", Action::close },
-    { "toggleshade", Action::toggleshade },
-    { "toggleomnipresent", Action::toggleomnipresent },
+    { "toggleShade", Action::toggleShade },
+    { "toggleOmnipresent", Action::toggleOmnipresent },
     { "movewindowup", Action::moveWindowUp },
     { "movewindowdown", Action::moveWindowDown },
     { "movewindowleft", Action::moveWindowLeft },

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index 0f8dfa5640ed58e7bcd020552a45c036b3bd329c..3ece9e169edc12720b1181ad9cf7975b59e4bedc 100644 (file)
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -294,7 +294,7 @@ void screen::handleKeypress(const XEvent &e) {
       window->sendTo(it->number());
       return;
 
-    case Action::toggleomnipresent:
+    case Action::toggleOmnipresent:
       if (window->desktop() == 0xffffffff)
         window->sendTo(_active_desktop);
       else
@@ -329,7 +329,7 @@ void screen::handleKeypress(const XEvent &e) {
       window->resizeRel(0, it->number());
       return;
       
-    case Action::toggleshade:
+    case Action::toggleShade:
       window->shade(! window->shaded());
       return;