Add fix-module-messages
authorMyhailo Danylenko <isbear@ukrpost.net>
Sat, 28 Jul 2012 19:04:29 +0300
changeset 34 94b6e4aa74a3
parent 33 ce47dc7fc6c0
child 35 c80eb5663234
Add fix-module-messages
fix-module-messages
series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fix-module-messages	Sat Jul 28 19:04:29 2012 +0300
@@ -0,0 +1,31 @@
+# HG changeset patch
+# Parent 8e120e293a253ab7c0cbfb85ac74ab12428cf0f7
+
+diff -r 8e120e293a25 mcabber/mcabber/commands.c
+--- a/mcabber/mcabber/commands.c	Sat Jul 28 18:45:45 2012 +0300
++++ b/mcabber/mcabber/commands.c	Sat Jul 28 19:00:28 2012 +0300
+@@ -3251,16 +3251,18 @@
+         ++name;
+     }
+ 
+-    if (!strcmp(args[0], "load"))
++    if (!strcmp(args[0], "load")) {
+       error = module_load(name, TRUE, force);
+-    else if (!strcmp(args[0], "unload"))
++      if (error)
++        scr_log_print(LPRINT_LOGNORM, "Module '%s' loading error: %s", name, error);
++    } else if (!strcmp(args[0], "unload")) {
+       error = module_unload(name, TRUE, force);
+-    else if (!strcmp(args[0], "info"))
++      if (error)
++        scr_log_print(LPRINT_LOGNORM, "Module '%s' unloading error: %s", name, error);
++    } else if (!strcmp(args[0], "info"))
+       module_info_print(name);
+     else
+-      error = "Unknown subcommand";
+-    if (error)
+-      scr_LogPrint(LPRINT_LOGNORM, "Error: %s.",  error);
++      scr_log_print(LPRINT_LOGNORM, "Error: module: Unknown subcommand.");
+   }
+   free_arg_lst(args);
+ #else
--- a/series	Fri Jul 20 17:55:10 2012 +0300
+++ b/series	Sat Jul 28 19:04:29 2012 +0300
@@ -2,6 +2,7 @@
 fix-receipts
 update-pc
 warning-fixes
+fix-module-messages
 switch-to-experimental
 separate-extcmd
 modularize-extcmd