# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 967763047 0
# Node ID 09e9685e24b918174b5b810e07fa694e03a9c5e4
# Parent  4544fe6c492f63108596c9cf02eea950740ce2a7
[gaim-migrate @ 826]
lalala. i think that broke things.

committer: Tailor Script <tailor@pidgin.im>

diff -r 4544fe6c492f -r 09e9685e24b9 src/conversation.c
--- a/src/conversation.c	Thu Aug 31 22:46:59 2000 +0000
+++ b/src/conversation.c	Thu Aug 31 23:04:07 2000 +0000
@@ -998,11 +998,7 @@
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, &window->style->base[GTK_STATE_NORMAL], tongue_xpm);
 	}
 
-	if (face || strlen(m) < 3) {
-		gdk_bitmap_unref(mask);
-		return face;
-	}
-
+	if (face || strlen(m) < 3) return face;
 	*len = 3;
 	if (	   !strncmp(m, ":-)", 3)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, &window->style->base[GTK_STATE_NORMAL], smile_xpm);
@@ -1042,11 +1038,7 @@
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, &window->style->base[GTK_STATE_NORMAL], bigsmile_xpm);
 	}
 
-	if (face || strlen(m) < 4) {
-		gdk_bitmap_unref(mask);
-		return face;
-	}
-
+	if (face || strlen(m) < 4) return face;
 	*len = 4;
 	if (	   !strncmp(m, "O:-)", 4)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, &window->style->base[GTK_STATE_NORMAL], angel_xpm);
@@ -1055,17 +1047,12 @@
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, &window->style->base[GTK_STATE_NORMAL], luke03_xpm);
 	}
 
-	if (face || strlen(m) < 6) {
-		gdk_bitmap_unref(mask);
-		return face;
-	}
-
+	if (face || strlen(m) < 6) return face;
 	*len = 6;
 	if (	   !strncmp(m, "&gt;:o", 6)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, &window->style->base[GTK_STATE_NORMAL], yell_xpm);
 	}
 
-	if (face) gdk_bitmap_unref(mask);
 	return face;
 }