diff src/gtkaccount.c @ 14035:8bda65b88e49

[gaim-migrate @ 16638] A bunch of small changes. Mostly remove "if not null" checks before calling g_free, g_list_free, g_slist_free and g_strdup. Also use g_list_foreach() to call g_free to free strings in an array. And some whitespace changes here and there. committer: Tailor Script <[e-mail]>

--- a/src/gtkaccount.c	Sat Aug 05 05:42:28 2006 +0000
+++ b/src/gtkaccount.c	Sat Aug 05 08:27:39 2006 +0000
@@ -204,7 +204,7 @@
 		gaim_gtk_buddy_icon_get_scale_size(pixbuf,
 							&dialog->prpl_info->icon_spec, &width, &height);
 		scale = gdk_pixbuf_scale_simple(pixbuf, width, height, GDK_INTERP_BILINEAR);
-		
+
 		g_object_unref(G_OBJECT(pixbuf));
 		pixbuf = scale;
 	}
@@ -231,9 +231,7 @@
 	{
 		dialog->prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(dialog->plugin);
 
-		if (dialog->protocol_id != NULL)
-			g_free(dialog->protocol_id);
-
+		g_free(dialog->protocol_id);
 		dialog->protocol_id = g_strdup(dialog->plugin->info->id);
 	}
 
@@ -317,8 +315,7 @@
 
 #endif /* FILECHOOSER */
 
-	if (dialog->icon_path)
-		g_free(dialog->icon_path);
+	g_free(dialog->icon_path);
 	dialog->icon_path = convert_buddy_icon(dialog->plugin, filename);
 	set_dialog_icon(dialog);
 	gtk_widget_show(dialog->icon_entry);
@@ -482,8 +479,7 @@
 static void
 icon_reset_cb(GtkWidget *button, AccountPrefsDialog *dialog)
 {
-	if (dialog->icon_path)
-		g_free(dialog->icon_path);
+	g_free(dialog->icon_path);
 	dialog->icon_path = NULL;
 
 	gtk_widget_hide(dialog->icon_entry);
@@ -512,8 +508,7 @@
 			}
 			if ((rtmp = strchr(tmp, '\r')) || (rtmp = strchr(tmp, '\n')))
 				*rtmp = '\0';
-			if (dialog->icon_path)
-				g_free(dialog->icon_path);
+			g_free(dialog->icon_path);
 			dialog->icon_path = convert_buddy_icon(dialog->plugin, tmp);
 			set_dialog_icon(dialog);
 			gtk_widget_show(dialog->icon_entry);
@@ -1423,14 +1418,9 @@
 
 	gtk_widget_destroy(dialog->window);
 
-	if (dialog->user_split_entries != NULL)
-		g_list_free(dialog->user_split_entries);
-
-	if (dialog->protocol_opt_entries != NULL)
-		g_list_free(dialog->protocol_opt_entries);
-
-	if (dialog->protocol_id != NULL)
-		g_free(dialog->protocol_id);
+	g_list_free(dialog->user_split_entries);
+	g_list_free(dialog->protocol_opt_entries);
+	g_free(dialog->protocol_id);
 
 	if (dialog->icon_path != NULL)
 	{
@@ -2572,10 +2562,7 @@
 free_add_user_data(GaimGtkAccountAddUserData *data)
 {
 	g_free(data->username);
-
-	if (data->alias != NULL)
-		g_free(data->alias);
-
+	g_free(data->alias);
 	g_free(data);
 }
 
@@ -2645,7 +2632,7 @@
 	data = g_new0(GaimGtkAccountAddUserData, 1);
 	data->account  = account;
 	data->username = g_strdup(remote_user);
-	data->alias    = (alias != NULL ? g_strdup(alias) : NULL);
+	data->alias    = g_strdup(alias);
 
 	buffer = make_info(account, gc, remote_user, id, alias, msg);