Ticket #25: 0001_handle_login_errors.patch

diff --git a/po/ko.po b/po/ko.po
index 6480e8c..0bff5b2 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin-nateon\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-26 16:48+0900\n"
+"POT-Creation-Date: 2008-03-19 14:21+0900\n"
 "PO-Revision-Date: 2008-03-06 17:24+0900\n"
 "Last-Translator: Hansun Lee <hansun.lee@gmail.com>\n"
 "Language-Team: Hansun Lee <hansun.lee@gmail.com>\n"
@@ -23,13 +23,22 @@ msgstr "%s (%s) 에서 친구 목록의 동Ʞ가 발생했습니닀."
 
 #: ../src/dialog.c:118
 #, c-format
-msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
-msgstr "로컬 친구 목록에 Ʞ록되얎 있는 %s 님은 귞룹 \"%s\" 에 소속되얎 있윌나, 서버 상의 목록에서는 ê·žë ‡ê²Œ 되얎 있지 않습니닀. 서버 상의 목록에 ê·ž 친구륌 ì¶”ê°€í•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"로컬 친구 목록에 Ʞ록되얎 있는 %s 님은 귞룹 \"%s\" 에 소속되얎 있윌나, 서버 "
+"상의 목록에서는 ê·žë ‡ê²Œ 되얎 있지 않습니닀. 서버 상의 목록에 ê·ž 친구륌 추가하"
+"ì‹œê² ìŠµë‹ˆê¹Œ?"
 
 #: ../src/dialog.c:126
 #, c-format
-msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
-msgstr "로컬 친구 목록에 êž°ìˆ ë˜ì–Ž 있는 %s 님은 서버 상의 목록에 졎재하지 않습니닀. 서버 상의 목록에 ê·ž 친구륌 ì¶”ê°€í•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"로컬 친구 목록에 êž°ìˆ ë˜ì–Ž 있는 %s 님은 서버 상의 목록에 졎재하지 않습니닀. 서"
+"버 상의 목록에 ê·ž 친구륌 ì¶”ê°€í•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
 
 #: ../src/dialog.c:135
 msgid "Yes"
@@ -51,92 +60,88 @@ msgid "NATEON Error: %s\n"
 msgstr "넀읎튞옚 였류: %s\n"
 
 # nateon message
-#: ../src/nateon.c:138
+#: ../src/nateon.c:139
 msgid "Your new NateOn friendly name is too long."
 msgstr "새 넀읎튞옚의 공개명읎 너묎 깁니닀."
 
 # nateon message
-#: ../src/nateon.c:333
+#: ../src/nateon.c:334
 msgid "Set your friendly name."
 msgstr "공개명을 ì„€ì •í•Ž 죌십시였."
 
 # nateon message
-#: ../src/nateon.c:334
+#: ../src/nateon.c:335
 msgid "This is the name that other NATEON buddies will see you as."
 msgstr "넀읎튞옚의 닀륞 친구가 나륌 볌 때 표시되는 읎늄입니닀."
 
-#: ../src/nateon.c:337
-#: ../src/nateon.c:355
+#: ../src/nateon.c:338 ../src/nateon.c:356
 msgid "OK"
 msgstr "확읞"
 
-#: ../src/nateon.c:338
-#: ../src/nateon.c:356
+#: ../src/nateon.c:339 ../src/nateon.c:357
 msgid "Cancel"
 msgstr "췚소"
 
-#: ../src/nateon.c:352
-#: ../src/nateon.c:353
+#: ../src/nateon.c:353 ../src/nateon.c:354
 msgid "View Buddies By."
 msgstr "친구 볎Ʞ 방식"
 
-#: ../src/nateon.c:359
-#: ../src/nateon.c:737
+#: ../src/nateon.c:360 ../src/nateon.c:753
 msgid "Name"
 msgstr "읎늄"
 
 # nateon message
-#: ../src/nateon.c:360
+#: ../src/nateon.c:361
 msgid "Screen Name"
 msgstr "대화명"
 
-#: ../src/nateon.c:361
+#: ../src/nateon.c:362
 msgid "Name and ID"
 msgstr "읎늄+아읎디"
 
-#: ../src/nateon.c:362
+#: ../src/nateon.c:363
 msgid "Name and Screen Name"
 msgstr "읎늄+대화명"
 
-#: ../src/nateon.c:532
+#: ../src/nateon.c:533
 msgid "_Send"
 msgstr "볎낎Ʞ(_S)"
 
-#: ../src/nateon.c:533
+#: ../src/nateon.c:534
 msgid "Close"
 msgstr "ë‹«êž°"
 
-#: ../src/nateon.c:742
+#: ../src/nateon.c:758
 msgid "Status"
 msgstr "상태"
 
-#: ../src/nateon.c:742
+#: ../src/nateon.c:758
 msgid "Idle"
 msgstr "대Ʞ 상태"
 
-#: ../src/nateon.c:776
+#: ../src/nateon.c:792
 msgid "Busy"
 msgstr "닀륞 용묎 쀑입니닀."
 
-#: ../src/nateon.c:780
+#: ../src/nateon.c:796
 msgid "On The Phone"
 msgstr "ì „í™” 쀑입니닀."
 
 # nateon message
-#: ../src/nateon.c:784
+#: ../src/nateon.c:800
 msgid "In meeting"
 msgstr "회의 쀑입니닀"
 
-#: ../src/nateon.c:808
+#: ../src/nateon.c:824
 msgid "Set Friendly Name..."
 msgstr "공개명 ì„€ì •..."
 
-#: ../src/nateon.c:812
+#: ../src/nateon.c:828
 msgid "View Buddies By..."
 msgstr "친구 볎Ʞ 방식..."
 
 # nateon message
-#: ../src/nateon.c:816
+#: ../src/nateon.c:832
 msgid "Send SMS message..."
 msgstr "SMS 메시지 ì „ì†¡..."
 
@@ -149,25 +154,25 @@ msgstr "SMS 메시지 ì „ì†¡..."
 #. m = g_list_append(m, act);
 #. }
 #.
-#: ../src/nateon.c:882
+#: ../src/nateon.c:898
 msgid "Send memo"
 msgstr "쪜지 ì „ì†¡"
 
 # nateon message
-#: ../src/nateon.c:885
+#: ../src/nateon.c:901
 msgid "Send SMS message"
 msgstr "SMS 메섞지 ì „ì†¡"
 
 # nateon message
-#: ../src/nateon.c:899
+#: ../src/nateon.c:915
 msgid "Copy buddy"
 msgstr "친구 복사"
 
-#: ../src/nateon.c:906
+#: ../src/nateon.c:922
 msgid "Initiate _Chat"
 msgstr "대화 시작(_C)"
 
-#: ../src/nateon.c:971
+#: ../src/nateon.c:987
 msgid "Failed to connect to server."
 msgstr "서버 ì ‘ì†ì— 싀팚했습니닀."
 
@@ -182,35 +187,55 @@ msgstr "서버 ì ‘ì†ì— 싀팚했습니닀."
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/nateon.c:2320
-#: ../src/nateon.c:2322
+#: ../src/nateon.c:2343 ../src/nateon.c:2345
 msgid "NateOn Protocol Plugin"
 msgstr "넀읎튞옚 í”„ë¡œí† ìœœ 플러귞읞"
 
-#: ../src/nateon.c:2352
+#: ../src/nateon.c:2375
 msgid "Server"
 msgstr "서버"
 
-#: ../src/nateon.c:2357
+#: ../src/nateon.c:2380
 msgid "Port"
 msgstr "포튞 번혞"
 
-#: ../src/notification.c:207
+#: ../src/notification.c:208
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s 은(는) 올바은 귞룹읎 아닙니닀."
 
-#: ../src/notification.c:212
-#: ../src/session.c:340
+#: ../src/notification.c:213 ../src/session.c:340
 msgid "Unknown error."
 msgstr "알 수 없는 였류입니닀."
 
-#: ../src/notification.c:215
+#: ../src/notification.c:216
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%2$s (%3$s) 의 %1$s"
 
-#: ../src/notification.c:1058
+#: ../src/notification.c:419
+msgid "ID does not exist. Please verify and retry."
+msgstr "졎재하지 않는 아읎디입니닀. 확읞 후 닀시 시도핎 죌십시였."
+
+#: ../src/notification.c:423
+msgid "Wrong password. Please verify and retry."
+msgstr "비밀번혞가 í‹€ë žìŠµë‹ˆë‹€. 확읞 후 닀시 시도핎 죌십시였."
+
+#: ../src/notification.c:427
+msgid "Already logged in."
+msgstr "읎믞 로귞읞읎 되있습니닀."
+
+#: ../src/notification.c:431
+msgid "Connection is poor. Please retry connecting."
+msgstr "ì ‘ì†ìŽ 원활하지 못합니닀. ì ‘ì†ì„ 닀시 시도 바랍니닀."
+
+#: ../src/notification.c:435
+msgid "Nateon server is under maintenance. Please wait and try again."
+msgstr ""
+"서버작업윌로 넀읎튞옚 ì ‘ì† í•  수 없습니닀.  닀음에 닀시 ì ‘ì†ì„ 시도핎 죌십시"
+"였."
+
+#: ../src/notification.c:1099
 msgid "Unable to rename group"
 msgstr "귞룹명을 ë³€ê²œí•  수 없습니닀."
 
@@ -226,8 +251,7 @@ msgstr "쓰는 쀑 였류"
 msgid "Reading error"
 msgstr "읜는 쀑 였류"
 
-#: ../src/servconn.c:133
-#: ../src/session.c:332
+#: ../src/servconn.c:133 ../src/session.c:332
 msgid "Unknown error"
 msgstr "알 수 없는 였류"
 
@@ -253,8 +277,7 @@ msgstr "ìžìŠí•  수 없습니닀: %s"
 msgid "Connecting"
 msgstr "ì ‘ì† 쀑입니닀."
 
-#: ../src/session.c:356
-#: ../src/session.c:358
+#: ../src/session.c:356 ../src/session.c:358
 msgid "Handshaking"
 msgstr "í†µì‹ ì— ì ‘ì† 쀑입니닀."
 
@@ -300,4 +323,3 @@ msgstr "\"%s\" 님을 ì¶”ê°€í•  수 없습니닀."
 #: ../src/userlist.c:685
 msgid "The screen name specified is invalid."
 msgstr "ì§€ì •í•œ 아읎디가 잘못되었습니닀."
-
diff --git a/src/notification.c b/src/notification.c
index 4376b72..2f5b598 100644
--- a/src/notification.c
+++ b/src/notification.c
@@ -408,6 +408,39 @@ static void lsin_cmd(NateonCmdProc *cmdproc, NateonCommand *cmd)
        nateon_cmdproc_send(cmdproc, "GLST", NULL);
 }
 
+static void
+lsin_error(NateonCmdProc *cmdproc, NateonTransaction *trans, int error)
+{
+       purple_debug_info("nateon", "%s: ERROR:%d\n", __FUNCTION__, error);
+       switch (error)
+       {
+               case 300:
+                       nateon_session_set_error(cmdproc->session, NATEON_ERROR_AUTH,
+                                       _("ID does not exist. Please verify and retry."));
+                       break;
+               case 301:
+                       nateon_session_set_error(cmdproc->session, NATEON_ERROR_AUTH,
+                                       _("Wrong password. Please verify and retry."));
+                       break;
+               case 302:
+                       nateon_session_set_error(cmdproc->session, NATEON_ERROR_AUTH,
+                                       _("Already logged in."));
+                       break;
+               case 306:
+                       nateon_session_set_error(cmdproc->session, NATEON_ERROR_SERVCONN,
+                                       _("Connection is poor. Please retry connecting."));
+                       break;
+               case 421:
+                       nateon_session_set_error(cmdproc->session, NATEON_ERROR_AUTH,
+                                       _("Nateon server is under maintenance. Please wait and try again."));
+                       break;
+               default:
+                       purple_debug_info("nateon", "%s: Unknown Error %d\n", __FUNCTION__, error);
+                       nateon_session_set_error(cmdproc->session, NATEON_ERROR_UNKNOWN, NULL);
+                       break;
+       }
+}
+
 static void infy_cmd(NateonCmdProc *cmdproc, NateonCommand *cmd)
 {
        NateonSession *session = cmdproc->session;
@@ -1871,6 +1904,7 @@ nateon_notification_init(void)
 //     nateon_table_add_cmd(cbs_table, "fallback", "XFR", xfr_cmd);
 //
        nateon_table_add_error(cbs_table, "RENG", reng_error);
+       nateon_table_add_error(cbs_table, "LSIN", lsin_error);
 //     nateon_table_add_error(cbs_table, "ADD", add_error);
 //     nateon_table_add_error(cbs_table, "REG", reg_error);
 //     nateon_table_add_error(cbs_table, "RMG", rmg_error);
diff --git a/src/session.c b/src/session.c
index 9dfa5b8..6d5caae 100644
--- a/src/session.c
+++ b/src/session.c
@@ -303,9 +303,9 @@ nateon_session_set_error(NateonSession *session, NateonErrorType error,
 
        switch (error)
        {
-//             case NATEON_ERROR_SERVCONN:
-//                     msg = g_strdup(info);
-//                     break;
+               case NATEON_ERROR_SERVCONN:
+                       msg = g_strdup(info);
+                       break;
 //             case NATEON_ERROR_UNSUPPORTED_PROTOCOL:
 //                     msg = g_strdup(_("Our protocol is not supported by the "
 //                                                      "server."));
diff --git a/src/session.h b/src/session.h
index 4fd73f4..bb4b92d 100644
--- a/src/session.h
+++ b/src/session.h
@@ -54,7 +54,8 @@ typedef enum
        NATEON_ERROR_BAD_BLIST,
        NATEON_ERROR_SIGN_OTHER,
        NATEON_ERROR_SERV_DOWN,
-       NATEON_ERROR_SERV_UNAVAILABLE
+       NATEON_ERROR_SERV_UNAVAILABLE,
+       NATEON_ERROR_UNKNOWN
 
 } NateonErrorType;