Mercurial > pidgin

changeset 14254:360c016459d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 16936] Cleaning up after myself: free data *after* using it. And if gstreamer fails, and the user switches to a different method, sound should stil work. committer: Tailor Script <tailor@pidgin.im>
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Mon, 21 Aug 2006 03:13:08 +0000
parents dc0afefc19d8
children 26ae644bb66b
files gtk/gtksound.c gtk/gtkstatusbox.c
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/gtksound.c	Mon Aug 21 03:04:12 2006 +0000
+++ b/gtk/gtksound.c	Mon Aug 21 03:13:08 2006 +0000
@@ -314,7 +314,6 @@
 			g_error_free(error);
 			error = NULL;
 		}
-		return;
 	}
 #endif /* USE_GSTREAMER */
 
--- a/gtk/gtkstatusbox.c	Mon Aug 21 03:04:12 2006 +0000
+++ b/gtk/gtkstatusbox.c	Mon Aug 21 03:13:08 2006 +0000
@@ -1055,9 +1055,9 @@
 				if (prplinfo && prplinfo->icon_spec.format) {
 					char *icon = gaim_gtk_convert_buddy_icon(plug, filename);
 					gaim_account_set_buddy_icon(box->account, icon);
-					g_free(icon);
 					gaim_account_set_ui_bool(box->account, GAIM_GTK_UI, "use-global-buddyicon", FALSE);
 					gaim_account_set_ui_string(box->account, GAIM_GTK_UI, "non-global-buddyicon", icon);
+					g_free(icon);
 				}
 			}
 		} else {