diff -urpN src.orig/icqdialogs.cc src/icqdialogs.cc --- src.orig/icqdialogs.cc 2005-01-21 20:37:33.797082840 +0100 +++ src/icqdialogs.cc 2005-01-21 20:37:48.351870176 +0100 @@ -100,7 +100,7 @@ bool icqface::sprofmanager(string &name, conf.getcolor(cp_dialog_selected))); db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), - conf.getcolor(cp_dialog_selected), _("Remove"), _("Load"), 0)); + conf.getcolor(cp_dialog_selected), _("Remove"), _("Load"), (char*)0)); db.addkey(KEY_DC, 0); @@ -209,17 +209,17 @@ bool icqface::finddialog(imsearchparams switch(subj) { case fsuser: db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), conf.getcolor(cp_dialog_selected), - _("lOad"), _("sAve"), _("cLear"), _("Change"), _("Search/Add"), 0)); + _("lOad"), _("sAve"), _("cLear"), _("Change"), _("Search/Add"), (char*)0)); break; case fschannel: db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), conf.getcolor(cp_dialog_selected), - _("cLear"), _("Change"), _("Join/Create"), 0)); + _("cLear"), _("Change"), _("Join/Create"), (char*)0)); break; case fsrss: db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), conf.getcolor(cp_dialog_selected), - _("cLear"), _("Change"), _("lInk"), 0)); + _("cLear"), _("Change"), _("lInk"), (char*)0)); break; } @@ -726,7 +726,7 @@ bool icqface::updatedetails(icqcontact * conf.getcolor(cp_dialog_text))); db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), - conf.getcolor(cp_dialog_selected), _("Change"), _("Done"), 0)); + conf.getcolor(cp_dialog_selected), _("Change"), _("Done"), (char*)0)); db.idle = &detailsidle; db.addautokeys(); @@ -1025,7 +1025,7 @@ bool icqface::sendfiles(const imcontact db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), conf.getcolor(cp_dialog_selected), - _("Add"), _("Remove"), _("Comment"), _("Send"), 0)); + _("Add"), _("Remove"), _("Comment"), _("Send"), (char*)0)); db.addkey(KEY_IC, 0); db.addkey(KEY_DC, 1); @@ -1162,7 +1162,7 @@ bool icqface::updateconf(icqconf::regsou conf.getcolor(cp_dialog_text))); db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), - conf.getcolor(cp_dialog_selected), _("Change"), _("Done"), 0)); + conf.getcolor(cp_dialog_selected), _("Change"), _("Done"), (char*)0)); db.idle = &dialogidle; db.addautokeys(); @@ -1553,7 +1553,7 @@ int icqface::groupmanager(const string & db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), conf.getcolor(cp_dialog_selected), _("Add"), _("Rename"), _("rEmove"), _("move Up"), _("move Down"), - sel ? _("Select") : _("Done"), 0)); + sel ? _("Select") : _("Done"), (char*)0)); db.addautokeys(); db.getbar()->item = 5; @@ -1674,7 +1674,7 @@ void icqface::transfermonitor() { conf.getcolor(cp_dialog_text))); db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), - conf.getcolor(cp_dialog_selected), _("Cancel"), _("Remove"), 0)); + conf.getcolor(cp_dialog_selected), _("Cancel"), _("Remove"), (char*)0)); db.getbar()->item = 1; db.addautokeys(); @@ -1886,7 +1886,7 @@ bool icqface::setljparams(imxmlevent *ev conf.getcolor(cp_dialog_text))); db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), conf.getcolor(cp_dialog_selected), - _("Change"), _("Detect music"), _("Post"), _("cAncel"), 0)); + _("Change"), _("Detect music"), _("Post"), _("cAncel"), (char*)0)); db.addautokeys(); db.idle = &dialogidle; diff -urpN src.orig/icqface.cc src/icqface.cc --- src.orig/icqface.cc 2005-01-21 20:37:33.799082536 +0100 +++ src/icqface.cc 2005-01-21 20:37:51.575380128 +0100 @@ -742,11 +742,11 @@ bool icqface::findresults(const imsearch if(!h.getCapabs().count(hookcapab::nochat)) { db.setbar(new horizontalbar(conf.getcolor(cp_main_highlight), conf.getcolor(cp_main_selected), _("Details"), _("Message"), - _("Add"), fauto ? 0 : _("New search"), 0)); + _("Add"), fauto ? 0 : _("New search"), (char*)0)); } else { db.setbar(new horizontalbar(conf.getcolor(cp_main_highlight), conf.getcolor(cp_main_selected), _("Details"), _("Add"), - fauto ? 0 : _("New search"), 0)); + fauto ? 0 : _("New search"), (char*)0)); } db.addautokeys(); @@ -1215,24 +1215,24 @@ void icqface::userinfo(const imcontact & if(c->inlist() && realinfo != contactroot) { db.setbar(new horizontalbar(sizeWArea.x1+2, sizeWArea.y2-1, conf.getcolor(cp_main_highlight), conf.getcolor(cp_main_selected), - _("Info"), _("About"), _("Check"), _("Edit"), islivejournal(c) ? _("LJ") : 0, 0)); + _("Info"), _("About"), _("Check"), _("Edit"), islivejournal(c) ? _("LJ") : 0, (char*)0)); } else { db.setbar(new horizontalbar(sizeWArea.x1+2, sizeWArea.y2-1, conf.getcolor(cp_main_highlight), conf.getcolor(cp_main_selected), - _("Info"), _("About"), _("Retreive"), 0)); + _("Info"), _("About"), _("Retreive"), (char*)0)); } } else if(cinfo.pname == livejournal) { db.setbar(new horizontalbar(sizeWArea.x1+2, sizeWArea.y2-1, conf.getcolor(cp_main_highlight), conf.getcolor(cp_main_selected), - _("Info"), _("Friend of"), 0)); + _("Info"), _("Friend of"), (char*)0)); } else { db.setbar(new horizontalbar(sizeWArea.x1+2, sizeWArea.y2-1, conf.getcolor(cp_main_highlight), conf.getcolor(cp_main_selected), _("Info"), _("Home"), _("Work"), _("More"), _("About"), - cinfo.pname != infocard ? _("Retrieve") : _("Edit"), 0)); + cinfo.pname != infocard ? _("Retrieve") : _("Edit"), (char*)0)); } @@ -1664,7 +1664,7 @@ void icqface::modelist(contactstatus cs) db.setbar(new horizontalbar(conf.getcolor(cp_main_highlight), conf.getcolor(cp_main_selected), - _("Details"), _("Add"), _("Remove"), _("Move to contacts"), 0)); + _("Details"), _("Add"), _("Remove"), _("Move to contacts"), (char*)0)); db.addautokeys(); db.idle = &dialogidle; @@ -2350,7 +2350,7 @@ bool icqface::eventedit(imevent &ev) { conf.getcolor(cp_main_selected))); db.setbar(new horizontalbar(conf.getcolor(cp_main_highlight), conf.getcolor(cp_main_selected), - _("Add"), _("Remove"), _("Send"), 0)); + _("Add"), _("Remove"), _("Send"), (char*)0)); db.addkey(KEY_IC, 0); db.addkey(KEY_DC, 1);