--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/cmd-add-simplifications Wed Apr 07 17:28:19 2010 +0300
@@ -0,0 +1,188 @@
+diff -r b85585d02cd9 mcabber/mcabber/commands.c
+--- a/mcabber/mcabber/commands.c Mon Apr 05 23:25:45 2010 +0200
++++ b/mcabber/mcabber/commands.c Wed Apr 07 16:57:14 2010 +0300
+@@ -91,6 +91,7 @@
+ static void do_otr(char *arg);
+ static void do_otrpolicy(char *arg);
+ static void do_echo(char *arg);
++static void do_module(char *arg);
+
+ // Global variable for the commands list
+ static GSList *Commands;
+@@ -98,8 +99,6 @@
+ #ifdef MODULES_ENABLE
+ #include "modules.h"
+
+-static void do_module(char *arg);
+-
+ gpointer cmd_del(const char *name)
+ {
+ GSList *sl_cmd;
+@@ -115,16 +114,12 @@
+ }
+ return NULL;
+ }
++#endif
+
+ // cmd_add()
+ // Adds a command to the commands list and to the CMD completion list
+ void cmd_add(const char *name, const char *help, guint flags_row1,
+ guint flags_row2, void (*f)(char*), gpointer userdata)
+-#define cmd_add(A, B, C, D, E) cmd_add (A, B, C, D, E, NULL);
+-#else
+-static void cmd_add(const char *name, const char *help,
+- guint flags_row1, guint flags_row2, void (*f)(char*))
+-#endif
+ {
+ cmd *n_cmd = g_new0(cmd, 1);
+ strncpy(n_cmd->name, name, 32-1);
+@@ -132,9 +127,7 @@
+ n_cmd->completion_flags[0] = flags_row1;
+ n_cmd->completion_flags[1] = flags_row2;
+ n_cmd->func = f;
+-#ifdef MODULES_ENABLE
+ n_cmd->userdata = userdata;
+-#endif
+ Commands = g_slist_prepend(Commands, n_cmd);
+ // Add to completion CMD category
+ compl_add_category_word(COMPL_CMD, name);
+@@ -148,55 +141,56 @@
+ //
+ void cmd_init(void)
+ {
+- cmd_add("add", "Add a jabber user", COMPL_JID, 0, &do_add);
+- cmd_add("alias", "Add an alias", 0, 0, &do_alias);
++ cmd_add("add", "Add a jabber user", COMPL_JID, 0, &do_add, NULL);
++ cmd_add("alias", "Add an alias", 0, 0, &do_alias, NULL);
+ cmd_add("authorization", "Manage subscription authorizations",
+- COMPL_AUTH, COMPL_JID, &do_authorization);
+- cmd_add("bind", "Add an key binding", 0, 0, &do_bind);
++ COMPL_AUTH, COMPL_JID, &do_authorization, NULL);
++ cmd_add("bind", "Add an key binding", 0, 0, &do_bind, NULL);
+ cmd_add("buffer", "Manipulate current buddy's buffer (chat window)",
+- COMPL_BUFFER, 0, &do_buffer);
+- cmd_add("chat_disable", "Disable chat mode", 0, 0, &do_chat_disable);
+- cmd_add("clear", "Clear the dialog window", 0, 0, &do_clear);
+- cmd_add("color", "Set coloring options", COMPL_COLOR, 0, &do_color);
+- 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("echo", "Display a string in the log window", 0, 0, &do_echo);
+- cmd_add("event", "Process an event", COMPL_EVENTSID, COMPL_EVENTS, &do_event);
++ COMPL_BUFFER, 0, &do_buffer, NULL);
++ cmd_add("chat_disable", "Disable chat mode", 0, 0, &do_chat_disable, NULL);
++ cmd_add("clear", "Clear the dialog window", 0, 0, &do_clear, NULL);
++ cmd_add("color", "Set coloring options", COMPL_COLOR, 0, &do_color, NULL);
++ cmd_add("connect", "Connect to the server", 0, 0, &do_connect, NULL);
++ cmd_add("del", "Delete the current buddy", 0, 0, &do_del, NULL);
++ cmd_add("disconnect", "Disconnect from server", 0, 0, &do_disconnect, NULL);
++ cmd_add("echo", "Display a string in the log window", 0, 0, &do_echo, NULL);
++ cmd_add("event", "Process an event", COMPL_EVENTSID, COMPL_EVENTS, &do_event,
++ NULL);
+ cmd_add("group", "Change group display settings",
+- COMPL_GROUP, COMPL_GROUPNAME, &do_group);
+- cmd_add("help", "Display some help", COMPL_CMD, 0, &do_help);
+- cmd_add("iline", "Manipulate input buffer", 0, 0, &do_iline);
+- cmd_add("info", "Show basic info on current buddy", 0, 0, &do_info);
++ COMPL_GROUP, COMPL_GROUPNAME, &do_group, NULL);
++ cmd_add("help", "Display some help", COMPL_CMD, 0, &do_help, NULL);
++ cmd_add("iline", "Manipulate input buffer", 0, 0, &do_iline, NULL);
++ cmd_add("info", "Show basic info on current buddy", 0, 0, &do_info, NULL);
+ cmd_add("move", "Move the current buddy to another group", COMPL_GROUPNAME,
+- 0, &do_move);
++ 0, &do_move, NULL);
+ cmd_add("msay", "Send a multi-lines message to the selected buddy",
+- COMPL_MULTILINE, 0, &do_msay);
+- cmd_add("otr", "Manage OTR settings", COMPL_OTR, COMPL_JID, &do_otr);
++ COMPL_MULTILINE, 0, &do_msay, NULL);
++ cmd_add("otr", "Manage OTR settings", COMPL_OTR, COMPL_JID, &do_otr, NULL);
+ cmd_add("otrpolicy", "Manage OTR policies", COMPL_JID, COMPL_OTRPOLICY,
+- &do_otrpolicy);
+- cmd_add("pgp", "Manage PGP settings", COMPL_PGP, COMPL_JID, &do_pgp);
+- cmd_add("quit", "Exit the software", 0, 0, NULL);
+- cmd_add("rawxml", "Send a raw XML string", 0, 0, &do_rawxml);
+- cmd_add("rename", "Rename the current buddy", 0, 0, &do_rename);
++ &do_otrpolicy, NULL);
++ cmd_add("pgp", "Manage PGP settings", COMPL_PGP, COMPL_JID, &do_pgp, NULL);
++ cmd_add("quit", "Exit the software", 0, 0, NULL, NULL);
++ cmd_add("rawxml", "Send a raw XML string", 0, 0, &do_rawxml, NULL);
++ cmd_add("rename", "Rename the current buddy", 0, 0, &do_rename, NULL);
+ cmd_add("request", "Send a Jabber IQ request", COMPL_REQUEST, COMPL_JID,
+- &do_request);
+- cmd_add("room", "MUC actions command", COMPL_ROOM, 0, &do_room);
++ &do_request, NULL);
++ cmd_add("room", "MUC actions command", COMPL_ROOM, 0, &do_room, NULL);
+ cmd_add("roster", "Manipulate the roster/buddylist", COMPL_ROSTER, 0,
+- &do_roster);
+- cmd_add("say", "Say something to the selected buddy", 0, 0, &do_say);
++ &do_roster, NULL);
++ cmd_add("say", "Say something to the selected buddy", 0, 0, &do_say, NULL);
+ cmd_add("say_to", "Say something to a specific buddy", COMPL_JID, 0,
+- &do_say_to);
+- cmd_add("screen_refresh", "Redraw mcabber screen", 0, 0, &do_screen_refresh);
+- cmd_add("set", "Set/query an option value", 0, 0, &do_set);
+- cmd_add("source", "Read a configuration file", 0, 0, &do_source);
+- cmd_add("status", "Show or set your status", COMPL_STATUS, 0, &do_status);
++ &do_say_to, NULL);
++ cmd_add("screen_refresh", "Redraw mcabber screen", 0, 0, &do_screen_refresh,
++ NULL);
++ cmd_add("set", "Set/query an option value", 0, 0, &do_set, NULL);
++ cmd_add("source", "Read a configuration file", 0, 0, &do_source, NULL);
++ cmd_add("status", "Show or set your status", COMPL_STATUS, 0, &do_status,
++ NULL);
+ cmd_add("status_to", "Show or set your status for one recipient",
+- COMPL_JID, COMPL_STATUS, &do_status_to);
+- cmd_add("version", "Show mcabber version", 0, 0, &do_version);
+-#ifdef MODULES_ENABLE
+- cmd_add("module", "Manipulations with modules", 0, 0, &do_module);
+-#endif
++ COMPL_JID, COMPL_STATUS, &do_status_to, NULL);
++ cmd_add("version", "Show mcabber version", 0, 0, &do_version, NULL);
++ cmd_add("module", "Manipulations with modules", 0, 0, &do_module, NULL);
+
+ // Status category
+ compl_add_category_word(COMPL_STATUS, "online");
+@@ -2997,9 +2991,9 @@
+ g_slist_free(bm);
+ }
+
+-#ifdef MODULES_ENABLE
+ static void do_module(char *arg)
+ {
++#ifdef MODULES_ENABLE
+ gboolean force = FALSE;
+ char **args;
+
+@@ -3029,8 +3023,10 @@
+ scr_LogPrint(LPRINT_LOGNORM, "Error: %s.", error);
+ }
+ free_arg_lst(args);
++#else
++ scr_log_print(LPRINT_NORMAL, "Please recompile mcabber with modules enabled.");
++#endif
+ }
+-#endif
+
+ static void do_room(char *arg)
+ {
+diff -r b85585d02cd9 mcabber/mcabber/commands.h
+--- a/mcabber/mcabber/commands.h Mon Apr 05 23:25:45 2010 +0200
++++ b/mcabber/mcabber/commands.h Wed Apr 07 16:57:14 2010 +0300
+@@ -11,9 +11,7 @@
+ const char *help;
+ guint completion_flags[2];
+ void (*func)(char *);
+-#ifdef MODULES_ENABLE
+ gpointer userdata;
+-#endif
+ } cmd;
+
+ void cmd_init(void);
+@@ -22,7 +20,6 @@
+ int process_command(const char *line, guint iscmd);
+ char *expandalias(const char *line);
+ #ifdef MODULES_ENABLE
+-void cmd_deinit(void);
+ gpointer cmd_del(const char *name);
+ void cmd_add(const char *name, const char *help, guint flags1, guint flags2, void (*f)(char*), gpointer userdata);
+ #endif
--- a/cmd-del-id Wed Apr 07 11:25:20 2010 +0300
+++ b/cmd-del-id Wed Apr 07 17:28:19 2010 +0300
@@ -1,6 +1,6 @@
-diff -r b73374708a12 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h Wed Apr 07 11:22:18 2010 +0300
-+++ b/mcabber/mcabber/api.h Wed Apr 07 11:22:53 2010 +0300
+diff -r 1da6df9f3c2b mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h Wed Apr 07 17:21:17 2010 +0300
++++ b/mcabber/mcabber/api.h Wed Apr 07 17:24:57 2010 +0300
@@ -3,8 +3,8 @@
#include <mcabber/config.h> // For MCABBER_BRANCH
@@ -12,12 +12,12 @@
#define MCABBER_BRANCH_EXPERIMENTAL 1
-diff -r b73374708a12 mcabber/mcabber/commands.c
---- a/mcabber/mcabber/commands.c Wed Apr 07 11:22:18 2010 +0300
-+++ b/mcabber/mcabber/commands.c Wed Apr 07 11:22:53 2010 +0300
-@@ -100,26 +100,25 @@
-
- static void do_module(char *arg);
+diff -r 1da6df9f3c2b mcabber/mcabber/commands.c
+--- a/mcabber/mcabber/commands.c Wed Apr 07 17:21:17 2010 +0300
++++ b/mcabber/mcabber/commands.c Wed Apr 07 17:24:57 2010 +0300
+@@ -99,27 +99,26 @@
+ #ifdef MODULES_ENABLE
+ #include "modules.h"
-gpointer cmd_del(const char *name)
+gpointer cmd_del(gpointer id)
@@ -38,6 +38,7 @@
- }
return NULL;
}
+ #endif
// cmd_add()
// Adds a command to the commands list and to the CMD completion list
@@ -45,36 +46,35 @@
- guint flags_row2, void (*f)(char*), gpointer userdata)
+gpointer cmd_add(const char *name, const char *help, guint flags_row1,
+ guint flags_row2, void (*f)(char*), gpointer userdata)
- #define cmd_add(A, B, C, D, E) cmd_add (A, B, C, D, E, NULL);
- #else
- static void cmd_add(const char *name, const char *help,
-@@ -138,6 +137,9 @@
+ {
+ cmd *n_cmd = g_new0(cmd, 1);
+ strncpy(n_cmd->name, name, 32-1);
+@@ -131,6 +130,7 @@
Commands = g_slist_prepend(Commands, n_cmd);
// Add to completion CMD category
compl_add_category_word(COMPL_CMD, name);
-+#ifdef MODULES_ENABLE
+ return n_cmd;
-+#endif
}
// cmd_init()
-diff -r b73374708a12 mcabber/mcabber/commands.h
---- a/mcabber/mcabber/commands.h Wed Apr 07 11:22:18 2010 +0300
-+++ b/mcabber/mcabber/commands.h Wed Apr 07 11:22:53 2010 +0300
-@@ -23,8 +23,8 @@
+diff -r 1da6df9f3c2b mcabber/mcabber/commands.h
+--- a/mcabber/mcabber/commands.h Wed Apr 07 17:21:17 2010 +0300
++++ b/mcabber/mcabber/commands.h Wed Apr 07 17:24:57 2010 +0300
+@@ -20,8 +20,9 @@
+ int process_command(const char *line, guint iscmd);
char *expandalias(const char *line);
#ifdef MODULES_ENABLE
- void cmd_deinit(void);
-gpointer cmd_del(const char *name);
-void cmd_add(const char *name, const char *help, guint flags1, guint flags2, void (*f)(char*), gpointer userdata);
+gpointer cmd_del(gpointer id);
-+gpointer cmd_add(const char *name, const char *help, guint flags1, guint flags2, void (*f)(char*), gpointer userdata);
++gpointer cmd_add(const char *name, const char *help, guint flags1, guint flags2,
++ void (*f)(char*), gpointer userdata);
#endif
void cmd_room_whois(gpointer bud, char *nick_locale, guint interactive);
-diff -r b73374708a12 mcabber/modules/beep/beep.c
---- a/mcabber/modules/beep/beep.c Wed Apr 07 11:22:18 2010 +0300
-+++ b/mcabber/modules/beep/beep.c Wed Apr 07 11:22:53 2010 +0300
+diff -r 1da6df9f3c2b mcabber/modules/beep/beep.c
+--- a/mcabber/modules/beep/beep.c Wed Apr 07 17:21:17 2010 +0300
++++ b/mcabber/modules/beep/beep.c Wed Apr 07 17:24:57 2010 +0300
@@ -46,8 +46,9 @@
.next = NULL,
};
--- a/cmd-dynamic-restriction-list Wed Apr 07 11:25:20 2010 +0300
+++ b/cmd-dynamic-restriction-list Wed Apr 07 17:28:19 2010 +0300
@@ -1,6 +1,6 @@
-diff -r ad853b0253c4 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h Wed Apr 07 11:23:24 2010 +0300
-+++ b/mcabber/mcabber/api.h Wed Apr 07 11:23:46 2010 +0300
+diff -r 9c09cf20d737 mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h Wed Apr 07 17:25:05 2010 +0300
++++ b/mcabber/mcabber/api.h Wed Apr 07 17:26:32 2010 +0300
@@ -3,7 +3,7 @@
#include <mcabber/config.h> // For MCABBER_BRANCH
@@ -10,10 +10,10 @@
#define MCABBER_API_MIN 23
#define MCABBER_BRANCH_EXPERIMENTAL 1
-diff -r ad853b0253c4 mcabber/mcabber/commands.c
---- a/mcabber/mcabber/commands.c Wed Apr 07 11:23:24 2010 +0300
-+++ b/mcabber/mcabber/commands.c Wed Apr 07 11:23:46 2010 +0300
-@@ -94,6 +94,7 @@
+diff -r 9c09cf20d737 mcabber/mcabber/commands.c
+--- a/mcabber/mcabber/commands.c Wed Apr 07 17:25:05 2010 +0300
++++ b/mcabber/mcabber/commands.c Wed Apr 07 17:26:32 2010 +0300
+@@ -95,6 +95,7 @@
// Global variable for the commands list
static GSList *Commands;
@@ -21,8 +21,8 @@
#ifdef MODULES_ENABLE
#include "modules.h"
-@@ -142,6 +143,42 @@
- #endif
+@@ -133,6 +134,42 @@
+ return n_cmd;
}
+// cmd_set_safe(name, safe)
@@ -64,9 +64,9 @@
// cmd_init()
// Commands table initialization
// !!!
-@@ -200,6 +237,18 @@
- cmd_add("module", "Manipulations with modules", 0, 0, &do_module);
- #endif
+@@ -192,6 +229,16 @@
+ cmd_add("version", "Show mcabber version", 0, 0, &do_version, NULL);
+ cmd_add("module", "Manipulations with modules", 0, 0, &do_module, NULL);
+ cmd_set_safe("set", TRUE);
+ cmd_set_safe("bind", TRUE);
@@ -76,29 +76,27 @@
+ cmd_set_safe("status", TRUE);
+ cmd_set_safe("color", TRUE);
+ cmd_set_safe("otrpolicy", TRUE);
-+#ifdef MODULES_ENABLE
+ cmd_set_safe("module", TRUE);
-+#endif
+
// Status category
compl_add_category_word(COMPL_STATUS, "online");
compl_add_category_word(COMPL_STATUS, "avail");
-diff -r ad853b0253c4 mcabber/mcabber/commands.h
---- a/mcabber/mcabber/commands.h Wed Apr 07 11:23:24 2010 +0300
-+++ b/mcabber/mcabber/commands.h Wed Apr 07 11:23:46 2010 +0300
-@@ -25,7 +25,9 @@
- void cmd_deinit(void);
+diff -r 9c09cf20d737 mcabber/mcabber/commands.h
+--- a/mcabber/mcabber/commands.h Wed Apr 07 17:25:05 2010 +0300
++++ b/mcabber/mcabber/commands.h Wed Apr 07 17:26:32 2010 +0300
+@@ -23,7 +23,9 @@
gpointer cmd_del(gpointer id);
- gpointer cmd_add(const char *name, const char *help, guint flags1, guint flags2, void (*f)(char*), gpointer userdata);
+ gpointer cmd_add(const char *name, const char *help, guint flags1, guint flags2,
+ void (*f)(char*), gpointer userdata);
+gboolean cmd_set_safe(const gchar *name, gboolean safe);
#endif
+gboolean cmd_is_safe(const gchar *name);
void cmd_room_whois(gpointer bud, char *nick_locale, guint interactive);
void cmd_room_leave(gpointer bud, char *arg);
-diff -r ad853b0253c4 mcabber/mcabber/settings.c
---- a/mcabber/mcabber/settings.c Wed Apr 07 11:23:24 2010 +0300
-+++ b/mcabber/mcabber/settings.c Wed Apr 07 11:23:46 2010 +0300
+diff -r 9c09cf20d737 mcabber/mcabber/settings.c
+--- a/mcabber/mcabber/settings.c Wed Apr 07 17:25:05 2010 +0300
++++ b/mcabber/mcabber/settings.c Wed Apr 07 17:26:32 2010 +0300
@@ -185,44 +185,27 @@
// We only allow assignments line, except for commands "pgp", "source",