diff src/gtkprefs.c @ 6040:80e3641ee9eb

[gaim-migrate @ 6490] Various minor memleak fixes, and a rephrasing of an oscar error message. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 06 Jul 2003 06:57:42 +0000
parents 0c4d0c93c8c5
children 8469f83b6cae
line wrap: on
line diff
--- a/src/gtkprefs.c	Sun Jul 06 05:07:11 2003 +0000
+++ b/src/gtkprefs.c	Sun Jul 06 06:57:42 2003 +0000
@@ -1627,6 +1627,7 @@
 	GtkTreePath *path = gtk_tree_path_new_from_string(pth);
 	GaimPlugin *plug;
 	gchar buf[1024];
+	gchar *name = NULL, *description = NULL;
 	
 	GdkCursor *wait = gdk_cursor_new (GDK_WATCH);
 	gdk_window_set_cursor(prefs->window, wait);
@@ -1695,23 +1696,23 @@
 
 	gdk_window_set_cursor(prefs->window, NULL);
 
+	name = g_markup_escape_text(_(plug->info->name), -1);
+	description = g_markup_escape_text(_(plug->info->description), -1);
 	if (plug->error != NULL) {
+		gchar *error = g_markup_escape_text(plug->error, -1);
 		g_snprintf(buf, sizeof(buf),
 				   "<span size=\"larger\">%s %s</span>\n\n"
 				   "<span weight=\"bold\" color=\"red\">%s</span>\n\n"
 				   "%s",
-				   g_markup_escape_text(_(plug->info->name), -1),
-				   plug->info->version,
-				   g_markup_escape_text(plug->error, -1),
-				   g_markup_escape_text(_(plug->info->description), -1));
-	}
-	else {
+				   name, plug->info->version, error, description);
+		g_free(error);
+	} else {
 		g_snprintf(buf, sizeof(buf),
 				   "<span size=\"larger\">%s %s</span>\n\n%s",
-				   g_markup_escape_text(_(plug->info->name), -1),
-				   plug->info->version,
-				   g_markup_escape_text(_(plug->info->description), -1));
+				   name, plug->info->version, description);
 	}
+	g_free(name);
+	g_free(description);
 
 	gtk_label_set_markup(GTK_LABEL(plugin_description), buf);
 	gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0,