# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1267899665 -3600
# Node ID 15e1f39577861e1d8713a0eddb06618da5ba4d1d
# Parent  5093b5ca1572d4a7bf51627c1b0a9dce27b4b3e4
Misc. small style changes
(I.e. line length < 80 whenever possible)

diff -r 5093b5ca1572 -r 15e1f3957786 mcabber/doc/help/en/hlp_module.txt
--- a/mcabber/doc/help/en/hlp_module.txt	Thu Mar 04 13:03:20 2010 +0200
+++ b/mcabber/doc/help/en/hlp_module.txt	Sat Mar 06 19:21:05 2010 +0100
@@ -10,4 +10,4 @@
  Unloads specified module.
  Note: The force flag will not remove any dependent on this modules!
 /module [list]
- Lists modules in a format: [modulename]  [reference count] ([manually/automatically loaded]) [loaded modules, that this module depends on]
+ Lists modules in a format: [modulename]  [reference count] ([Manually/Automatically loaded]) [loaded modules, that this module depends on]
diff -r 5093b5ca1572 -r 15e1f3957786 mcabber/mcabber/modules.c
--- a/mcabber/mcabber/modules.c	Thu Mar 04 13:03:20 2010 +0200
+++ b/mcabber/mcabber/modules.c	Sat Mar 06 19:21:05 2010 +0100
@@ -65,7 +65,8 @@
     return "Missing module name";
 
   { // Check if module is already loaded
-    GSList *lmod = g_slist_find_custom(loaded_modules, arg, module_list_comparator);
+    GSList *lmod = g_slist_find_custom(loaded_modules, arg,
+                                       module_list_comparator);
 
     if (lmod) {
       loaded_module_t *module = lmod->data;
@@ -74,7 +75,8 @@
         if (!module->locked) {
           module->locked = TRUE;
           module->refcount += 1;
-          return force ? NULL : "Module is already automatically loaded, marked as manually loaded";
+          return force ? NULL : "Module is already automatically loaded, "
+                                "marked as manually loaded";
         } else
           return force ? NULL : "Module is already loaded";
       } else {
@@ -107,7 +109,8 @@
         return "Module provides no information structure";
       }
 
-      scr_LogPrint(LPRINT_LOGNORM, "Forced to ignore error: Module provides no information structure.");
+      scr_LogPrint(LPRINT_LOGNORM, "Forced to ignore error: "
+                                 "Module provides no information structure.");
     }
 
     g_free(varname);
@@ -122,7 +125,8 @@
       return "Module requires newer version of mcabber";
     }
 
-    scr_LogPrint(LPRINT_LOGNORM, "Forced to ignore error: Module requires newer version of mcabber.");
+    scr_LogPrint(LPRINT_LOGNORM, "Forced to ignore error: "
+                                 "Module requires newer version of mcabber.");
   }
 
   // Load dependencies
@@ -134,20 +138,24 @@
 
       if (err) {
         GSList *mel;
-        scr_LogPrint(LPRINT_LOGNORM, "Error loading dependency module %s: %s.", *dep, err);
+        scr_LogPrint(LPRINT_LOGNORM, "Error loading dependency module %s: %s.",
+                     *dep, err);
 
         // Unload already loaded dependencies
         for (mel = deps; mel; mel = mel->next) {
           gchar *ldmname = mel->data;
           err = module_unload(ldmname, FALSE, FALSE);
-          scr_LogPrint(LPRINT_LOGNORM, "Error unloading dependency module %s: %s.", ldmname, err);
+          scr_LogPrint(LPRINT_LOGNORM,
+                       "Error unloading dependency module %s: %s.",
+                       ldmname, err);
           g_free(ldmname);
         }
         g_slist_free(deps);
 
         // Unload module
         if (!g_module_close(mod))
-          scr_LogPrint(LPRINT_LOGNORM, "Error unloading module %s: %s.", arg, g_module_error());
+          scr_LogPrint(LPRINT_LOGNORM, "Error unloading module %s: %s.",
+                       arg, g_module_error());
         return "Dependency problems";
       }
 
@@ -200,7 +208,8 @@
   if (manual) {
     if (!module->locked) {
       if (force)
-        scr_LogPrint(LPRINT_LOGNORM, "Forced to ignore error: Manually unloading automatically loaded module.");
+        scr_LogPrint(LPRINT_LOGNORM, "Forced to ignore error: "
+                     "Manually unloading automatically loaded module.");
       else
         return "Module is not loaded manually";
     }
@@ -211,7 +220,8 @@
   module->refcount -= 1;
   if (module->refcount > 0) {
     if (force)
-      scr_LogPrint(LPRINT_LOGNORM, "Forced to ignore error: Refcount is not zero (%u).", module->refcount);
+      scr_LogPrint(LPRINT_LOGNORM, "Forced to ignore error: "
+                   "Refcount is not zero (%u).", module->refcount);
     else
       return manual ? "Module is required by some other modules" : NULL;
   }
@@ -234,7 +244,9 @@
       gchar *ldmname = dep->data;
       const gchar *err = module_unload(ldmname, FALSE, FALSE);
       if (err) // XXX
-        scr_LogPrint(LPRINT_LOGNORM, "Error unloading automatically loaded module %s: %s.", ldmname, err);
+        scr_LogPrint(LPRINT_LOGNORM,
+                     "Error unloading automatically loaded module %s: %s.",
+                     ldmname, err);
       g_free(ldmname);
     }
     g_slist_free(module->dependencies);
@@ -283,7 +295,8 @@
     loaded_module_t *module = mel->data;
     GSList *dep;
 
-    g_string_append_printf(message, format, module->name, module->refcount, module->locked ? 'M' : 'A');
+    g_string_append_printf(message, format, module->name, module->refcount,
+                           module->locked ? 'M' : 'A');
 
     // Append loaded module dependencies
     if (module->dependencies) {
@@ -349,4 +362,4 @@
   }
 }
 
-/* vim: set expandtab cindent cinoptions=>2\:2(0 ts=2 sw=2:  For Vim users... */
+/* vim: set et cindent cinoptions=>2\:2(0 ts=2 sw=2:  For Vim users... */
diff -r 5093b5ca1572 -r 15e1f3957786 mcabber/mcabber/settings.c
--- a/mcabber/mcabber/settings.c	Thu Mar 04 13:03:20 2010 +0200
+++ b/mcabber/mcabber/settings.c	Sat Mar 06 19:21:05 2010 +0100
@@ -187,7 +187,7 @@
         startswith(line, "source ", FALSE) ||
         startswith(line, "color ", FALSE)  ||
 #ifdef MODULES_ENABLE
-        startswith(line, "module ", FALSE)   ||
+        startswith(line, "module ", FALSE) ||
 #endif
         startswith(line, "status ", FALSE) ||
         startswith(line, "otrpolicy", FALSE)) {
@@ -201,7 +201,7 @@
           !startswith(line, "status ", FALSE) &&
           !startswith(line, "color ", FALSE)  &&
 #ifdef MODULES_ENABLE
-          !startswith(line, "module ", FALSE)   &&
+          !startswith(line, "module ", FALSE) &&
 #endif
           !startswith(line, "otrpolicy ", FALSE)) {
         scr_LogPrint(LPRINT_LOGNORM, "Error in configuration file (l. %d): "