mcabber: mcabber/src/commands.c comparison

comparison mcabber/src/commands.c @ 681:8dc602a246a4

Improve messages in commands.c

author	Philip M. White <pmw@qnan.org>
date	Sun, 29 Jan 2006 12:00:04 +0100
parents	633a0522bd37
children	e98abd3ce28c

comparison

equal deleted inserted replaced

-:1f8987e0e56c
+:8dc602a246a4
 cmd_add("connect", "Connect to the server", 0, 0, &do_connect);
 cmd_add("del", "Delete the current buddy", 0, 0, &do_del);
 cmd_add("disconnect", "Disconnect from server", 0, 0, &do_disconnect);
 cmd_add("group", "Change group display settings", COMPL_GROUP, 0, &do_group);
 //cmd_add("help", "Display some help", COMPL_CMD, 0, NULL);
-cmd_add("info", "Show basic infos on current buddy", 0, 0, &do_info);
+cmd_add("info", "Show basic info on current buddy", 0, 0, &do_info);
 cmd_add("move", "Move the current buddy to another group", COMPL_GROUPNAME,
 0, &do_move);
 cmd_add("msay", "Send a multi-lines message to the selected buddy",
 COMPL_MULTILINE, 0, &do_msay);
 cmd_add("room", "MUC actions command", COMPL_ROOM, 0, &do_room);
 static void send_message(const char *msg)
 {
 const char *jid;
 if (!jb_getonline()) {
-scr_LogPrint(LPRINT_NORMAL, "You are not connected");
+scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
 if (!current_buddy) {
-scr_LogPrint(LPRINT_NORMAL, "No buddy currently selected.");
+scr_LogPrint(LPRINT_NORMAL, "No buddy is currently selected.");
 return;
 }
 jid = CURRENT_JID;
 if (!jid) {
-scr_LogPrint(LPRINT_NORMAL, "No buddy currently selected.");
+scr_LogPrint(LPRINT_NORMAL, "No buddy is currently selected.");
 return;
 }
 if (buddy_gettype(BUDDATA(current_buddy)) != ROSTER_TYPE_ROOM) {
 // local part (UI, logging, etc.)
 // Commands handling
 curcmd = cmd_get(xpline);
 if (!curcmd) {
-scr_LogPrint(LPRINT_NORMAL, "Unrecognized command, sorry.");
+scr_LogPrint(LPRINT_NORMAL, "Unrecognized command.  "
+"Please see the manual for a list of known commands.");
 if (xpline != line) g_free(xpline);
 return 0;
 }
 if (!curcmd->func) {
-scr_LogPrint(LPRINT_NORMAL, "Not yet implemented, sorry.");
+scr_LogPrint(LPRINT_NORMAL,
+"This functionality is not yet implemented, sorry.");
 if (xpline != line) g_free(xpline);
 return 0;
 }
 // Lets go to the command parameters
 for (p = xpline+1; *p && (*p != ' ') ; p++)
 return;
 }
 while (*string == ' ')
 string++;
 if (!*string) {
-scr_LogPrint(LPRINT_NORMAL, "What name or jid are you looking for?");
+scr_LogPrint(LPRINT_NORMAL, "What name or JID are you looking for?");
 return;
 }
 scr_RosterSearch(string);
 update_roster = TRUE;
 } else if (!strcasecmp(arg, "up")) {
 char *status;
 char *msg;
 enum imstatus st;
 if (!jb_getonline()) {
-scr_LogPrint(LPRINT_NORMAL, "You are not connected");
+scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
 paramlst = split_arg(arg, 2, 0); // status, message
 status = *paramlst;
 jid = *paramlst;
 st = *(paramlst+1);
 msg = *(paramlst+2);
 if (!jid || !st) {
-scr_LogPrint(LPRINT_NORMAL, "Wrong usage");
+scr_LogPrint(LPRINT_NORMAL,
+"Please specify both a Jabber ID and a status.");
 free_arg_lst(paramlst);
 return;
 }
 // Allow things like /status_to "" away
 jid = NULL;
 if (jid) {
 // The JID has been specified.  Quick check...
 if (check_jid_syntax(jid)) {
-scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber id", jid);
+scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber ID.", jid);
 jid = NULL;
 } else {
 mc_strtolower(jid);
 }
 } else {
 // Add the current buddy
 if (current_buddy)
 jid = (char*)buddy_getjid(BUDDATA(current_buddy));
 if (!jid)
-scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber id");
+scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID.");
 }
 if (jid) {
 char *cmd;
 if (!msg)
 {
 char **paramlst;
 char *id, *nick;
 if (!jb_getonline()) {
-scr_LogPrint(LPRINT_NORMAL, "You are not connected");
+scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
 paramlst = split_arg(arg, 2, 0); // jid, [nickname]
 id = *paramlst;
 id = NULL;
 if (id) {
 // The JID has been specified.  Quick check...
 if (check_jid_syntax(id)) {
-scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber id", id);
+scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber ID.", id);
 id = NULL;
 } else {
 mc_strtolower(id);
 }
 } else {
 // Add the current buddy
 if (current_buddy)
 id = (char*)buddy_getjid(BUDDATA(current_buddy));
 if (!id)
-scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber id");
+scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID.");
 }
 if (id) {
 // 2nd parameter = optional nickname
 jb_addbuddy(id, nick, NULL);
-scr_LogPrint(LPRINT_LOGNORM, "Sent presence notification request to <%s>",
+scr_LogPrint(LPRINT_LOGNORM, "Sent presence notification request to <%s>.",
 id);
 }
 free_arg_lst(paramlst);
 }
 static void do_del(char *arg)
 {
 const char *jid;
 if (*arg) {
-scr_LogPrint(LPRINT_NORMAL, "Wrong usage");
+scr_LogPrint(LPRINT_NORMAL, "This action does not require a parameter; "
+"the currently-selected buddy will be deleted.");
 return;
 }
 if (!current_buddy) return;
 jid = buddy_getjid(BUDDATA(current_buddy));
 {
 gpointer group;
 guint leave_windowbuddy;
 if (!*arg) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+scr_LogPrint(LPRINT_NORMAL, "Missing parameter.");
 return;
 }
 if (!current_buddy) return;
 // entry itself, because it means we'll have to leave the current buddy
 // chat window.
 leave_windowbuddy = (group != BUDDATA(current_buddy));
 if (!(buddy_gettype(group) & ROSTER_TYPE_GROUP)) {
-scr_LogPrint(LPRINT_NORMAL, "You need to select a group");
+scr_LogPrint(LPRINT_NORMAL, "You need to select a group.");
 return;
 }
 if (!strcasecmp(arg, "expand") || !strcasecmp(arg, "unfold")) {
 buddy_setflags(group, ROSTER_FLAG_HIDE, FALSE);
 static int send_message_to(const char *jid, const char *msg)
 {
 char *bare_jid, *rp;
 if (!jid || !*jid) {
-scr_LogPrint(LPRINT_NORMAL, "JID is missing");
+scr_LogPrint(LPRINT_NORMAL, "You must specify a Jabber ID.");
 return 1;
 }
 if (!msg || !*msg) {
-scr_LogPrint(LPRINT_NORMAL, "Message is missing");
+scr_LogPrint(LPRINT_NORMAL, "You must specify a message.");
 return 1;
 }
 if (check_jid_syntax((char*)jid)) {
-scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber id", jid);
+scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber ID.", jid);
 return 1;
 }
 // We must use the bare jid in hk_message_out()
 rp = strchr(jid, '/');
 gpointer bud;
 scr_set_chatmode(TRUE);
 if (!current_buddy) {
-scr_LogPrint(LPRINT_NORMAL, "Who are you talking to??");
+scr_LogPrint(LPRINT_NORMAL,
+"Whom are you talking to?  Please select a buddy.");
 return;
 }
 bud = BUDDATA(current_buddy);
 if (!(buddy_gettype(bud) &
 (ROSTER_TYPE_USER|ROSTER_TYPE_AGENT|ROSTER_TYPE_ROOM))) {
-scr_LogPrint(LPRINT_NORMAL, "This is not a user");
+scr_LogPrint(LPRINT_NORMAL, "This is not a user.");
 return;
 }
 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE);
 send_message(arg);
 paramlst = split_arg(arg, 2, 1); // subcmd, arg
 subcmd = *paramlst;
 arg = *(paramlst+1);
 if (!subcmd || !*subcmd) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+scr_LogPrint(LPRINT_NORMAL, "Missing parameter.");
 scr_LogPrint(LPRINT_NORMAL, "Please read the manual before using "
 "the /msay command.");
 scr_LogPrint(LPRINT_NORMAL, "(Use \"/msay begin\" to enter "
 "multi-line mode...)");
 free_arg_lst(paramlst);
 return;
 }
 if (!strcasecmp(subcmd, "abort")) {
 if (scr_get_multimode())
-scr_LogPrint(LPRINT_NORMAL, "Leaving multi-line message mode");
+scr_LogPrint(LPRINT_NORMAL, "Leaving multi-line message mode.");
 scr_set_multimode(FALSE);
 return;
 } else if ((!strcasecmp(subcmd, "begin")) ||
 (!strcasecmp(subcmd, "verbatim"))) {
 if (!strcasecmp(subcmd, "verbatim"))
 return;
 } else { // Send to currently selected buddy
 gpointer bud;
 if (!current_buddy) {
-scr_LogPrint(LPRINT_NORMAL, "Who are you talking to??");
+scr_LogPrint(LPRINT_NORMAL, "Whom are you talking to?");
 return;
 }
 bud = BUDDATA(current_buddy);
 if (!(buddy_gettype(bud) & (ROSTER_TYPE_USER|ROSTER_TYPE_ROOM))) {
-scr_LogPrint(LPRINT_NORMAL, "This is not a user");
+scr_LogPrint(LPRINT_NORMAL, "This is not a user.");
 return;
 }
 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE);
 send_message(scr_get_multiline());
 {
 char **paramlst;
 char *jid, *msg;
 if (!jb_getonline()) {
-scr_LogPrint(LPRINT_NORMAL, "You are not connected");
+scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
 paramlst = split_arg(arg, 2, 1); // jid, message
 jid = *paramlst;
 msg = *(paramlst+1);
 if (!jid) {
-scr_LogPrint(LPRINT_NORMAL, "Wrong usage");
+scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID.");
 free_arg_lst(paramlst);
 return;
 }
 send_message_to(jid, msg);
 }
 static void buffer_search(int direction, char *arg)
 {
 if (!arg || !*arg) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+scr_LogPrint(LPRINT_NORMAL, "Missing parameter.");
 return;
 }
 scr_BufferSearch(direction, arg);
 }
 static void buffer_date(char *date)
 {
 time_t t;
 if (!date || !*date) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+scr_LogPrint(LPRINT_NORMAL, "Missing parameter.");
 return;
 }
 strip_arg_special_chars(date);
 t = from_iso8601(date, 0);
 if (t)
 scr_BufferDate(t);
 else
-scr_LogPrint(LPRINT_NORMAL, "Wrong parameter");
+scr_LogPrint(LPRINT_NORMAL, "The date you specified is "
+"not correctly formatted or invalid.");
 }
 static void buffer_percent(char *arg1, char *arg2)
 {
 // Basically, user has typed "%arg1 arg2"
 // "%50"  -> arg1 = 50, arg2 null pointer
 // "% 50" -> arg1 = \0, arg2 = 50
 if (!*arg1 && (!arg2 || !*arg2)) { // No value
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+scr_LogPrint(LPRINT_NORMAL, "Missing parameter.");
 return;
 }
 if (*arg1 && arg2 && *arg2) {     // Two values
-scr_LogPrint(LPRINT_NORMAL, "Wrong parameters");
+scr_LogPrint(LPRINT_NORMAL, "Wrong parameters.");
 return;
 }
 scr_BufferPercent(atoi((*arg1 ? arg1 : arg2)));
 }
 char *subcmd;
 if (!current_buddy) return;
 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_GROUP) {
-scr_LogPrint(LPRINT_NORMAL, "Groups have no buffer");
+scr_LogPrint(LPRINT_NORMAL, "Groups have no buffer.");
 return;
 }
 paramlst = split_arg(arg, 2, 1); // subcmd, arg
 subcmd = *paramlst;
 arg = *(paramlst+1);
 if (!subcmd || !*subcmd) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+scr_LogPrint(LPRINT_NORMAL, "Missing parameter.");
 free_arg_lst(paramlst);
 return;
 }
 if (!strcasecmp(subcmd, "top")) {
 const char *jid;
 char *buffer;
 GSList *resources;
 if (*arg) {
-scr_LogPrint(LPRINT_NORMAL, "Unknown parameter");
+scr_LogPrint(LPRINT_NORMAL, "This action does not require a parameter.");
 return;
 }
 // Enter chat mode
 scr_set_chatmode(TRUE);
 const char *jid, *group;
 guint type;
 char *newname, *p;
 if (!*arg) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID to rename.");
 return;
 }
 if (!current_buddy) return;
 bud = BUDDATA(current_buddy);
 jid   = buddy_getjid(bud);
 group = buddy_getgroupname(bud);
 type  = buddy_gettype(bud);
 if (type & ROSTER_TYPE_GROUP) {
-scr_LogPrint(LPRINT_NORMAL, "You can't rename groups");
+scr_LogPrint(LPRINT_NORMAL, "You can't rename groups.");
 return;
 }
 newname = g_strdup(arg);
 // Remove trailing space
 guint assign;
 const gchar *option, *value;
 assign = parse_assigment(arg, &option, &value);
 if (!option) {
-scr_LogPrint(LPRINT_NORMAL, "Huh?");
+scr_LogPrint(LPRINT_NORMAL, "Set what option?");
 return;
 }
 if (!assign) {
 // This is a query
 value = settings_opt_get(option);
 guint assign;
 const gchar *alias, *value;
 assign = parse_assigment(arg, &alias, &value);
 if (!alias) {
-scr_LogPrint(LPRINT_NORMAL, "Huh?");
+scr_LogPrint(LPRINT_NORMAL, "Alias what?");
 return;
 }
 if (!assign) {
 // This is a query
 value = settings_get(SETTINGS_TYPE_ALIAS, alias);
 guint assign;
 const gchar *keycode, *value;
 assign = parse_assigment(arg, &keycode, &value);
 if (!keycode) {
-scr_LogPrint(LPRINT_NORMAL, "Huh?");
+scr_LogPrint(LPRINT_NORMAL, "Bind what keycode?");
 return;
 }
 if (!assign) {
 // This is a query
 value = settings_get(SETTINGS_TYPE_BINDING, keycode);
 if (value) {
 scr_LogPrint(LPRINT_NORMAL, "Key %s is bound to: %s", keycode, value);
 } else
-scr_LogPrint(LPRINT_NORMAL, "Key %s is not bound", keycode);
+scr_LogPrint(LPRINT_NORMAL, "Key %s is not bound.", keycode);
 return;
 }
 // Update the key binding
 if (!value)
 settings_del(SETTINGS_TYPE_BINDING, keycode);
 {
 char **paramlst;
 char *subcmd;
 if (!jb_getonline()) {
-scr_LogPrint(LPRINT_NORMAL, "You are not connected");
+scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
 paramlst = split_arg(arg, 2, 1); // subcmd, arg
 subcmd = *paramlst;
 if (!strcasecmp(subcmd, "send"))  {
 gchar *buffer;
 if (!subcmd || !*subcmd) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+scr_LogPrint(LPRINT_NORMAL, "Missing parameter.");
 free_arg_lst(paramlst);
 return;
 }
 // We don't strip_arg_special_chars() here, because it would be a pain for
 if (buffer) {
 scr_LogPrint(LPRINT_NORMAL, "Sending XML string");
 jb_send_raw(buffer);
 g_free(buffer);
 } else {
-scr_LogPrint(LPRINT_NORMAL, "Conversion error in XML string");
+scr_LogPrint(LPRINT_NORMAL, "Conversion error in XML string.");
 }
 } else {
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");
 }
 static char *check_room_subcommand(char *arg, bool param_needed,
 gpointer buddy_must_be_a_room)
 {
 if (buddy_must_be_a_room &&
 !(buddy_gettype(buddy_must_be_a_room) & ROSTER_TYPE_ROOM)) {
-scr_LogPrint(LPRINT_NORMAL, "This isn't a chatroom");
+scr_LogPrint(LPRINT_NORMAL, "This isn't a conference room.");
 return NULL;
 }
 if (param_needed) {
 if (!arg) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+scr_LogPrint(LPRINT_NORMAL, "Missing parameter.");
 return NULL;
 }
 }
 if (arg)
 roomname = *paramlst;
 nick = *(paramlst+1);
 if (!roomname || strchr(roomname, '/')) {
-scr_LogPrint(LPRINT_NORMAL, "Invalid room name");
+scr_LogPrint(LPRINT_NORMAL, "Invalid room name.");
 free_arg_lst(paramlst);
 return;
 }
 // If no nickname is provided with the /join command,
 }
 }
 }
 // If we still have no nickname, give up
 if (!nick || !*nick) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter (nickname)");
+scr_LogPrint(LPRINT_NORMAL, "Please specify a nickname.");
 free_arg_lst(paramlst);
 return;
 }
 // Note that roomname is part of the array allocated by split_arg(),
 // so we can modify it.
 mc_strtolower(roomname);
 jb_room_join(roomname, nick);
-scr_LogPrint(LPRINT_LOGNORM, "Sent a join request to <%s>", roomname);
+scr_LogPrint(LPRINT_LOGNORM, "Sent a join request to <%s>...", roomname);
 buddylist_build();
 update_roster = TRUE;
 free_arg_lst(paramlst);
 if (tmpnick)
 // An empty reason is no reason...
 if (arg && !*arg)
 arg = NULL;
 if (!jid || !*jid) {
-scr_LogPrint(LPRINT_NORMAL, "Missing or incorrect parameter");
+scr_LogPrint(LPRINT_NORMAL, "Missing or incorrect Jabber ID.");
 free_arg_lst(paramlst);
 return;
 }
 roomname = buddy_getjid(bud);
 jb_room_invite(roomname, jid, arg);
-scr_LogPrint(LPRINT_LOGNORM, "Invitation sent to <%s>", jid);
+scr_LogPrint(LPRINT_LOGNORM, "Invitation sent to <%s>...", jid);
 free_arg_lst(paramlst);
 }
 static void room_affil(gpointer bud, char *arg)
 {
 jid = *paramlst;
 rolename = *(paramlst+1);
 arg = *(paramlst+2);
 if (!jid || !*jid || !rolename || !*rolename) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+scr_LogPrint(LPRINT_NORMAL, "Please specify both a Jabber ID and a role.");
 free_arg_lst(paramlst);
 return;
 }
 ra.type = type_affil;
 break;
 if (ra.val.affil < imaffiliation_size)
 jb_room_setattrib(roomid, jid, NULL, ra, arg);
 else
-scr_LogPrint(LPRINT_NORMAL, "Wrong affiliation parameter");
+scr_LogPrint(LPRINT_NORMAL, "Wrong affiliation parameter.");
 free_arg_lst(paramlst);
 }
 static void room_role(gpointer bud, char *arg)
 jid = *paramlst;
 rolename = *(paramlst+1);
 arg = *(paramlst+2);
 if (!jid || !*jid || !rolename || !*rolename) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+scr_LogPrint(LPRINT_NORMAL, "Please specify both a Jabber ID and a role.");
 free_arg_lst(paramlst);
 return;
 }
 ra.type = type_role;
 break;
 if (ra.val.role < imrole_size)
 jb_room_setattrib(roomid, jid, NULL, ra, arg);
 else
-scr_LogPrint(LPRINT_NORMAL, "Wrong role parameter");
+scr_LogPrint(LPRINT_NORMAL, "Wrong role parameter.");
 free_arg_lst(paramlst);
 }
 paramlst = split_arg(arg, 2, 1); // jid, [reason]
 jid = *paramlst;
 arg = *(paramlst+1);
 if (!jid || !*jid) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter (Jabber id)");
+scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID.");
 free_arg_lst(paramlst);
 return;
 }
 ra.type = type_affil;
 paramlst = split_arg(arg, 2, 1); // nickname, [reason]
 nick = *paramlst;
 arg = *(paramlst+1);
 if (!nick || !*nick) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter (nickname)");
+scr_LogPrint(LPRINT_NORMAL, "Please specify a nickname.");
 free_arg_lst(paramlst);
 return;
 }
 ra.type = type_role;
 gchar *roomid, *utf8_nickname;
 const char *nickname;
 nickname = buddy_getnickname(bud);
 if (!nickname) {
-scr_LogPrint(LPRINT_NORMAL, "You are not in this room");
+scr_LogPrint(LPRINT_NORMAL, "You are not in this room.");
 return;
 }
 utf8_nickname = to_utf8(nickname);
 roomid = g_strdup_printf("%s/%s", buddy_getjid(bud), utf8_nickname);
 }
 static void room_nick(gpointer bud, char *arg)
 {
 if (!buddy_getinsideroom(bud)) {
-scr_LogPrint(LPRINT_NORMAL, "You are not in this room");
+scr_LogPrint(LPRINT_NORMAL, "You are not in this room.");
 return;
 }
 if (!arg || !*arg) {
 const char *nick = buddy_getnickname(bud);
 if (nick)
 scr_LogPrint(LPRINT_NORMAL, "Your nickname is: %s", nick);
 else
-scr_LogPrint(LPRINT_NORMAL, "You have no nickname in this room");
+scr_LogPrint(LPRINT_NORMAL, "You have no nickname in this room.");
 } else {
 gchar *cmd;
 cmd = g_strdup_printf("%s %s", buddy_getjid(bud), arg);
 room_join(bud, cmd);
 g_free(cmd);
 paramlst = split_arg(arg, 2, 0); // nickname, message
 nick = *paramlst;
 arg = *(paramlst+1);
 if (!nick || !*nick || !arg || !*arg) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+scr_LogPrint(LPRINT_NORMAL,
+"Please specify both a Jabber ID and a message.");
 free_arg_lst(paramlst);
 return;
 }
 cmd = g_strdup_printf("%s/%s %s", buddy_getjid(bud), nick, arg);
 }
 static void room_remove(gpointer bud, char *arg)
 {
 if (*arg) {
-scr_LogPrint(LPRINT_NORMAL, "Unknown parameter");
+scr_LogPrint(LPRINT_NORMAL, "This action does not require a parameter; "
+"the currently-selected room will be removed.");
 return;
 }
 // Quick check: if there are resources, we haven't left
 if (buddy_getinsideroom(bud)) {
 static void room_topic(gpointer bud, char *arg)
 {
 gchar *msg;
 if (!buddy_getinsideroom(bud)) {
-scr_LogPrint(LPRINT_NORMAL, "You are not in this room");
+scr_LogPrint(LPRINT_NORMAL, "You are not in this room.");
 return;
 }
 // If no parameter is given, display the current topic
 if (!*arg) {
 const char *topic = buddy_gettopic(bud);
 if (topic)
 scr_LogPrint(LPRINT_NORMAL, "Topic: %s", topic);
 else
-scr_LogPrint(LPRINT_NORMAL, "No topic has been set");
+scr_LogPrint(LPRINT_NORMAL, "No topic has been set.");
 return;
 }
 // Set the topic
 msg = g_strdup_printf("/me has set the topic to: %s", arg);
 }
 static void room_unlock(gpointer bud, char *arg)
 {
 if (*arg) {
-scr_LogPrint(LPRINT_NORMAL, "Unknown parameter");
+scr_LogPrint(LPRINT_NORMAL, "Unknown parameter.");
 return;
 }
 jb_room_unlock(buddy_getjid(bud));
 }
 paramlst = split_arg(arg, 1, 0); // nickname
 nick = *paramlst;
 if (!nick || !*nick) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter (nickname)");
+scr_LogPrint(LPRINT_NORMAL, "Please specify a nickname.");
 free_arg_lst(paramlst);
 return;
 }
 // Enter chat mode
 char **paramlst;
 char *subcmd;
 gpointer bud;
 if (!jb_getonline()) {
-scr_LogPrint(LPRINT_NORMAL, "You are not connected");
+scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
 if (!current_buddy) return;
 bud = BUDDATA(current_buddy);
 paramlst = split_arg(arg, 2, 1); // subcmd, arg
 subcmd = *paramlst;
 arg = *(paramlst+1);
 if (!subcmd || !*subcmd) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+scr_LogPrint(LPRINT_NORMAL, "Missing parameter.");
 free_arg_lst(paramlst);
 return;
 }
 if (!strcasecmp(subcmd, "join"))  {
 {
 char **paramlst;
 char *subcmd;
 if (!jb_getonline()) {
-scr_LogPrint(LPRINT_NORMAL, "You are not connected");
+scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
 paramlst = split_arg(arg, 2, 0); // subcmd, [jid]
 subcmd = *paramlst;
 arg = *(paramlst+1);
 if (!subcmd || !*subcmd) {
-scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+scr_LogPrint(LPRINT_NORMAL, "Missing parameter.");
 free_arg_lst(paramlst);
 return;
 }
 // Use the provided jid, if it looks valid
 if (!*arg) {
 // If no jid is provided, we use the current selected buddy
 arg = NULL;
 } else {
 if (check_jid_syntax(arg)) {
-scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber id", arg);
+scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber ID.", arg);
 free_arg_lst(paramlst);
 return;
 }
 }
 }
 arg  = (char*)buddy_getjid(bud);
 type = buddy_gettype(bud);
 if (!(type & (ROSTER_TYPE_USER|ROSTER_TYPE_AGENT))) {
-scr_LogPrint(LPRINT_NORMAL, "Invalid buddy");
+scr_LogPrint(LPRINT_NORMAL, "Invalid buddy.");
 return;
 }
 }
 if (!strcasecmp(subcmd, "allow"))  {
 jb_subscr_send_auth(arg);
 scr_LogPrint(LPRINT_LOGNORM,
-"<%s> is allowed to receive your presence updates", arg);
+"<%s> is now allowed to receive your presence updates.", arg);
 } else if (!strcasecmp(subcmd, "cancel"))  {
 jb_subscr_cancel_auth(arg);
 scr_LogPrint(LPRINT_LOGNORM,
-"<%s> is no more allowed to receive your presence updates",
+"<%s> will no longer receive your presence updates.",
 arg);
 } else if (!strcasecmp(subcmd, "request"))  {
 jb_subscr_request_auth(arg);
 scr_LogPrint(LPRINT_LOGNORM,
-"Sent presence notification request to <%s>", arg);
+"Sent presence notification request to <%s>...", arg);
 } else {
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");
 }
 free_arg_lst(paramlst);
 }
 static void do_version(char *arg)
 {
-scr_LogPrint(LPRINT_NORMAL, "This is mcabber version %s", PACKAGE_VERSION);
+scr_LogPrint(LPRINT_NORMAL, "This is mcabber version %s.", PACKAGE_VERSION);
 }
 static void do_connect(char *arg)
 {
 mcabber_connect();

Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/commands.c @ 681:8dc602a246a4