--- a/marking.c	Sat Aug 04 16:00:25 2012 +0200
+++ b/marking.c	Sat Aug 04 17:29:08 2012 +0300
@@ -75,14 +75,14 @@
 		if (args[1]) {
 			const char *j = args[1];
 			if (check_jid_syntax(j)) {
-				scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8,
-					     "<%s> is not a valid Jabber ID.", j);
+				scr_log_print(LPRINT_NORMAL|LPRINT_NOTUTF8,
+					          "<%s> is not a valid Jabber ID.", j);
 				return;
 			}
 			jid = g_strdup(j);
 			if (!jid) {
-				scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8,
-					     "Unexpected error.");
+				scr_log_print (LPRINT_NORMAL|LPRINT_NOTUTF8,
+					           "Unexpected error.");
 				return;
 			}
 			jfree = TRUE;
@@ -98,14 +98,12 @@
 			j = CURRENT_JID;
 
 		if (!j) {
-			scr_LogPrint(LPRINT_NORMAL, "No buddy is currently selected.");
+			scr_log_print (LPRINT_NORMAL, "No buddy is currently selected.");
 			return;
 		}
 
-		jid = g_strdup(j);
+		jid   = g_strdup (j);
 		jfree = TRUE;
-
-		// TODO: handle group marking :)
 	}
 
 
@@ -113,8 +111,8 @@
 
 		if (!g_slist_find_custom (marked_jids, jid, (GCompareFunc) g_strcmp0)) {
 			marked_jids = g_slist_append (marked_jids, jid);
-			marked = 1;
-			jfree = FALSE;
+			marked      = 1;
+			jfree       = FALSE;
 		}
 
 	} else if (!strcmp (cmd, "clear")) {
@@ -124,7 +122,7 @@
 		if (mel) {
 			g_free (mel->data);
 			marked_jids = g_slist_delete_link (marked_jids, mel);
-			marked = 0;
+			marked      = 0;
 		}
 
 	} else if (!strcmp (cmd, "toggle")) {
@@ -134,11 +132,11 @@
 		if (mel) {
 			g_free (mel->data);
 			marked_jids = g_slist_delete_link (marked_jids, mel);
-			marked = 0;
+			marked      = 0;
 		} else {
 			marked_jids = g_slist_append (marked_jids, jid);
-			marked = 1;
-			jfree  = FALSE;
+			marked      = 1;
+			jfree       = FALSE;
 		}
 	}
 
@@ -151,9 +149,9 @@
 					    HBB_PREFIX_INFO|HBB_PREFIX_NOFLAG, 0);
 	}
 	if (marked >= 0) {
-		scr_LogPrint(LPRINT_NORMAL, "<%s> is now %s (%u mark%s).", jid,
-					 marked == 1 ? "marked" : "unmarked",
-					 len, len > 1 ? "s" : "");
+		scr_log_print (LPRINT_NORMAL, "<%s> is now %s (%u mark%s).", jid,
+					   marked == 1 ? "marked" : "unmarked",
+					   len, len > 1 ? "s" : "");
 	}
 
 	if (jfree && jid)
@@ -175,7 +173,7 @@
 	if (!strcmp (cmd, "list")) {
 
 		GSList *mel;
-		guint len = g_slist_length(marked_jids);
+		guint len = g_slist_length (marked_jids);
 
 		if (!marked_jids) {
 			scr_log_print (LPRINT_NORMAL, "No marked JIDs.");
@@ -185,7 +183,7 @@
 				char *jid = (char *) mel->data;
 				scr_log_print (LPRINT_NORMAL, " * %s", jid);
 			}
-			// Smartly set the status flag if we have more marks than the log
+			// XXX Smartly set the status flag if we have more marks than the log
 			// window height.
 			if (len + 1 > scr_getlogwinheight()) {
 				scr_setmsgflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE);
@@ -252,10 +250,10 @@
 void marking_init (void)
 {
 #ifndef MCABBER_API_HAVE_CMD_ID
-	cmd_add ("mark", "", 0, COMPL_JID, do_mark, NULL);
+	cmd_add ("mark",   "", 0, COMPL_JID, do_mark,   NULL);
 	cmd_add ("marked", "", 0, COMPL_CMD, do_marked, NULL);
 #else
-	mark_cmid   = cmd_add ("mark", "", 0, COMPL_JID, do_mark, NULL);
+	mark_cmid   = cmd_add ("mark",   "", 0, COMPL_JID, do_mark,   NULL);
 	marked_cmid = cmd_add ("marked", "", 0, COMPL_CMD, do_marked, NULL);
 #endif
 }