Mercurial > pidgin.yaz

changeset 9702:5c6f4f0acb8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10561] My love is like footsteps in the snow, bay-bee committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 07 Aug 2004 17:04:07 +0000
parents d9e6e172f94c
children 1397a4594c4e
files ChangeLog src/gtkaccount.c
diffstat 2 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Aug 07 16:45:04 2004 +0000
+++ b/ChangeLog	Sat Aug 07 17:04:07 2004 +0000
@@ -2,9 +2,11 @@
 
 version 0.82:
 	Bug Fixes:
-	* Fix the double screen names that sometimes appear when viewing text
-	  from a Windows AIM user that was copy and pasted fromn another
+	* Double screen names should no longer appear in text from a 
+	  Windows AIM users that was copy and pasted fromn another
 	  conversation (Jon Oberheide)
+	* Selecting a buddy icon for a brand new account no longer
+	  causes a crash
 
 version 0.81 (08/05/2004):
 	New Features:
--- a/src/gtkaccount.c	Sat Aug 07 16:45:04 2004 +0000
+++ b/src/gtkaccount.c	Sat Aug 07 17:04:07 2004 +0000
@@ -159,7 +159,7 @@
 static void set_account(GtkListStore *store, GtkTreeIter *iter,
 						  GaimAccount *account);
 static char*
-convert_buddy_icon(GaimAccount *account, const char *path);
+convert_buddy_icon(GaimPlugin *plugin, const char *path);
 
 /**************************************************************************
  * Add/Modify Account dialog
@@ -275,7 +275,7 @@
 
 	if (dialog->icon_path)
 		g_free(dialog->icon_path);
-	dialog->icon_path = convert_buddy_icon(dialog->account, filename);
+	dialog->icon_path = convert_buddy_icon(dialog->plugin, filename);
 	gtk_image_set_from_file(GTK_IMAGE(dialog->icon_entry), dialog->icon_path);
 	gtk_widget_show(dialog->icon_entry);
 
@@ -467,7 +467,7 @@
 				*rtmp = '\0';
 			if (dialog->icon_path)
 				g_free(dialog->icon_path);
-			dialog->icon_path = convert_buddy_icon(dialog->account, tmp);
+			dialog->icon_path = convert_buddy_icon(dialog->plugin, tmp);
 			gtk_image_set_from_file(GTK_IMAGE(dialog->icon_entry), dialog->icon_path);
 			gtk_widget_show(dialog->icon_entry);
 			g_free(tmp);
@@ -495,14 +495,14 @@
 #endif
 
 static char*
-convert_buddy_icon(GaimAccount *account, const char *path)
+convert_buddy_icon(GaimPlugin *plugin, const char *path)
 {
 #if GTK_CHECK_VERSION(2,2,0)
 	int width, height;
 	char **pixbuf_formats = NULL;
 	GdkPixbufFormat *format;
 	GdkPixbuf *pixbuf;
-	GaimPluginProtocolInfo *prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(account->protocol_id));
+	GaimPluginProtocolInfo *prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(plugin);
 	char **prpl_formats =  g_strsplit (prpl_info->icon_spec.format,",",0);
 #if !GTK_CHECK_VERSION(2,4,0)
 	GdkPixbufLoader *loader;