[Gaim-commits] SF.net SVN: gaim: [16776] trunk/src

[<sea...@us...>]

Revision: 16776
Author:   seanegan
Date:     2006-08-15 18:32:12 -0700 (Tue, 15 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16776&view=rev

Log Message:
-----------
Fix segfault when using non-buddy-icon'ed accounts

Modified Paths:
--------------
    trunk/src/gtkstatusbox.c
    trunk/src/gtkutils.c
Modified: trunk/src/gtkstatusbox.c
===================================================================
--- trunk/src/gtkstatusbox.c	2006-08-15 23:25:29 UTC (rev 16775)
+++ trunk/src/gtkstatusbox.c	2006-08-16 01:32:12 UTC (rev 16776)
@@ -926,7 +926,8 @@
 		GList *accounts;
 		for (accounts = gaim_accounts_get_all(); accounts != NULL; accounts = accounts->next) {
 			GaimAccount *account = accounts->data;
-			if (gaim_account_get_ui_bool(account, GAIM_GTK_UI, "use-global-buddy-icon", TRUE)) {
+			if (gaim_account_get_ui_bool(account, GAIM_GTK_UI, "use-global-buddy-icon", TRUE) &&
+			    GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol_id(account)))->icon_spec.format) {
 				char *icon = gaim_gtk_convert_buddy_icon(gaim_find_prpl(gaim_account_get_protocol_id(account)),
 									 filename);
 				gaim_account_set_buddy_icon(account, icon);

Modified: trunk/src/gtkutils.c
===================================================================
--- trunk/src/gtkutils.c	2006-08-15 23:25:29 UTC (rev 16775)
+++ trunk/src/gtkutils.c	2006-08-16 01:32:12 UTC (rev 16776)
@@ -2457,6 +2457,8 @@
 char*
 gaim_gtk_convert_buddy_icon(GaimPlugin *plugin, const char *path)
 {
+	g_return_val_if_fail(GAIM_PLUGIN_PROTOCOL_INFO(plugin)->icon_spec.format != NULL, NULL);
+
 #if GTK_CHECK_VERSION(2,2,0)
 	int width, height;
 	char **pixbuf_formats = NULL;


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