Rename command public functions
Add a prefix ("cmd_").
--- a/mcabber/src/commands.c Sat Jan 19 16:30:39 2008 +0100
+++ b/mcabber/src/commands.c Sat Jan 19 16:42:34 2008 +0100
@@ -783,11 +783,11 @@
free_arg_lst(paramlst);
}
-// setstatus(recipient, arg)
+// cmd_setstatus(recipient, arg)
// Set your Jabber status.
// - if recipient is not NULL, the status is sent to this contact only
// - arg must be "status message" (message is optional)
-void setstatus(const char *recipient, const char *arg)
+void cmd_setstatus(const char *recipient, const char *arg)
{
char **paramlst;
char *status;
@@ -846,7 +846,7 @@
return;
}
arg = to_utf8(arg);
- setstatus(NULL, arg);
+ cmd_setstatus(NULL, arg);
g_free(arg);
}
@@ -900,7 +900,7 @@
msg = to_utf8(msg);
cmdline = g_strdup_printf("%s %s", st, msg);
scr_LogPrint(LPRINT_LOGNORM, "Sending to <%s> /status %s", fjid, cmdline);
- setstatus(fjid, cmdline);
+ cmd_setstatus(fjid, cmdline);
g_free(msg);
g_free(cmdline);
g_free(jid_utf8);
@@ -2302,7 +2302,7 @@
free_arg_lst(paramlst);
}
-void room_leave(gpointer bud, char *arg)
+void cmd_room_leave(gpointer bud, char *arg)
{
gchar *roomid, *desc;
const char *nickname;
@@ -2513,9 +2513,9 @@
free_arg_lst(paramlst);
}
-// room_whois(..)
+// cmd_room_whois(..)
// If interactive is TRUE, chatmode can be enabled.
-void room_whois(gpointer bud, char *arg, guint interactive)
+void cmd_room_whois(gpointer bud, char *arg, guint interactive)
{
char **paramlst;
gchar *nick, *buffer;
@@ -2729,7 +2729,7 @@
room_kick(bud, arg);
} else if (!strcasecmp(subcmd, "leave")) {
if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL)
- room_leave(bud, arg);
+ cmd_room_leave(bud, arg);
} else if (!strcasecmp(subcmd, "names")) {
if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL)
room_names(bud, arg);
@@ -2756,7 +2756,7 @@
room_topic(bud, arg);
} else if (!strcasecmp(subcmd, "whois")) {
if ((arg = check_room_subcommand(arg, TRUE, bud)) != NULL)
- room_whois(bud, arg, TRUE);
+ cmd_room_whois(bud, arg, TRUE);
} else if (!strcasecmp(subcmd, "bookmark")) {
if (!arg && !buddy_getjid(BUDDATA(current_buddy)) &&
buddy_gettype(BUDDATA(current_buddy)) == ROSTER_TYPE_SPECIAL)
--- a/mcabber/src/commands.h Sat Jan 19 16:30:39 2008 +0100
+++ b/mcabber/src/commands.h Sat Jan 19 16:42:34 2008 +0100
@@ -21,9 +21,9 @@
extern void mcabber_connect(void);
extern void mcabber_set_terminate_ui(void);
-void room_whois(gpointer bud, char *nick_locale, guint interactive);
-void room_leave(gpointer bud, char *arg);
-void setstatus(const char *recipient, const char *arg);
+void cmd_room_whois(gpointer bud, char *nick_locale, guint interactive);
+void cmd_room_leave(gpointer bud, char *arg);
+void cmd_setstatus(const char *recipient, const char *arg);
#endif /* __COMMANDS_H__ */
--- a/mcabber/src/jab_iq.c Sat Jan 19 16:30:39 2008 +0100
+++ b/mcabber/src/jab_iq.c Sat Jan 19 16:42:34 2008 +0100
@@ -1194,7 +1194,7 @@
if (s->name) {
char *status = g_strdup_printf("%s %s", s->status,
message ? message : "");
- setstatus(NULL, status);
+ cmd_setstatus(NULL, status);
g_free(status);
xmlnode_put_attrib(command, "status", "completed");
xmlnode_put_attrib(iq, "type", "result");
@@ -1292,7 +1292,7 @@
if (to_leave) {
GList* b = buddy_search_jid(to_leave);
if (b)
- room_leave(b->data, "Asked by remote command");
+ cmd_room_leave(b->data, "Asked by remote command");
}
}
xmlnode_put_attrib(iq, "type", "result");
--- a/mcabber/src/jabglue.c Sat Jan 19 16:30:39 2008 +0100
+++ b/mcabber/src/jabglue.c Sat Jan 19 16:42:34 2008 +0100
@@ -2345,7 +2345,7 @@
if (new_member && autowhois == autowhois_on) {
// FIXME: This will fail for some UTF-8 nicknames.
gchar *joiner_nick = from_utf8(rname);
- room_whois(room_elt->data, joiner_nick, FALSE);
+ cmd_room_whois(room_elt->data, joiner_nick, FALSE);
g_free(joiner_nick);
}