Mercurial > pidgin

changeset 816:09e9685e24b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 826] lalala. i think that broke things. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Thu, 31 Aug 2000 23:04:07 +0000
parents 4544fe6c492f
children aefd5f2b1ea0
files src/conversation.c
diffstat 1 files changed, 3 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- 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;
 }