aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/fluxbox.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 41fd7bf..98ecbbe 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.132 2003/05/10 14:43:45 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.133 2003/05/10 15:22:28 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -1871,14 +1871,14 @@ void Fluxbox::load_rc() {
1871 1871
1872 if (dbfile.size() != 0) { 1872 if (dbfile.size() != 0) {
1873 if (!m_resourcemanager.load(dbfile.c_str())) { 1873 if (!m_resourcemanager.load(dbfile.c_str())) {
1874 cerr<<"Faild to load database:"<<dbfile<<endl; 1874 cerr<<"Failed to load database:"<<dbfile<<endl;
1875 cerr<<"Trying with: "<<DEFAULT_INITFILE<<endl; 1875 cerr<<"Trying with: "<<DEFAULT_INITFILE<<endl;
1876 if (!m_resourcemanager.load(DEFAULT_INITFILE)) 1876 if (!m_resourcemanager.load(DEFAULT_INITFILE))
1877 cerr<<"Faild to load database: "<<DEFAULT_INITFILE<<endl; 1877 cerr<<"Failed to load database: "<<DEFAULT_INITFILE<<endl;
1878 } 1878 }
1879 } else { 1879 } else {
1880 if (!m_resourcemanager.load(DEFAULT_INITFILE)) 1880 if (!m_resourcemanager.load(DEFAULT_INITFILE))
1881 cerr<<"Faild to load database: "<<DEFAULT_INITFILE<<endl; 1881 cerr<<"Failed to load database: "<<DEFAULT_INITFILE<<endl;
1882 } 1882 }
1883 1883
1884 XrmValue value; 1884 XrmValue value;
@@ -1943,7 +1943,7 @@ void Fluxbox::load_rc() {
1943 cerr<<__FILE__<<": Loading groups ("<<*m_rc_groupfile<<")"<<endl; 1943 cerr<<__FILE__<<": Loading groups ("<<*m_rc_groupfile<<")"<<endl;
1944#endif // DEBUG 1944#endif // DEBUG
1945 if (!Workspace::loadGroups(*m_rc_groupfile)) { 1945 if (!Workspace::loadGroups(*m_rc_groupfile)) {
1946 cerr<<"Faild to load groupfile: "<<*m_rc_groupfile<<endl; 1946 cerr<<"Failed to load groupfile: "<<*m_rc_groupfile<<endl;
1947 } 1947 }
1948} 1948}
1949 1949
@@ -1952,14 +1952,14 @@ void Fluxbox::load_rc(BScreen &screen) {
1952 string dbfile(getRcFilename()); 1952 string dbfile(getRcFilename());
1953 if (dbfile.size() != 0) { 1953 if (dbfile.size() != 0) {
1954 if (!m_screen_rm.load(dbfile.c_str())) { 1954 if (!m_screen_rm.load(dbfile.c_str())) {
1955 cerr<<"Faild to load database:"<<dbfile<<endl; 1955 cerr<<"Failed to load database:"<<dbfile<<endl;
1956 cerr<<"Trying with: "<<DEFAULT_INITFILE<<endl; 1956 cerr<<"Trying with: "<<DEFAULT_INITFILE<<endl;
1957 if (!m_screen_rm.load(DEFAULT_INITFILE)) 1957 if (!m_screen_rm.load(DEFAULT_INITFILE))
1958 cerr<<"Faild to load database: "<<DEFAULT_INITFILE<<endl; 1958 cerr<<"Failed to load database: "<<DEFAULT_INITFILE<<endl;
1959 } 1959 }
1960 } else { 1960 } else {
1961 if (!m_screen_rm.load(DEFAULT_INITFILE)) 1961 if (!m_screen_rm.load(DEFAULT_INITFILE))
1962 cerr<<"Faild to load database: "<<DEFAULT_INITFILE<<endl; 1962 cerr<<"Failed to load database: "<<DEFAULT_INITFILE<<endl;
1963 } 1963 }
1964 1964
1965 XrmDatabaseHelper database; 1965 XrmDatabaseHelper database;