im.pidgin.pidgin.custom_smiley: 5af673379276a9bc4092b0a1b8beb7b16a655ce0

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 5af673379276a9bc4092b0a1b8beb7b16a655ce0
Ancestor: 857f501405d270261689deef43795647f558538a
Author: sadrul at pidgin.im
Date: 2008-02-19T19:57:09
Branch: im.pidgin.pidgin.custom_smiley
URL: http://d.pidgin.im/viewmtn/revision/info/5af673379276a9bc4092b0a1b8beb7b16a655ce0

Modified files:
        libpurple/smiley.c

ChangeLog: 

Make some functions static, plug a leak.

-------------- next part --------------
============================================================
--- libpurple/smiley.c	b1c6b19b4bc8d50847fadf9aa39e5535208c6527
+++ libpurple/smiley.c	5f632e97a9e16bf49530e658b75edc86e917f34a
@@ -99,10 +99,10 @@ static PurpleSmiley *purple_smiley_creat
 
 static PurpleSmiley *purple_smiley_create(const char *shortcut);
 
-PurpleSmiley *purple_smiley_load_file(const char *shortcut, const char *checksum,
+static PurpleSmiley *purple_smiley_load_file(const char *shortcut, const char *checksum,
 		const char *filename);
 
-void
+static void
 purple_smiley_set_data_impl(PurpleSmiley *smiley, guchar *smiley_data,
 		size_t smiley_data_len, const char *filename);
 
@@ -282,7 +282,7 @@ static char *get_file_full_path(const ch
 	return path;
 }
 
-PurpleSmiley *
+static PurpleSmiley *
 purple_smiley_load_file(const char *shortcut, const char *checksum, const char *filename)
 {
 	PurpleSmiley *smiley = NULL;
@@ -299,8 +299,10 @@ purple_smiley_load_file(const char *shor
 		return NULL;
 
 	smiley = purple_smiley_create(shortcut);
-	if (!smiley)
+	if (!smiley) {
+		g_free(fullpath);
 		return NULL;
+	}
 
 	smiley->checksum = g_strdup(checksum);
 
@@ -310,6 +312,8 @@ purple_smiley_load_file(const char *shor
 	else
 		purple_smiley_delete(smiley);
 
+	g_free(fullpath);
+
 	return smiley;
 }
 
@@ -420,7 +424,7 @@ purple_smiley_data_new(guchar *smiley_da
 	return stored_img;
 }
 
-void
+static void
 purple_smiley_set_data_impl(PurpleSmiley *smiley, guchar *smiley_data,
 				size_t smiley_data_len, const char *filename)
 {