[Gaim-commits] SF.net SVN: gaim: [16936] trunk/gtk

[<sa...@us...>]

Revision: 16936
Author:   sadrul
Date:     2006-08-20 20:13:08 -0700 (Sun, 20 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16936&view=rev

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/gtk/gtksound.c
    trunk/gtk/gtkstatusbox.c
Modified: trunk/gtk/gtksound.c
===================================================================
--- trunk/gtk/gtksound.c	2006-08-21 03:04:12 UTC (rev 16935)
+++ trunk/gtk/gtksound.c	2006-08-21 03:13:08 UTC (rev 16936)
@@ -314,7 +314,6 @@
 			g_error_free(error);
 			error = NULL;
 		}
-		return;
 	}
 #endif /* USE_GSTREAMER */
 

Modified: trunk/gtk/gtkstatusbox.c
===================================================================
--- trunk/gtk/gtkstatusbox.c	2006-08-21 03:04:12 UTC (rev 16935)
+++ trunk/gtk/gtkstatusbox.c	2006-08-21 03:13:08 UTC (rev 16936)
@@ -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 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.