diff src/gtkconv.c @ 10812:d087e928ffd1

[gaim-migrate @ 12465] " A variety of spacing normalization I've done as I've navigated the source making other changes. The specific changes should be uncontroversial. I'm submitting these to shrink the deltas between my local tree and the CVS source. If spacing changes are unwelcome as a general rule, let me know." --rlaager I said not to do this sort of patch often. also a spelling fix. committer: Tailor Script <[e-mail]>

--- a/src/gtkconv.c	Mon Apr 11 04:07:50 2005 +0000
+++ b/src/gtkconv.c	Mon Apr 11 04:32:26 2005 +0000
@@ -81,7 +81,7 @@
 	{0, 57344, 46592, 44800},       /* Red Hilight */
 	{0, 49408, 26112, 23040},       /* Red Medium */
 	{0, 34816, 17920, 12544},       /* Red Dark */
-	{0, 49408, 14336, 8704},        /* Red Shadow */
+	{0, 49408, 14336,  8704},       /* Red Shadow */
 	{0, 34816, 32512, 41728},       /* Purple Medium */
 	{0, 25088, 23296, 33024},       /* Purple Dark */
 	{0, 18688, 16384, 26112},       /* Purple Shadow */
@@ -90,11 +90,11 @@
 	{0, 57344, 49920, 40448},       /* Face Skin Medium */
 	{0, 45824, 37120, 26880},       /* Face skin Dark */
 	{0, 33280, 26112, 18176},       /* Face Skin Shadow */
-	{0, 57088, 16896, 7680},        /* Accent Red */
-	{0, 39168, 0, 0},               /* Accent Red Dark */
+	{0, 57088, 16896,  7680},       /* Accent Red */
+	{0, 39168,     0,     0},       /* Accent Red Dark */
 	{0, 60928, 54784, 32768},       /* Accent Yellow */
 	{0, 17920, 40960, 17920},       /* Accent Green */
-	{0, 9728, 50944, 9728}          /* Accent Green Dark */
+	{0,  9728, 50944,  9728}        /* Accent Green Dark */
 };
 
 #define NUM_NICK_COLORS (sizeof(nick_colors) / sizeof(*nick_colors))
@@ -4977,8 +4977,7 @@
 
 	g_snprintf(tmp, sizeof(tmp),
 			   ngettext("%d person in room", "%d people in room",
-						num_users),
-			   num_users);
+						num_users), num_users);
 
 	gtk_label_set_text(GTK_LABEL(gtkchat->count), tmp);
 
@@ -5133,8 +5132,7 @@
 	for (l = users; l != NULL; l = l->next) {
 		model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list));
 
-		if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model),
-					&iter))
+		if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter))
 			continue;
 
 		do {
@@ -5248,7 +5246,7 @@
 
 	/* this is wrong, this file ought not call g_new on GtkIMHtmlSmiley */
 	/* Let gtk_imhtml have a gtk_imhtml_smiley_new function, and let
-	   GtkIMHtmlSmiley by opque */
+	   GtkIMHtmlSmiley by opaque */
 	smiley = g_new0(GtkIMHtmlSmiley, 1);
 	smiley->file   = NULL;
 	smiley->smile  = g_strdup(smile);