[Gpredict-svn] SF.net SVN: gpredict:[960] trunk/src/gtk-single-sat.c

[<aa...@us...>]

Revision: 960
          http://gpredict.svn.sourceforge.net/gpredict/?rev=960&view=rev
Author:   aa1vs
Date:     2011-11-23 15:16:36 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Escape satellite nicknames and use them when in markup. (Bug 3441490: Satellite Nickname Not escaped for PANGO.)

Modified Paths:
--------------
    trunk/src/gtk-single-sat.c

Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c	2011-11-23 15:15:52 UTC (rev 959)
+++ trunk/src/gtk-single-sat.c	2011-11-23 15:16:36 UTC (rev 960)
@@ -268,8 +268,7 @@
 
     /* create header */
     sat = SAT (g_slist_nth_data (GTK_SINGLE_SAT (widget)->sats, 0));
-    title = g_strdup_printf ("<b>%s</b>", sat ? sat->nickname : "noname");
-
+    title = g_strdup_printf ("<b>%s</b>", sat ? sat->escapednickname : "noname");
     GTK_SINGLE_SAT (widget)->header = gtk_label_new (NULL);
     gtk_label_set_markup (GTK_LABEL (GTK_SINGLE_SAT (widget)->header), title);
     g_free (title);
@@ -371,8 +370,7 @@
                     __FUNCTION__, catnum);
         return;
     }
-
-    title = g_strdup_printf ("<b>%s</b>", sat->nickname);
+    title = g_strdup_printf ("<b>%s</b>", sat->escapednickname);
     gtk_label_set_markup (GTK_LABEL (ssat->header), title);
     g_free (title);
 
@@ -827,7 +825,7 @@
     menuitem = gtk_image_menu_item_new ();
     label = gtk_label_new (NULL);
     gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
-    buff = g_strdup_printf ("<b>%s</b>", sat->nickname);
+    buff = g_strdup_printf ("<b>%s</b>", sat->escapednickname);
     gtk_label_set_markup (GTK_LABEL (label), buff);
     g_free (buff);
     gtk_container_add (GTK_CONTAINER (menuitem), label);
@@ -923,7 +921,7 @@
 
         sat = SAT (g_slist_nth_data (ssat->sats, i));
 
-        title = g_strdup_printf ("<b>%s</b>", sat->nickname);
+        title = g_strdup_printf ("<b>%s</b>", sat->escapednickname);
         gtk_label_set_markup (GTK_LABEL (ssat->header), title);
         g_free (title);
 

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