[Gaim-commits] SF.net SVN: gaim: [17857] trunk

[<mar...@us...>]

Revision: 17857
          http://svn.sourceforge.net/gaim/?rev=17857&view=rev
Author:   markhuetsch
Date:     2006-11-30 03:12:13 -0800 (Thu, 30 Nov 2006)

Log Message:
-----------
Tweaks.

Modified Paths:
--------------
    trunk/gtk/gtkaccount.c
    trunk/libgaim/buddyicon.c

Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c	2006-11-30 10:56:56 UTC (rev 17856)
+++ trunk/gtk/gtkaccount.c	2006-11-30 11:12:13 UTC (rev 17857)
@@ -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);

Modified: trunk/libgaim/buddyicon.c
===================================================================
--- trunk/libgaim/buddyicon.c	2006-11-30 10:56:56 UTC (rev 17856)
+++ trunk/libgaim/buddyicon.c	2006-11-30 11:12:13 UTC (rev 17857)
@@ -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 *


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