Mercurial > pidgin

changeset 15073:58a23f416729

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 17857] Tweaks. committer: Tailor Script <tailor@pidgin.im>
author Mark Huetsch <markhuetsch>
date Thu, 30 Nov 2006 11:12:13 +0000
parents 322d6b5472a4
children 346faf2a5acd
files gtk/gtkaccount.c libgaim/buddyicon.c
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/gtkaccount.c	Thu Nov 30 10:56:56 2006 +0000
+++ b/gtk/gtkaccount.c	Thu Nov 30 11:12:13 2006 +0000
@@ -118,11 +118,11 @@
 	GtkWidget *icon_hbox;
 	GtkWidget *icon_check;
 	GtkWidget *icon_entry;
-	char *cached_icon_path;
-	char *icon_path;
 	GtkWidget *icon_filesel;
 	GtkWidget *icon_preview;
 	GtkWidget *icon_text;
+	char *cached_icon_path;
+	char *icon_path;
 
 	/* Protocol Options */
 	GtkWidget *protocol_frame;
@@ -1083,8 +1083,7 @@
 		g_free(dialog->cached_icon_path);
 	}
 
-	if (dialog->cached_icon_path != NULL)
-		g_free(dialog->icon_path);
+	g_free(dialog->icon_path);
 
 	if (dialog->icon_filesel)
 		gtk_widget_destroy(dialog->icon_filesel);
--- a/libgaim/buddyicon.c	Thu Nov 30 10:56:56 2006 +0000
+++ b/libgaim/buddyicon.c	Thu Nov 30 11:12:13 2006 +0000
@@ -347,7 +347,7 @@
 	g_return_if_fail(icon != NULL);
 	
 	g_free(icon->path);
-	icon->path = (path != NULL ? g_strdup(path) : NULL);
+	icon->path = g_strdup(path);
 }
 
 GaimAccount *