K00L

diff --git a/daphne/includes.hpp b/daphne/includes.hpp
index cef2a294be50ddcbbe8180ce359f0a3bcf9f5a52..7d003e5af0c6919daf29d5c100e3b2216f463dcb 100644 (file)
--- a/daphne/includes.hpp
+++ b/daphne/includes.hpp
@@ -262,6 +262,7 @@ class CitMessage {
 public:
        CitMessage(CitClient *sock, wxString getmsg_cmd, wxString inRoom);
        wxString author;
+       wxString recipient;
        long timestamp;
        wxString room;
        wxString msgtext;

diff --git a/daphne/main.cpp b/daphne/main.cpp
index 3b487ab997715b382fb32f7171c7c06258edccca..11cd38f4195d05f65db4d51bfd526a656d448cf9 100644 (file)
--- a/daphne/main.cpp
+++ b/daphne/main.cpp
@@ -53,6 +53,7 @@ public:
        void GotoNewRoom(wxTreeEvent& event);
 private:
        void OnConnect(wxCommandEvent& event);
+       void OnGotoMail(wxCommandEvent& event);
        void OnTestWin(wxCommandEvent& event);
        void OnUsersMenu(wxCommandEvent& cmd);
        void OnRoomsMenu(wxCommandEvent& cmd);
@@ -83,7 +84,8 @@ enum
        UMENU_SEND_EXPRESS,
        RMENU_GOTO,
        BUTTON_DO_CMD,
-       ROOMTREE_DOUBLECLICK
+       ROOMTREE_DOUBLECLICK,
+       GOTO_MAIL
 };
 
 // ----------------------------------------------------------------------------
@@ -97,6 +99,7 @@ BEGIN_EVENT_TABLE(    MyFrame, wxMDIParentFrame)
        EVT_MENU(       IG_Quit,                MyFrame::OnQuit)
        EVT_MENU(       IG_About,               MyFrame::OnAbout)
        EVT_MENU(       MENU_CONNECT,           MyFrame::OnConnect)
+       EVT_MENU(       GOTO_MAIL,              MyFrame::OnGotoMail)
        EVT_MENU(       MENU_TESTWIN,           MyFrame::OnTestWin)
        EVT_MENU(       UMENU_WHO,              MyFrame::OnUsersMenu)
        EVT_MENU(       UMENU_SEND_EXPRESS,     MyFrame::OnUsersMenu)
@@ -247,7 +250,7 @@ void MyFrame::InitToolBar(wxToolBar* toolBar) {
                        
        toolBar->AddSeparator();
 
-       toolBar->AddTool(DO_NOTHING,
+       toolBar->AddTool(GOTO_MAIL,
                        *bitmaps[1],
                        wxNullBitmap,
                        FALSE,
@@ -338,6 +341,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnDoCmd(wxCommandEvent& whichbutton) {
 }
 
+
 void MyFrame::OnConnect(wxCommandEvent& unused) {
        int retval;
        wxString DefaultHost, DefaultPort;
@@ -362,6 +366,10 @@ void MyFrame::OnConnect(wxCommandEvent& unused) {
        }
 }
 
+void MyFrame::OnGotoMail(wxCommandEvent& unused) {
+       new RoomView(citadel, this, "_MAIL_");
+       }
+
 void MyFrame::OnTestWin(wxCommandEvent& unused) {
        new TestWindow(citadel, this);
 }

diff --git a/daphne/message.cpp b/daphne/message.cpp
index 86649f59c28890604a814960fe78f3fe76ec541a..9c9b968e50783e7586f4264ccbf82ea8ddb1803b 100644 (file)
--- a/daphne/message.cpp
+++ b/daphne/message.cpp
@@ -10,6 +10,7 @@ CitMessage::CitMessage(CitClient *sock, wxString getmsg_cmd, wxString inRoom) {
 
        room.Empty();
        author.Empty();
+       recipient.Empty();
        msgtext.Empty();
        timestamp = time(NULL);         // nb. this is Unix-specific
        format_type = 0;
@@ -32,6 +33,8 @@ CitMessage::CitMessage(CitClient *sock, wxString getmsg_cmd, wxString inRoom) {
                                in_text = TRUE;
                        else if (!key.CmpNoCase("from"))
                                author = buf.Mid(5);
+                       else if (!key.CmpNoCase("rcpt"))
+                               recipient = buf.Mid(5);
                        else if (!key.CmpNoCase("time"))
                                timestamp = atol(buf.Mid(5));
                        else if (!key.CmpNoCase("room"))

diff --git a/daphne/roomview.cpp b/daphne/roomview.cpp
index 09e217f235f8b706b13477e4f2efcc1c60c3773b..1e6c0fcab41483aca20e75cf311f1a3385fc9bff 100644 (file)
--- a/daphne/roomview.cpp
+++ b/daphne/roomview.cpp
@@ -223,9 +223,11 @@ void RoomView::do_readloop(wxString readcmd) {
                allmsgs += asctime(localtime(&message->timestamp));
                allmsgs += " from " + message->author;
                if (message->room.CmpNoCase(ThisRoom))
-                       allmsgs += " @ " + message->room;
+                       allmsgs += " in " + message->room + "> ";
                if (message->nodename.CmpNoCase(citsock->NodeName))
                        allmsgs += " @ " + message->nodename;
+               if (message->recipient.Length() > 0)
+                       allmsgs += " to " + message->recipient;
                allmsgs += "</font></em><br>";
                allmsgs += message->msgtext;