# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1081814839 0
# Node ID bdc92fcf1277a7d659f95d2f8382821fe190439a
# Parent  7652d2a079f004f45f36cfbc6c69ab224b8b0e99
[gaim-migrate @ 9396]
I removed the zephyr prpl functions for adding and removing buddies,
since they don't do anything.  And I ran the file through indent,
because it was grossing me out.  Sorry.

committer: Tailor Script <tailor@pidgin.im>

diff -r 7652d2a079f0 -r bdc92fcf1277 src/protocols/zephyr/zephyr.c
--- a/src/protocols/zephyr/zephyr.c	Mon Apr 12 19:05:25 2004 +0000
+++ b/src/protocols/zephyr/zephyr.c	Tue Apr 13 00:07:19 2004 +0000
@@ -49,7 +49,7 @@
 /* struct I need for zephyr_to_html */
 struct _zframe {
 	/* true for everything but @color, since inside the parens of that one is
-	* the color. */
+	 * the color. */
 	gboolean has_closer;
 	/* </i>, </font>, </b>, etc. */
 	char *closing;
@@ -107,6 +107,7 @@
 static zephyr_triple *new_triple(const char *c, const char *i, const char *r)
 {
 	zephyr_triple *zt;
+
 	zt = g_new0(zephyr_triple, 1);
 	zt->class = g_strdup(c);
 	zt->instance = g_strdup(i);
@@ -117,7 +118,7 @@
 	return zt;
 }
 
-static void free_triple(zephyr_triple *zt)
+static void free_triple(zephyr_triple * zt)
 {
 	g_free(zt->class);
 	g_free(zt->instance);
@@ -126,13 +127,15 @@
 	g_free(zt);
 }
 
-static const char* gaim_zephyr_get_sender() {
+static const char *gaim_zephyr_get_sender()
+{
 	/* will be useful once this plugin can use a backend other
 	   than libzephyr */
 	return ZGetSender();
 }
 
-static const char* gaim_zephyr_get_realm() {
+static const char *gaim_zephyr_get_realm()
+{
 	/* will be useful once this plugin can use a backend other
 	   than libzephyr */
 	return ZGetRealm();
@@ -140,27 +143,25 @@
 
 /* returns true if zt1 is a subset of zt2, i.e. zt2 has the same thing or
  * wildcards in each field of zt1. */
-static gboolean triple_subset(zephyr_triple *zt1, zephyr_triple *zt2)
+static gboolean triple_subset(zephyr_triple * zt1, zephyr_triple * zt2)
 {
-	if (g_ascii_strcasecmp(zt2->class, zt1->class) &&
-			g_ascii_strcasecmp(zt2->class, "*")) {
+	if (g_ascii_strcasecmp(zt2->class, zt1->class) && g_ascii_strcasecmp(zt2->class, "*")) {
 		return FALSE;
 	}
-	if (g_ascii_strcasecmp(zt2->instance, zt1->instance) &&
-			g_ascii_strcasecmp(zt2->instance, "*")) {
+	if (g_ascii_strcasecmp(zt2->instance, zt1->instance) && g_ascii_strcasecmp(zt2->instance, "*")) {
 		return FALSE;
 	}
-	if (g_ascii_strcasecmp(zt2->recipient, zt1->recipient) &&
-			g_ascii_strcasecmp(zt2->recipient, "*")) {
+	if (g_ascii_strcasecmp(zt2->recipient, zt1->recipient) && g_ascii_strcasecmp(zt2->recipient, "*")) {
 		return FALSE;
 	}
 	return TRUE;
 }
 
-static zephyr_triple *find_sub_by_triple(zephyr_triple *zt)
+static zephyr_triple *find_sub_by_triple(zephyr_triple * zt)
 {
 	zephyr_triple *curr_t;
 	GSList *curr = subscrips;
+
 	while (curr) {
 		curr_t = curr->data;
 		if (triple_subset(zt, curr_t))
@@ -174,6 +175,7 @@
 {
 	zephyr_triple *zt;
 	GSList *curr = subscrips;
+
 	while (curr) {
 		zt = curr->data;
 		if (zt->id == id)
@@ -187,12 +189,11 @@
 {
 	gchar *utf8;
 	GError *err = NULL;
-	if (g_utf8_validate(string,len,NULL)) {
+
+	if (g_utf8_validate(string, len, NULL)) {
 		return g_strdup(string);
 	} else {
-		utf8 = g_convert(string, len, "UTF-8",
-					gaim_account_get_string(zgc->account, "encoding", ZEPHYR_FALLBACK_CHARSET),
-					NULL, NULL, &err);
+		utf8 = g_convert(string, len, "UTF-8", gaim_account_get_string(zgc->account, "encoding", ZEPHYR_FALLBACK_CHARSET), NULL, NULL, &err);
 		if (err) {
 			gaim_debug(GAIM_DEBUG_ERROR, "zephyr", "recv conversion error: %s\n", err->message);
 			utf8 = g_strdup(_("(There was an error converting this message.  Check the 'Encoding' option in the Account Editor)"));
@@ -220,122 +221,118 @@
 
 static char *html_to_zephyr(const char *message)
 {
-        int len,cnt,retcount;
-        char *ret;
-        len = strlen(message);
-        ret = g_new0(char,len*3);
-        bzero(ret,len*3);
-        retcount=0;
-        cnt = 0;
-        while (cnt <= len) {
-                if (message[cnt] == '<') {
-                        if (!g_ascii_strncasecmp(message+cnt+1,"i>",2)) {
-                                strncpy(ret+retcount,"@i(",3);
-                                cnt+=3;
-                                retcount+=3;
-                        } 
-                        else if (!g_ascii_strncasecmp(message+cnt+1,"b>",2)) {
-                                strncpy(ret+retcount,"@b(",3);
-                                cnt+=3;
-                                retcount+=3;
-                        } 
-                        else if (!g_ascii_strncasecmp(message+cnt+1,"br>",3)) {
-                                strncpy(ret+retcount,"\n",1);
-                                cnt+=4;
-                                retcount+=1;
-                        }
-                        else if (!g_ascii_strncasecmp(message+cnt+1,"a href=\"",8)) {
-                                cnt+=9;
-                                while(g_ascii_strncasecmp(message+cnt,"\">",2) !=0) {
-                                        ret[retcount]=message[cnt];
-                                        retcount++; cnt++;
-                                }
-                                cnt+=2;
-                                /* ignore descriptive string */
-                                while(g_ascii_strncasecmp(message+cnt,"</a>",4) !=0) {
-                                        cnt++;
-                                }
-                                cnt+=4;
-                        }
-                        else if (!g_ascii_strncasecmp(message+cnt+1, "font",4)) {
-                                cnt+=5;
-                                while(!g_ascii_strncasecmp(message+cnt," ",1)) cnt++;
-                                if (!g_ascii_strncasecmp(message+cnt,"color=\"",7)) {
-                                        cnt+=7;
-                                        strncpy(ret+retcount,"@color(",7);
-                                        retcount+=7;
-                                        while(g_ascii_strncasecmp(message+cnt,"\">",2) !=0) {
-                                                ret[retcount] = message[cnt];
-                                                retcount++;
-                                                cnt++;
-                                        }
-                                        ret[retcount]=')';
-                                        retcount++;
-                                        cnt+=2;
-                                } 
-                                else if (!g_ascii_strncasecmp(message+cnt,"face=\"",6)) {
-                                        cnt+=6;
-                                        strncpy(ret+retcount,"@font(",6);
-                                        retcount+=6;
-                                        while(g_ascii_strncasecmp(message+cnt,"\">",2) !=0) {
-                                                ret[retcount] = message[cnt];
-                                                retcount++;
-                                                cnt++;
-                                        }
-                                        ret[retcount]=')';
-                                        retcount++;
-                                        cnt+=2;
-                                }
-                                else if (!g_ascii_strncasecmp(message+cnt,"size=\"",6)) {
-                                        cnt+=6;
-                                        if ( (message[cnt] == '1')|| (message[cnt] == '2')) {
-                                                strncpy(ret+retcount,"@small(",7);
-                                                retcount+=7;
-                                        } 
-                                        else if ( (message[cnt] == '3')|| (message[cnt] == '4')) {
-                                                strncpy(ret+retcount,"@medium(",8);
-                                                retcount+=8;
-                                        }
-                                        else if ( (message[cnt] == '5')|| (message[cnt] == '6') || (message[cnt] == '7')) {
-                                                strncpy(ret+retcount,"@large(",7);
-                                                retcount+=7;
-                                        }
-                                        cnt+=3;
-                                }
-                                else {
-                                        /* Drop all unrecognized/misparsed font tags */
-                                        while(g_ascii_strncasecmp(message+cnt,"\">",2) !=0) {
-                                                cnt++;
-                                        }
-                                        cnt+=2;
-                                }
-                        } 
-                        else if (!g_ascii_strncasecmp(message+cnt+1,"/i>",3) || !g_ascii_strncasecmp(message+cnt+1,"/b>",3)) {
-                                cnt+=4;
-                                ret[retcount]=')';
-                                retcount++;
-                        }
-                        else if (!g_ascii_strncasecmp(message+cnt+1,"/font>",6)) {
-                                cnt+=7;
-                                strncpy(ret+retcount,"@font(fixed)",12);
-                                retcount+=12;
-                        }
-                        else {
-                                /* Catch all for all unrecognized/misparsed <foo> tage */
-                                while(g_ascii_strncasecmp(message+cnt,">",1) != 0) {
-                                        ret[retcount]=message[cnt];
-                                        retcount++;
-                                        cnt++;
-                                }
-                        }
-                } else {
-                        /* Duh */
-                        ret[retcount]=message[cnt];
-                        retcount++;
-                        cnt++;
-                }
-        }
-        return ret;
+	int len, cnt, retcount;
+	char *ret;
+
+	len = strlen(message);
+	ret = g_new0(char, len * 3);
+
+	bzero(ret, len * 3);
+	retcount = 0;
+	cnt = 0;
+	while (cnt <= len) {
+		if (message[cnt] == '<') {
+			if (!g_ascii_strncasecmp(message + cnt + 1, "i>", 2)) {
+				strncpy(ret + retcount, "@i(", 3);
+				cnt += 3;
+				retcount += 3;
+			} else if (!g_ascii_strncasecmp(message + cnt + 1, "b>", 2)) {
+				strncpy(ret + retcount, "@b(", 3);
+				cnt += 3;
+				retcount += 3;
+			} else if (!g_ascii_strncasecmp(message + cnt + 1, "br>", 3)) {
+				strncpy(ret + retcount, "\n", 1);
+				cnt += 4;
+				retcount += 1;
+			} else if (!g_ascii_strncasecmp(message + cnt + 1, "a href=\"", 8)) {
+				cnt += 9;
+				while (g_ascii_strncasecmp(message + cnt, "\">", 2) != 0) {
+					ret[retcount] = message[cnt];
+					retcount++;
+					cnt++;
+				}
+				cnt += 2;
+				/* ignore descriptive string */
+				while (g_ascii_strncasecmp(message + cnt, "</a>", 4) != 0) {
+					cnt++;
+				}
+				cnt += 4;
+			} else if (!g_ascii_strncasecmp(message + cnt + 1, "font", 4)) {
+				cnt += 5;
+				while (!g_ascii_strncasecmp(message + cnt, " ", 1))
+					cnt++;
+				if (!g_ascii_strncasecmp(message + cnt, "color=\"", 7)) {
+					cnt += 7;
+					strncpy(ret + retcount, "@color(", 7);
+					retcount += 7;
+					while (g_ascii_strncasecmp(message + cnt, "\">", 2) != 0) {
+						ret[retcount] = message[cnt];
+						retcount++;
+						cnt++;
+					}
+					ret[retcount] = ')';
+					retcount++;
+					cnt += 2;
+				} else if (!g_ascii_strncasecmp(message + cnt, "face=\"", 6)) {
+					cnt += 6;
+					strncpy(ret + retcount, "@font(", 6);
+					retcount += 6;
+					while (g_ascii_strncasecmp(message + cnt, "\">", 2) != 0) {
+						ret[retcount] = message[cnt];
+						retcount++;
+						cnt++;
+					}
+					ret[retcount] = ')';
+					retcount++;
+					cnt += 2;
+				} else if (!g_ascii_strncasecmp(message + cnt, "size=\"", 6)) {
+					cnt += 6;
+					if ((message[cnt] == '1') || (message[cnt] == '2')) {
+						strncpy(ret + retcount, "@small(", 7);
+						retcount += 7;
+					} else if ((message[cnt] == '3')
+							   || (message[cnt] == '4')) {
+						strncpy(ret + retcount, "@medium(", 8);
+						retcount += 8;
+					} else if ((message[cnt] == '5')
+							   || (message[cnt] == '6')
+							   || (message[cnt] == '7')) {
+						strncpy(ret + retcount, "@large(", 7);
+						retcount += 7;
+					}
+					cnt += 3;
+				} else {
+					/* Drop all unrecognized/misparsed font tags */
+					while (g_ascii_strncasecmp(message + cnt, "\">", 2) != 0) {
+						cnt++;
+					}
+					cnt += 2;
+				}
+			} else if (!g_ascii_strncasecmp(message + cnt + 1, "/i>", 3)
+					   || !g_ascii_strncasecmp(message + cnt + 1, "/b>", 3)) {
+				cnt += 4;
+				ret[retcount] = ')';
+				retcount++;
+			} else if (!g_ascii_strncasecmp(message + cnt + 1, "/font>", 6)) {
+				cnt += 7;
+				strncpy(ret + retcount, "@font(fixed)", 12);
+				retcount += 12;
+			} else {
+				/* Catch all for all unrecognized/misparsed <foo> tage */
+				while (g_ascii_strncasecmp(message + cnt, ">", 1) != 0) {
+					ret[retcount] = message[cnt];
+					retcount++;
+					cnt++;
+				}
+			}
+		} else {
+			/* Duh */
+			ret[retcount] = message[cnt];
+			retcount++;
+			cnt++;
+		}
+	}
+	return ret;
 }
 
 /* this parses zephyr formatting and converts it to html. For example, if
@@ -360,73 +357,74 @@
 			zframe *new_f;
 			char *buf;
 			int end;
-			for (end=1; (cnt+end) <= len &&
-					!IS_OPENER(message[cnt+end]) && !IS_CLOSER(message[cnt+end]); end++);
+
+			for (end = 1; (cnt + end) <= len && !IS_OPENER(message[cnt + end])
+				 && !IS_CLOSER(message[cnt + end]); end++);
 			buf = g_new0(char, end);
+
 			if (end) {
-				g_snprintf(buf, end, "%s", message+cnt+1);
+				g_snprintf(buf, end, "%s", message + cnt + 1);
 			}
-			if (!g_ascii_strcasecmp(buf, "italic") ||
-					!g_ascii_strcasecmp(buf, "i")) {
+			if (!g_ascii_strcasecmp(buf, "italic") || !g_ascii_strcasecmp(buf, "i")) {
 				new_f = g_new(zframe, 1);
 				new_f->enclosing = frames;
 				new_f->text = g_string_new("<i>");
 				new_f->closing = "</i>";
 				new_f->has_closer = TRUE;
 				frames = new_f;
-				cnt += end+1; /* cnt points to char after opener */
-			} else if (!g_ascii_strcasecmp(buf,"small")) {
-                                new_f = g_new(zframe,1);
-                                new_f->enclosing = frames;
-                                new_f->text = g_string_new("<font size=\"1\">");
-                                new_f->closing ="</font>";
-                                frames = new_f;
-                                cnt+= end+1;
-                        } else if (!g_ascii_strcasecmp(buf,"medium")) {
-                                new_f = g_new(zframe,1);
-                                new_f->enclosing = frames;
-                                new_f->text = g_string_new("<font size=\"3\">");
-                                new_f->closing ="</font>";
-                                frames = new_f;
-                                cnt+= end+1;
-                        } else if (!g_ascii_strcasecmp(buf,"large")) {
-                                new_f = g_new(zframe,1);
-                                new_f->enclosing = frames;
-                                new_f->text = g_string_new("<font size=\"7\">");
-                                new_f->closing ="</font>";
-                                frames = new_f;
-                                cnt+= end+1;
-                        } else if (!g_ascii_strcasecmp(buf, "bold")
-                                  || !g_ascii_strcasecmp(buf, "b")) {
+				cnt += end + 1;	/* cnt points to char after opener */
+			} else if (!g_ascii_strcasecmp(buf, "small")) {
+				new_f = g_new(zframe, 1);
+				new_f->enclosing = frames;
+				new_f->text = g_string_new("<font size=\"1\">");
+				new_f->closing = "</font>";
+				frames = new_f;
+				cnt += end + 1;
+			} else if (!g_ascii_strcasecmp(buf, "medium")) {
+				new_f = g_new(zframe, 1);
+				new_f->enclosing = frames;
+				new_f->text = g_string_new("<font size=\"3\">");
+				new_f->closing = "</font>";
+				frames = new_f;
+				cnt += end + 1;
+			} else if (!g_ascii_strcasecmp(buf, "large")) {
+				new_f = g_new(zframe, 1);
+				new_f->enclosing = frames;
+				new_f->text = g_string_new("<font size=\"7\">");
+				new_f->closing = "</font>";
+				frames = new_f;
+				cnt += end + 1;
+			} else if (!g_ascii_strcasecmp(buf, "bold")
+					   || !g_ascii_strcasecmp(buf, "b")) {
 				new_f = g_new(zframe, 1);
 				new_f->enclosing = frames;
 				new_f->text = g_string_new("<b>");
 				new_f->closing = "</b>";
 				new_f->has_closer = TRUE;
 				frames = new_f;
-				cnt += end+1;
-			} else if (!g_ascii_strcasecmp(buf, "font")) { 
-				cnt += end+1;
+				cnt += end + 1;
+			} else if (!g_ascii_strcasecmp(buf, "font")) {
+				cnt += end + 1;
 				new_f = g_new(zframe, 1);
 				new_f->enclosing = frames;
 				new_f->text = g_string_new("<font face=");
 				for (; (cnt <= len) && !IS_CLOSER(message[cnt]); cnt++) {
 					g_string_append_c(new_f->text, message[cnt]);
 				}
-				cnt++; /* point to char after closer */
+				cnt++;			/* point to char after closer */
 				g_string_append_c(new_f->text, '>');
 				new_f->closing = "</font>";
 				new_f->has_closer = FALSE;
 				frames = new_f;
 			} else if (!g_ascii_strcasecmp(buf, "color")) {
-				cnt += end+1;
+				cnt += end + 1;
 				new_f = g_new(zframe, 1);
 				new_f->enclosing = frames;
 				new_f->text = g_string_new("<font color=");
 				for (; (cnt <= len) && !IS_CLOSER(message[cnt]); cnt++) {
 					g_string_append_c(new_f->text, message[cnt]);
 				}
-				cnt++; /* point to char after closer */
+				cnt++;			/* point to char after closer */
 				g_string_append_c(new_f->text, '>');
 				new_f->closing = "</font>";
 				new_f->has_closer = FALSE;
@@ -438,22 +436,23 @@
 				new_f->closing = "";
 				new_f->has_closer = TRUE;
 				frames = new_f;
-				cnt += end+1; /* cnt points to char after opener */
+				cnt += end + 1;	/* cnt points to char after opener */
 			} else {
-				if ((cnt+end) > len) {
+				if ((cnt + end) > len) {
 					g_string_append_c(frames->text, '@');
 					cnt++;
-				} else if (IS_CLOSER(message[cnt+end])) {
-                                        /* We have @chars..closer . This is 
-                                           merely a sequence of chars that isn't a formatting tag
-                                        */
-                                        int tmp=cnt;
-                                        while (tmp<=cnt+end) {
-                                                g_string_append_c(frames->text,message[tmp]);
-                                                tmp++;
-                                        }
-                                        cnt+=end+1;
-                                } else {
+				} else if (IS_CLOSER(message[cnt + end])) {
+					/* We have @chars..closer . This is 
+					   merely a sequence of chars that isn't a formatting tag
+					 */
+					int tmp = cnt;
+
+					while (tmp <= cnt + end) {
+						g_string_append_c(frames->text, message[tmp]);
+						tmp++;
+					}
+					cnt += end + 1;
+				} else {
 					/* unrecognized thingie. act like it's not there, but we
 					 * still need to take care of the corresponding closer,
 					 * make a frame that does nothing. */
@@ -463,12 +462,13 @@
 					new_f->closing = "";
 					new_f->has_closer = TRUE;
 					frames = new_f;
-					cnt += end+1; /* cnt points to char after opener */
+					cnt += end + 1;	/* cnt points to char after opener */
 				}
 			}
 		} else if (IS_CLOSER(message[cnt])) {
 			zframe *popped;
 			gboolean last_had_closer;
+
 			if (frames->enclosing) {
 				do {
 					popped = frames;
@@ -508,9 +508,10 @@
 static gboolean pending_zloc(char *who)
 {
 	GList *curr;
+
 	for (curr = pending_zloc_names; curr != NULL; curr = curr->next) {
-		if (!g_ascii_strcasecmp(local_zephyr_normalize(who), (char*)curr->data)) {
-			g_free((char*)curr->data);
+		if (!g_ascii_strcasecmp(local_zephyr_normalize(who), (char *)curr->data)) {
+			g_free((char *)curr->data);
 			pending_zloc_names = g_list_remove(pending_zloc_names, curr->data);
 			return TRUE;
 		}
@@ -520,11 +521,11 @@
 
 static void message_failed(ZNotice_t notice, struct sockaddr_in from)
 {
-        if (g_ascii_strcasecmp(notice.z_class,"message")) {
-                /* message to chat failed ignore for now */
-        } else {
-                gaim_notify_error(zgc,notice.z_recipient,_("User is offline"),NULL);
-        }
+	if (g_ascii_strcasecmp(notice.z_class, "message")) {
+		/* message to chat failed ignore for now */
+	} else {
+		gaim_notify_error(zgc, notice.z_recipient, _("User is offline"), NULL);
+	}
 }
 
 static void handle_message(ZNotice_t notice, struct sockaddr_in from)
@@ -540,18 +541,20 @@
 			if (ZParseLocations(&notice, NULL, &nlocs, &user) != ZERR_NONE)
 				return;
 
-                        if ((b = gaim_find_buddy(zgc->account, user)) == NULL) {
+			if ((b = gaim_find_buddy(zgc->account, user)) == NULL) {
 				char *e = strchr(user, '@');
-                                if(e && !g_ascii_strcasecmp(e+1,gaim_zephyr_get_realm()) ) {
-                                        *e = '\0';
-                                }
+
+				if (e && !g_ascii_strcasecmp(e + 1, gaim_zephyr_get_realm())) {
+					*e = '\0';
+				}
 				b = gaim_find_buddy(zgc->account, user);
-                        }
-			if ((b && pending_zloc(b->name)) || pending_zloc(user) ) {
+			}
+			if ((b && pending_zloc(b->name)) || pending_zloc(user)) {
 				ZLocations_t locs;
 				int one = 1;
 				GString *str = g_string_new("");
-				g_string_append_printf(str, _("<b>User:</b> %s<br>"), b?b->name:user);
+
+				g_string_append_printf(str, _("<b>User:</b> %s<br>"), b ? b->name : user);
 				if (b && b->alias)
 					g_string_append_printf(str, _("<b>Alias:</b> %s<br>"), b->alias);
 				if (!nlocs) {
@@ -559,11 +562,9 @@
 				}
 				for (; nlocs > 0; nlocs--) {
 					ZGetLocations(&locs, &one);
-					g_string_append_printf(str, _("<br>At %s since %s"), locs.host,
-									locs.time);
+					g_string_append_printf(str, _("<br>At %s since %s"), locs.host, locs.time);
 				}
-				gaim_notify_formatted(zgc, NULL, _("Buddy Information"),
-									  NULL, str->str, NULL, NULL);
+				gaim_notify_formatted(zgc, NULL, _("Buddy Information"), NULL, str->str, NULL, NULL);
 				g_string_free(str, TRUE);
 			} else
 				serv_got_update(zgc, b->name, nlocs, 0, 0, 0, 0);
@@ -574,84 +575,81 @@
 		char *buf, *buf2, *buf3;
 		char *send_inst;
 		char *realmptr;
-                GaimConversation *gconv1;
-                GaimConvChat *gcc;
+		GaimConversation *gconv1;
+		GaimConvChat *gcc;
 		char *ptr = notice.z_message + strlen(notice.z_message) + 1;
 		int len = notice.z_message_len - ((int)ptr - (int)notice.z_message);
-		char *sendertmp = g_strdup_printf("%s",gaim_zephyr_get_sender());
+		char *sendertmp = g_strdup_printf("%s", gaim_zephyr_get_sender());
 		GaimConvImFlags flags = 0;
+
 		if (len > 0) {
-                       gchar* tmpescape;
-                       buf = g_malloc(len + 1);
-                       g_snprintf(buf, len + 1, "%s", ptr);
-                       g_strchomp(buf);
-                       tmpescape = gaim_escape_html(buf);
-                       buf2 = zephyr_to_html(tmpescape);
-                       buf3 = zephyr_recv_convert(buf2,strlen(buf2));
-                       g_free(buf2);
-                       g_free(buf);
-                       g_free(tmpescape);
+			gchar *tmpescape;
 
-			if (!g_ascii_strcasecmp(notice.z_class, "MESSAGE") &&
-                            !g_ascii_strcasecmp(notice.z_class_inst, "PERSONAL")) {
+			buf = g_malloc(len + 1);
+			g_snprintf(buf, len + 1, "%s", ptr);
+			g_strchomp(buf);
+			tmpescape = gaim_escape_html(buf);
+			buf2 = zephyr_to_html(tmpescape);
+			buf3 = zephyr_recv_convert(buf2, strlen(buf2));
+			g_free(buf2);
+			g_free(buf);
+			g_free(tmpescape);
+
+			if (!g_ascii_strcasecmp(notice.z_class, "MESSAGE") && !g_ascii_strcasecmp(notice.z_class_inst, "PERSONAL")) {
 				if (!g_ascii_strcasecmp(notice.z_message, "Automated reply:"))
 					flags |= GAIM_CONV_IM_AUTO_RESP;
 				serv_got_im(zgc, notice.z_sender, buf3, flags, time(NULL));
 			} else {
 				zephyr_triple *zt1, *zt2;
-				zt1 = new_triple(notice.z_class, notice.z_class_inst,
-                                                 notice.z_recipient);
+
+				zt1 = new_triple(notice.z_class, notice.z_class_inst, notice.z_recipient);
 				zt2 = find_sub_by_triple(zt1);
 				if (!zt2) {
 					/* we shouldn't be subscribed to this message. ignore. */
 				} else {
-                                        GList *gltmp;
-                                        int found=0;
+					GList *gltmp;
+					int found = 0;
+
 					if (!zt2->open) {
 						zt2->open = TRUE;
 						serv_got_joined_chat(zgc, zt2->id, zt2->name);
-                                                gconv1 = gaim_find_conversation_with_account(zt2->name,zgc->account);
-                                                gcc = gaim_conversation_get_chat_data(gconv1);
-                                                gaim_conv_chat_set_topic(gcc,sendertmp,notice.z_class_inst);
+						gconv1 = gaim_find_conversation_with_account(zt2->name, zgc->account);
+						gcc = gaim_conversation_get_chat_data(gconv1);
+						gaim_conv_chat_set_topic(gcc, sendertmp, notice.z_class_inst);
 
 					}
 					/* If the person is in the default Realm, then strip the 
 					   Realm from the sender field */
-					sendertmp = g_strdup_printf("%s",notice.z_sender);
-					if ((realmptr = strchr(sendertmp,'@')) != NULL) {
+					sendertmp = g_strdup_printf("%s", notice.z_sender);
+					if ((realmptr = strchr(sendertmp, '@')) != NULL) {
 						realmptr++;
-						if (!g_ascii_strcasecmp(realmptr,gaim_zephyr_get_realm())) {
+						if (!g_ascii_strcasecmp(realmptr, gaim_zephyr_get_realm())) {
 							realmptr--;
-							sprintf(realmptr,"%c",'\0');
-							send_inst = g_strdup_printf("%s %s",sendertmp,
-										    notice.z_class_inst);
+							sprintf(realmptr, "%c", '\0');
+							send_inst = g_strdup_printf("%s %s", sendertmp, notice.z_class_inst);
 						} else {
-							send_inst = g_strdup_printf("%s %s",notice.z_sender,
-										    notice.z_class_inst);
+							send_inst = g_strdup_printf("%s %s", notice.z_sender, notice.z_class_inst);
 						}
 					} else {
-						send_inst = g_strdup_printf("%s %s",sendertmp,notice.z_class_inst);
+						send_inst = g_strdup_printf("%s %s", sendertmp, notice.z_class_inst);
 					}
-					serv_got_chat_in(zgc, zt2->id, send_inst, FALSE,
-                                                         buf3, time(NULL));
+					serv_got_chat_in(zgc, zt2->id, send_inst, FALSE, buf3, time(NULL));
 
-                                        gconv1 = gaim_find_conversation_with_account(zt2->name,zgc->account);
-                                        gcc = gaim_conversation_get_chat_data(gconv1);
-                                        /*                                        gaim_conv_chat_set_topic(gcc,sendertmp,notice.z_class_inst);  */
-                                        for(gltmp = gaim_conv_chat_get_users(gcc);gltmp;gltmp=gltmp->next) {
-                                                if (!g_ascii_strcasecmp(gltmp->data,sendertmp) )
-                                                    found = 1;
-                                        }
-                                        if (!found) {
-                                                /* force interpretation in network byte order */
-                                                unsigned char* addrs = (unsigned char *)&(notice.z_sender_addr.s_addr);
-                                                gaim_conv_chat_add_user(gcc,sendertmp,g_strdup_printf("%hhd.%hhd.%hhd.%hhd",
-                                                                                                      (unsigned char)addrs[0],
-                                                                                                      (unsigned char)addrs[1],
-                                                                                                      (unsigned char)addrs[2],
-                                                                                                      (unsigned char)addrs[3]));
-                                                
-                                        }
+					gconv1 = gaim_find_conversation_with_account(zt2->name, zgc->account);
+					gcc = gaim_conversation_get_chat_data(gconv1);
+					/*                                        gaim_conv_chat_set_topic(gcc,sendertmp,notice.z_class_inst);  */
+					for (gltmp = gaim_conv_chat_get_users(gcc); gltmp; gltmp = gltmp->next) {
+						if (!g_ascii_strcasecmp(gltmp->data, sendertmp))
+							found = 1;
+					}
+					if (!found) {
+						/* force interpretation in network byte order */
+						unsigned char *addrs = (unsigned char *)&(notice.z_sender_addr.s_addr);
+
+						gaim_conv_chat_add_user(gcc, sendertmp, g_strdup_printf("%hhd.%hhd.%hhd.%hhd", (unsigned char)addrs[0], (unsigned char)addrs[1], (unsigned char)addrs[2], (unsigned char)
+																				addrs[3]));
+
+					}
 					g_free(sendertmp);
 					g_free(send_inst);
 				}
@@ -667,6 +665,7 @@
 	while (ZPending()) {
 		ZNotice_t notice;
 		struct sockaddr_in from;
+
 		z_call_r(ZReceiveNotice(&notice, &from));
 
 		switch (notice.z_kind) {
@@ -675,11 +674,11 @@
 		case ACKED:
 			handle_message(notice, from);
 			break;
-               case SERVACK:
-                        if(!(g_ascii_strcasecmp(notice.z_message,ZSRVACK_NOTSENT))){
-                                message_failed(notice,from);
-                        }
-                        break;
+		case SERVACK:
+			if (!(g_ascii_strcasecmp(notice.z_message, ZSRVACK_NOTSENT))) {
+				message_failed(notice, from);
+			}
+			break;
 		default:
 			/* we'll just ignore things for now */
 			gaim_debug(GAIM_DEBUG_WARNING, "zephyr", "Unhandled notice.\n");
@@ -701,18 +700,20 @@
 	memset(&(ald.uid), 0, sizeof(ZUnique_Id_t));
 	ald.version = NULL;
 
-	for(gnode = gaim_get_blist()->root; gnode; gnode = gnode->next) {
-		if(!GAIM_BLIST_NODE_IS_GROUP(gnode))
+	for (gnode = gaim_get_blist()->root; gnode; gnode = gnode->next) {
+		if (!GAIM_BLIST_NODE_IS_GROUP(gnode))
 			continue;
-		for(cnode = gnode->child; cnode; cnode = cnode->next) {
-			if(!GAIM_BLIST_NODE_IS_CONTACT(cnode))
+		for (cnode = gnode->child; cnode; cnode = cnode->next) {
+			if (!GAIM_BLIST_NODE_IS_CONTACT(cnode))
 				continue;
-			for(bnode = cnode->child; bnode; bnode = bnode->next) {
-				GaimBuddy *b = (GaimBuddy *)bnode;
-				if(!GAIM_BLIST_NODE_IS_BUDDY(bnode))
+			for (bnode = cnode->child; bnode; bnode = bnode->next) {
+				GaimBuddy *b = (GaimBuddy *) bnode;
+
+				if (!GAIM_BLIST_NODE_IS_BUDDY(bnode))
 					continue;
-				if(b->account->gc == zgc) {
+				if (b->account->gc == zgc) {
 					const char *chk;
+
 					chk = local_zephyr_normalize(b->name);
 					/* doesn't matter if this fails or not; we'll just move on to the next one */
 					ZRequestLocations(chk, &ald, UNACKED, ZAUTH);
@@ -748,6 +749,7 @@
 static void strip_comments(char *str)
 {
 	char *tmp = strchr(str, '#');
+
 	if (tmp)
 		*tmp = '\0';
 	g_strchug(str);
@@ -759,26 +761,28 @@
 	FILE *f;
 	gchar *fname;
 	gchar buff[BUFSIZ];
-	
+
 	fname = g_strdup_printf("%s/.zephyr.subs", gaim_home_dir());
 	f = fopen(fname, "r");
 	if (f) {
 		char **triple;
 		ZSubscription_t sub;
 		char *recip;
+
 		while (fgets(buff, BUFSIZ, f)) {
 			strip_comments(buff);
 			if (buff[0]) {
 				triple = g_strsplit(buff, ",", 3);
-				if (triple[0] && triple[1] ) {
-					char *tmp = g_strdup_printf("%s",gaim_zephyr_get_sender());
+				if (triple[0] && triple[1]) {
+					char *tmp = g_strdup_printf("%s", gaim_zephyr_get_sender());
 					char *atptr;
+
 					sub.zsub_class = triple[0];
 					sub.zsub_classinst = triple[1];
-					if(triple[2] == NULL) {
+					if (triple[2] == NULL) {
 						recip = g_malloc0(1);
 					} else if (!g_ascii_strcasecmp(triple[2], "%me%")) {
-						recip = g_strdup_printf("%s",gaim_zephyr_get_sender());
+						recip = g_strdup_printf("%s", gaim_zephyr_get_sender());
 					} else if (!g_ascii_strcasecmp(triple[2], "*")) {
 						/* wildcard
 						 * form of class,instance,* */
@@ -792,7 +796,9 @@
 						 * If realm is local realm, blank recipient, else
 						 * @REALM-NAME
 						 */
-						char *realmat = g_strdup_printf("@%s", gaim_zephyr_get_realm());
+						char *realmat = g_strdup_printf("@%s",
+														gaim_zephyr_get_realm());
+
 						if (!g_ascii_strcasecmp(atptr, realmat))
 							recip = g_malloc0(1);
 						else
@@ -804,14 +810,9 @@
 					g_free(tmp);
 					sub.zsub_recipient = recip;
 					if (ZSubscribeTo(&sub, 1, 0) != ZERR_NONE) {
-						gaim_debug(GAIM_DEBUG_ERROR, "zephyr",
-								   "Couldn't subscribe to %s, %s, %s\n",
-								   sub.zsub_class,
-								   sub.zsub_classinst,
-								   sub.zsub_recipient);
+						gaim_debug(GAIM_DEBUG_ERROR, "zephyr", "Couldn't subscribe to %s, %s, %s\n", sub.zsub_class, sub.zsub_classinst, sub.zsub_recipient);
 					}
-					subscrips = g_slist_append(subscrips,
-								new_triple(triple[0], triple[1], recip));
+					subscrips = g_slist_append(subscrips, new_triple(triple[0], triple[1], recip));
 					g_free(recip);
 				}
 				g_strfreev(triple);
@@ -837,35 +838,33 @@
 		while (fgets(buff, BUFSIZ, fd)) {
 			strip_comments(buff);
 			if (buff[0]) {
-                                if(! (b=gaim_find_buddy(zgc->account,buff))) {
-                                        b = gaim_buddy_new(zgc->account, buff, NULL);
-                                        gaim_blist_add_buddy(b, NULL, g, NULL);
-                                }
-                        }
+				if (!(b = gaim_find_buddy(zgc->account, buff))) {
+					b = gaim_buddy_new(zgc->account, buff, NULL);
+					gaim_blist_add_buddy(b, NULL, g, NULL);
+				}
+			}
 		}
 		fclose(fd);
 	}
 	g_free(filename);
 }
 
-static void zephyr_login(GaimAccount *account)
+static void zephyr_login(GaimAccount * account)
 {
 	ZSubscription_t sub;
 
 	if (zgc) {
 		gaim_notify_error(account->gc, NULL,
-						  _("Already logged in with Zephyr"),
-						  _("Because Zephyr uses your system username, you "
-							"are unable to have multiple accounts on it "
-							"when logged in as the same user."));
+						  _("Already logged in with Zephyr"), _("Because Zephyr uses your system username, you " "are unable to have multiple accounts on it " "when logged in as the same user."));
 		return;
 	}
 
 	zgc = gaim_account_get_connection(account);
-       zgc->flags |= GAIM_CONNECTION_HTML; 
+	zgc->flags |= GAIM_CONNECTION_HTML;
 	z_call_s(ZInitialize(), "Couldn't initialize zephyr");
 	z_call_s(ZOpenPort(NULL), "Couldn't open port");
-	z_call_s(ZSetLocation((char *)gaim_account_get_string(zgc->account,"exposure_level",EXPOSE_REALMVIS)), "Couldn't set location");
+	z_call_s(ZSetLocation((char *)
+						  gaim_account_get_string(zgc->account, "exposure_level", EXPOSE_REALMVIS)), "Couldn't set location");
 
 	sub.zsub_class = "MESSAGE";
 	sub.zsub_classinst = "PERSONAL";
@@ -873,8 +872,7 @@
 
 	/* we don't care if this fails. i'm lying right now. */
 	if (ZSubscribeTo(&sub, 1, 0) != ZERR_NONE) {
-		gaim_debug(GAIM_DEBUG_ERROR, "zephyr",
-				   "Couldn't subscribe to messages!\n");
+		gaim_debug(GAIM_DEBUG_ERROR, "zephyr", "Couldn't subscribe to messages!\n");
 	}
 
 	gaim_connection_set_state(zgc, GAIM_CONNECTED);
@@ -894,28 +892,29 @@
 	FILE *fd;
 	char *fname;
 
-	char** triple;
+	char **triple;
+
 	fname = g_strdup_printf("%s/.zephyr.subs", gaim_home_dir());
 	fd = fopen(fname, "w");
-	
+
 	if (!fd) {
 		g_free(fname);
 		return;
 	}
-	
+
 	while (s) {
 		zt = s->data;
-		triple = g_strsplit(zt->name,",",3);
+		triple = g_strsplit(zt->name, ",", 3);
 		if (triple[2] != NULL) {
 			if (!g_ascii_strcasecmp(triple[2], "")) {
 				fprintf(fd, "%s,%s,*\n", triple[0], triple[1]);
 			} else if (!g_ascii_strcasecmp(triple[2], gaim_zephyr_get_sender())) {
-				fprintf(fd, "%s,%s,%%me%%\n",triple[0],triple[1]);
+				fprintf(fd, "%s,%s,%%me%%\n", triple[0], triple[1]);
 			} else {
 				fprintf(fd, "%s\n", zt->name);
 			}
 		} else {
-			fprintf(fd, "%s,%s,*\n",triple[0], triple[1]);
+			fprintf(fd, "%s,%s,*\n", triple[0], triple[1]);
 		}
 		g_free(triple);
 		s = s->next;
@@ -938,23 +937,23 @@
 		return;
 	}
 
-	for(gnode = gaim_get_blist()->root; gnode; gnode = gnode->next) {
-		if(!GAIM_BLIST_NODE_IS_GROUP(gnode))
+	for (gnode = gaim_get_blist()->root; gnode; gnode = gnode->next) {
+		if (!GAIM_BLIST_NODE_IS_GROUP(gnode))
 			continue;
-		for(cnode = gnode->child; cnode; cnode = cnode->next) {
-			if(!GAIM_BLIST_NODE_IS_CONTACT(cnode))
+		for (cnode = gnode->child; cnode; cnode = cnode->next) {
+			if (!GAIM_BLIST_NODE_IS_CONTACT(cnode))
 				continue;
-			for(bnode = cnode->child; bnode; bnode = bnode->next) {
-				if(!GAIM_BLIST_NODE_IS_BUDDY(bnode))
+			for (bnode = cnode->child; bnode; bnode = bnode->next) {
+				if (!GAIM_BLIST_NODE_IS_BUDDY(bnode))
 					continue;
-				b = (GaimBuddy *)bnode;
-				if(b->account == zgc->account) {
+				b = (GaimBuddy *) bnode;
+				if (b->account == zgc->account) {
 					if ((ptr = strchr(b->name, '@')) != NULL) {
 						ptr2 = ptr + 1;
 						/* We should only strip the realm name if the principal
 						   is in the user's realm
-						   */
-						if (!g_ascii_strcasecmp(ptr2,gaim_zephyr_get_realm())) {
+						 */
+						if (!g_ascii_strcasecmp(ptr2, gaim_zephyr_get_realm())) {
 							*ptr = '\0';
 						}
 					}
@@ -970,30 +969,31 @@
 	g_free(fname);
 }
 
-static void zephyr_close(GaimConnection *gc)
+static void zephyr_close(GaimConnection * gc)
 {
 	GList *l;
 	GSList *s;
+
 	l = pending_zloc_names;
 	while (l) {
-		g_free((char*)l->data);
+		g_free((char *)l->data);
 		l = l->next;
 	}
 	g_list_free(pending_zloc_names);
-	
-	if (gaim_account_get_bool(zgc->account,"write_anyone",FALSE))
+
+	if (gaim_account_get_bool(zgc->account, "write_anyone", FALSE))
 		write_anyone();
-        
-	if (gaim_account_get_bool(zgc->account,"write_zsubs",FALSE))
+
+	if (gaim_account_get_bool(zgc->account, "write_zsubs", FALSE))
 		write_zsubs();
-	
+
 	s = subscrips;
 	while (s) {
-		free_triple((zephyr_triple*)s->data);
+		free_triple((zephyr_triple *) s->data);
 		s = s->next;
 	}
 	g_slist_free(subscrips);
-	
+
 	if (nottimer)
 		gaim_timeout_remove(nottimer);
 	nottimer = 0;
@@ -1006,78 +1006,39 @@
 	z_call(ZClosePort());
 }
 
-static void zephyr_add_buddy(GaimConnection *gc, const char *buddy, GaimGroup *group) { 
-        GaimBuddy *b;
-        if(! (b=gaim_find_buddy(zgc->account,buddy))) {
-                b = gaim_buddy_new(zgc->account, buddy, NULL);
-                gaim_blist_add_buddy(b, NULL, group, NULL);
-        }
-}
-
-static void zephyr_add_buddies(GaimConnection *gc, GList* buddies) {
-        GaimGroup *group;
-	if (!(group = gaim_find_group(_("Anyone")))) {
-		group = gaim_group_new(_("Anyone"));
-		gaim_blist_add_group(group, NULL);
-	}
-        while (buddies) {
-                zephyr_add_buddy(gc, buddies->data, group);
-                buddies = buddies->next;
-        }
-}
-
-static void zephyr_remove_buddy(GaimConnection *gc, const char *buddy, const char *group) { 
-        GaimBuddy *b;
-        fprintf(stderr,"In zephyr_remove_buddy %s %s\n",buddy,group);
-        if (!(b=gaim_find_buddy(zgc->account,buddy))) {
-                fprintf(stderr,"attempt to remove non-existent buddy %s\n",buddy);
-            /*    gaim_blist_remove_buddy(b); */
-	}
-}
-
-static void zephyr_remove_buddies(GaimConnection *gc, GList *buddies, const char *group) {
-        GaimBuddy *b;
-        while(buddies) {
-                if ((b=gaim_find_buddy(zgc->account,buddies->data))) {
-                        fprintf(stderr,"attempt to remove non-existent buddy %s\n",(char *)buddies->data);
-                        /*  gaim_blist_remove_buddy(b); */
-                } 
-        }      
-}
-
-static int zephyr_chat_send(GaimConnection *gc, int id, const char *im)
+static int zephyr_chat_send(GaimConnection * gc, int id, const char *im)
 {
 	ZNotice_t notice;
 	zephyr_triple *zt;
 	char *buf;
 	const char *sig;
-        GaimConversation * gconv1;
-        GaimConvChat* gcc;
-        char * inst;
-        char * html_buf;
-        char * html_buf2;
+	GaimConversation *gconv1;
+	GaimConvChat *gcc;
+	char *inst;
+	char *html_buf;
+	char *html_buf2;
 
 	zt = find_sub_by_id(id);
 	if (!zt)
 		/* this should never happen. */
 		return -EINVAL;
-	
+
 	sig = ZGetVariable("zwrite-signature");
 	if (!sig) {
 		sig = g_get_real_name();
 	}
 
-       html_buf = html_to_zephyr(im);
-       html_buf2 = gaim_unescape_html(html_buf);
+	html_buf = html_to_zephyr(im);
+	html_buf2 = gaim_unescape_html(html_buf);
 
 	buf = g_strdup_printf("%s%c%s", sig, '\0', html_buf2);
 
-        gconv1 = gaim_find_conversation_with_account(zt->name,zgc->account);
-        gcc = gaim_conversation_get_chat_data(gconv1);
+	gconv1 = gaim_find_conversation_with_account(zt->name, zgc->account);
+	gcc = gaim_conversation_get_chat_data(gconv1);
 
-        if(!(inst = (char *)gaim_conv_chat_get_topic(gcc)))
-                inst = (char *)notice.z_class_inst;
-                
+	if (!(inst = (char *)gaim_conv_chat_get_topic(gcc)))
+		inst = (char *)notice.z_class_inst;
+
 	bzero((char *)&notice, sizeof(notice));
 	notice.z_kind = ACKED;
 	notice.z_port = 0;
@@ -1089,26 +1050,25 @@
 	else
 		notice.z_recipient = local_zephyr_normalize(zt->recipient);
 	notice.z_sender = 0;
-	notice.z_default_format =
-		"Class $class, Instance $instance:\n"
-		"To: @bold($recipient) at $time $date\n"
-		"From: @bold($1) <$sender>\n\n$2";
+	notice.z_default_format = "Class $class, Instance $instance:\n" "To: @bold($recipient) at $time $date\n" "From: @bold($1) <$sender>\n\n$2";
 	notice.z_message_len = strlen(html_buf2) + strlen(sig) + 2;
 	notice.z_message = buf;
-       g_free(html_buf);
-       g_free(html_buf2);
+	g_free(html_buf);
+	g_free(html_buf2);
 
 	ZSendNotice(&notice, ZAUTH);
 	g_free(buf);
 	return 0;
 }
 
-static int zephyr_send_im(GaimConnection *gc, const char *who, const char *im, GaimConvImFlags flags) {
+static int zephyr_send_im(GaimConnection * gc, const char *who, const char *im, GaimConvImFlags flags)
+{
 	ZNotice_t notice;
 	char *buf;
 	const char *sig;
-       char *html_buf;
-       char *html_buf2;
+	char *html_buf;
+	char *html_buf2;
+
 	if (flags & GAIM_CONV_IM_AUTO_RESP)
 		sig = "Automated reply:";
 	else {
@@ -1118,8 +1078,8 @@
 		}
 	}
 
-       html_buf = html_to_zephyr(im);
-       html_buf2 = gaim_unescape_html(html_buf);
+	html_buf = html_to_zephyr(im);
+	html_buf2 = gaim_unescape_html(html_buf);
 
 	buf = g_strdup_printf("%s%c%s", sig, '\0', html_buf2);
 	bzero((char *)&notice, sizeof(notice));
@@ -1130,67 +1090,66 @@
 	notice.z_class_inst = "PERSONAL";
 	notice.z_sender = 0;
 	notice.z_recipient = who;
-	notice.z_default_format =
-		"Class $class, Instance $instance:\n"
-		"To: @bold($recipient) at $time $date\n"
-		"From: @bold($1) <$sender>\n\n$2";
+	notice.z_default_format = "Class $class, Instance $instance:\n" "To: @bold($recipient) at $time $date\n" "From: @bold($1) <$sender>\n\n$2";
 	notice.z_message_len = strlen(html_buf2) + strlen(sig) + 2;
 	notice.z_message = buf;
-       g_free(html_buf2);
-       g_free(html_buf);
+	g_free(html_buf2);
+	g_free(html_buf);
 
 	ZSendNotice(&notice, ZAUTH);
 	g_free(buf);
 	return 1;
 }
 
-static const char *zephyr_normalize(const GaimAccount *account,const char *orig)
+static const char *zephyr_normalize(const GaimAccount * account, const char *orig)
 {
 	static char buf[80];
+
 	if (!g_ascii_strcasecmp(orig, "")) {
 		buf[0] = '\0';
 		return buf;
 	} else {
-                g_snprintf(buf,80,"%s",orig);
-        }
-        return buf;
+		g_snprintf(buf, 80, "%s", orig);
+	}
+	return buf;
 }
 
 
 static const char *local_zephyr_normalize(const char *orig)
 {
-	static  char buf[80];
+	static char buf[80];
+
 	if (!g_ascii_strcasecmp(orig, "")) {
 		buf[0] = '\0';
 		return buf;
 	}
-        
+
 	if (strchr(orig, '@')) {
 		g_snprintf(buf, 80, "%s", orig);
 	} else {
-                g_snprintf(buf,80,"%s@%s",orig,gaim_zephyr_get_realm());
+		g_snprintf(buf, 80, "%s@%s", orig, gaim_zephyr_get_realm());
 	}
 	return buf;
 }
 
-static void zephyr_zloc(GaimConnection *gc, const char *who)
+static void zephyr_zloc(GaimConnection * gc, const char *who)
 {
 	ZAsyncLocateData_t ald;
 
 	if (ZRequestLocations(local_zephyr_normalize(who), &ald, UNACKED, ZAUTH)
-					!= ZERR_NONE) {
+		!= ZERR_NONE) {
 		return;
 	}
-	pending_zloc_names = g_list_append(pending_zloc_names,
-					g_strdup(local_zephyr_normalize(who)));
+	pending_zloc_names = g_list_append(pending_zloc_names, g_strdup(local_zephyr_normalize(who)));
 }
 
-static GList *zephyr_buddy_menu(GaimConnection *gc, const char *who)
+static GList *zephyr_buddy_menu(GaimConnection * gc, const char *who)
 {
 	GList *m = NULL;
 	struct proto_buddy_menu *pbm;
 
 	pbm = g_new0(struct proto_buddy_menu, 1);
+
 	pbm->label = _("ZLocate");
 	pbm->callback = zephyr_zloc;
 	pbm->gc = gc;
@@ -1199,7 +1158,7 @@
 	return m;
 }
 
-static void zephyr_set_away(GaimConnection *gc, const char *state, const char *msg)
+static void zephyr_set_away(GaimConnection * gc, const char *state, const char *msg)
 {
 	if (gc->away) {
 		g_free(gc->away);
@@ -1215,7 +1174,7 @@
 		gc->away = g_strdup(msg);
 }
 
-static GList *zephyr_away_states(GaimConnection *gc)
+static GList *zephyr_away_states(GaimConnection * gc)
 {
 	GList *m = NULL;
 
@@ -1226,21 +1185,25 @@
 	return m;
 }
 
-static GList *zephyr_chat_info(GaimConnection *gc) {
+static GList *zephyr_chat_info(GaimConnection * gc)
+{
 	GList *m = NULL;
 	struct proto_chat_entry *pce;
 
 	pce = g_new0(struct proto_chat_entry, 1);
+
 	pce->label = _("_Class:");
 	pce->identifier = "class";
 	m = g_list_append(m, pce);
 
 	pce = g_new0(struct proto_chat_entry, 1);
+
 	pce->label = _("_Instance:");
 	pce->identifier = "instance";
 	m = g_list_append(m, pce);
 
 	pce = g_new0(struct proto_chat_entry, 1);
+
 	pce->label = _("_Recipient:");
 	pce->identifier = "recipient";
 	m = g_list_append(m, pce);
@@ -1248,7 +1211,7 @@
 	return m;
 }
 
-static void zephyr_join_chat(GaimConnection *gc, GHashTable *data)
+static void zephyr_join_chat(GaimConnection * gc, GHashTable * data)
 {
 	ZSubscription_t sub;
 	zephyr_triple *zt1, *zt2;
@@ -1289,9 +1252,10 @@
 	serv_got_joined_chat(gc, zt1->id, zt1->name);
 }
 
-static void zephyr_chat_leave(GaimConnection *gc, int id)
+static void zephyr_chat_leave(GaimConnection * gc, int id)
 {
 	zephyr_triple *zt;
+
 	zt = find_sub_by_id(id);
 	if (zt) {
 		zt->open = FALSE;
@@ -1299,30 +1263,30 @@
 	}
 }
 
-static const char *zephyr_list_icon(GaimAccount *a, GaimBuddy *b)
+static const char *zephyr_list_icon(GaimAccount * a, GaimBuddy * b)
 {
 	return "zephyr";
 }
 
 
-static void zephyr_chat_set_topic(GaimConnection *gc, int id, const char *topic) {
-        zephyr_triple *zt;
-        GaimConversation *gconv;
-        GaimConvChat* gcc;
-        char* sender = (char *)gaim_zephyr_get_sender();
+static void zephyr_chat_set_topic(GaimConnection * gc, int id, const char *topic)
+{
+	zephyr_triple *zt;
+	GaimConversation *gconv;
+	GaimConvChat *gcc;
+	char *sender = (char *)gaim_zephyr_get_sender();
 
-        zt = find_sub_by_id(id);
-        gconv = gaim_find_conversation_with_account(zt->name,zgc->account);
-        gcc = gaim_conversation_get_chat_data(gconv);
-        gaim_conv_chat_set_topic(gcc,sender,topic);
-        
+	zt = find_sub_by_id(id);
+	gconv = gaim_find_conversation_with_account(zt->name, zgc->account);
+	gcc = gaim_conversation_get_chat_data(gconv);
+	gaim_conv_chat_set_topic(gcc, sender, topic);
+
 }
 
 static GaimPlugin *my_protocol = NULL;
 
-static GaimPluginProtocolInfo prpl_info =
-{
-	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_NO_PASSWORD, 
+static GaimPluginProtocolInfo prpl_info = {
+	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_NO_PASSWORD,
 	NULL,
 	NULL,
 	NULL,
@@ -1346,10 +1310,10 @@
 	NULL,
 	NULL,
 	NULL,
-	zephyr_add_buddy,
-	zephyr_add_buddies,
-	zephyr_remove_buddy,
-	zephyr_remove_buddies,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
 	NULL,
 	NULL,
 	NULL,
@@ -1357,7 +1321,7 @@
 	NULL,
 	NULL,
 	zephyr_join_chat,
-	NULL, /* reject chat invite */
+	NULL,						/* reject chat invite */
 	NULL,
 	zephyr_chat_leave,
 	NULL,
@@ -1376,56 +1340,55 @@
 	NULL,
 	NULL,
 	zephyr_chat_set_topic,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
-static GaimPluginInfo info =
-{
-	2,                                                /**< api_version    */
-	GAIM_PLUGIN_PROTOCOL,                             /**< type           */
-	NULL,                                             /**< ui_requirement */
-	0,                                                /**< flags          */
-	NULL,                                             /**< dependencies   */
-	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
+static GaimPluginInfo info = {
+	2,							  /**< api_version    */
+	GAIM_PLUGIN_PROTOCOL,				  /**< type           */
+	NULL,						  /**< ui_requirement */
+	0,							  /**< flags          */
+	NULL,						  /**< dependencies   */
+	GAIM_PRIORITY_DEFAULT,				  /**< priority       */
 
-	"prpl-zephyr",                                     /**< id             */
-	"Zephyr",                                        /**< name           */
-	VERSION,                                          /**< version        */
-	                                                  /**  summary        */
+	"prpl-zephyr",					   /**< id             */
+	"Zephyr",						 /**< name           */
+	VERSION,						  /**< version        */
+							  /**  summary        */
 	N_("Zephyr Protocol Plugin"),
-	                                                  /**  description    */
+							  /**  description    */
 	N_("Zephyr Protocol Plugin"),
-	NULL,                                             /**< author         */
-	GAIM_WEBSITE,                                     /**< homepage       */
+	NULL,						  /**< author         */
+	GAIM_WEBSITE,					  /**< homepage       */
 
-	NULL,                                             /**< load           */
-	NULL,                                             /**< unload         */
-	NULL,                                             /**< destroy        */
+	NULL,						  /**< load           */
+	NULL,						  /**< unload         */
+	NULL,						  /**< destroy        */
 
-	NULL,                                             /**< ui_info        */
-	&prpl_info                                        /**< extra_info     */
+	NULL,						  /**< ui_info        */
+	&prpl_info						  /**< extra_info     */
 };
 
-static void
-init_plugin(GaimPlugin *plugin)
+static void init_plugin(GaimPlugin * plugin)
 {
 	GaimAccountOption *option;
-        char* tmp = get_exposure_level();
-	option = gaim_account_option_bool_new(_("Export to .anyone"),"write_anyone",FALSE);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,option);
+	char *tmp = get_exposure_level();
+
+	option = gaim_account_option_bool_new(_("Export to .anyone"), "write_anyone", FALSE);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	option = gaim_account_option_bool_new(_("Export to .zephyr.subs"),"write_zsubs",FALSE);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,option);
+	option = gaim_account_option_bool_new(_("Export to .zephyr.subs"), "write_zsubs", FALSE);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	option = gaim_account_option_string_new(_("Exposure"),"exposure_level",tmp?tmp:EXPOSE_REALMVIS);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,option);
+	option = gaim_account_option_string_new(_("Exposure"), "exposure_level", tmp ? tmp : EXPOSE_REALMVIS);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	option = gaim_account_option_string_new(_("Encoding"),"encoding",ZEPHYR_FALLBACK_CHARSET);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,option);
+	option = gaim_account_option_string_new(_("Encoding"), "encoding", ZEPHYR_FALLBACK_CHARSET);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 	my_protocol = plugin;
 }