Add contents of LDFLAGS in addition to CXXFLAGS

[user/henk/code/inspircd.git] / include / u_listmode.h

diff --git a/include/u_listmode.h b/include/u_listmode.h
index 88b5fb3eea17c66a4643903147af900f1a9da925..eb3cf18b7e2694c4c9d3ecae59792a2735fad226 100644 (file)
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -217,12 +217,9 @@ class ListModeBase : public ModeHandler
 
                        while (modestack.GetStackedLine(stackresult))
                        {
-                               for (size_t j = 0; j < stackresult.size(); j++)
-                               {
-                                       mode_junk.push_back(stackresult[j]);
-                               }
-
+                               mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end());
                                ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
+                               mode_junk.erase(mode_junk.begin() + 1, mode_junk.end());
                        }
                }
        }
@@ -423,21 +420,19 @@ class ListModeBase : public ModeHandler
                chan->GetExt(infokey, mlist);
                irc::modestacker modestack(ServerInstance, true);
                std::deque<std::string> stackresult;
-               std::vector<TranslateType> types;
+               std::deque<TranslateType> types;
                types.push_back(TR_TEXT);
                if (mlist)
                {
                        for (modelist::iterator it = mlist->begin(); it != mlist->end(); it++)
                        {
                                modestack.Push(std::string(1, mode)[0], it->mask);
-                               types.push_back(this->GetTranslateType());
                        }
                }
                while (modestack.GetStackedLine(stackresult))
                {
-                       irc::stringjoiner mode_join(" ", stackresult, 0, stackresult.size() - 1);
-                       std::string line = mode_join.GetJoined();
-                       proto->ProtoSendMode(opaque, TYPE_CHANNEL, chan, line, types);
+                       types.assign(stackresult.size(), this->GetTranslateType());
+                       proto->ProtoSendMode(opaque, TYPE_CHANNEL, chan, stackresult, types);
                }
        }