[xine-cvs] CVS: gnome-xine/src preferences.c,1.44,1.45

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9346/src

Modified Files:
	preferences.c 
Log Message:
Since we're using glib 2.6...

Index: preferences.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/preferences.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- preferences.c	9 Jan 2005 20:56:44 -0000	1.44
+++ preferences.c	3 May 2005 18:15:08 -0000	1.45
@@ -381,21 +381,19 @@
 
 static GtkWidget *create_item_label (const xine_cfg_entry_t *entry)
 {
-  char *desc, *labelkey, *labeltext;
   GtkWidget *label;
+  char *labeltext;
+  const char *labelkey = strrchr (entry->key, '.') + 1;
 
-  desc = g_markup_escape_text (entry->description, strlen (entry->description));
-  labelkey = strrchr (entry->key, '.') + 1;
-  labelkey = g_markup_escape_text (labelkey, strlen (labelkey));
   if (entry->callback_data)
-    labeltext = g_strdup_printf ("<b>%s</b>\n%s", labelkey, desc);
+    labeltext = g_markup_printf_escaped ("<b>%s</b>\n%s",
+					 labelkey, entry->description);
   else
-    labeltext = g_strdup_printf ("<b>• <i>%s</i></b>\n%s", labelkey, desc);
+    labeltext = g_markup_printf_escaped ("<b>• <i>%s</i></b>\n%s",
+					 labelkey, entry->description);
 
   label = gtk_label_new (labeltext);
   free (labeltext);
-  free (labelkey);
-  free (desc);
 
   gtk_label_set_use_markup (GTK_LABEL(label), TRUE);
   gtk_label_set_line_wrap (GTK_LABEL(label), TRUE);