[Gpredict-svn] SF.net SVN: gpredict:[959] trunk

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

Revision: 959
          http://gpredict.svn.sourceforge.net/gpredict/?rev=959&view=rev
Author:   aa1vs
Date:     2011-11-23 15:15:52 +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/ChangeLog
    trunk/NEWS
    trunk/src/gtk-event-list-popup.c
    trunk/src/gtk-polar-view-popup.c
    trunk/src/gtk-polar-view.c
    trunk/src/gtk-sat-data.c
    trunk/src/gtk-sat-list-popup.c
    trunk/src/gtk-sat-map-popup.c
    trunk/src/gtk-sat-map.c
    trunk/src/sat-info.c
    trunk/src/sgpsdp/sgp4sdp4.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/ChangeLog	2011-11-23 15:15:52 UTC (rev 959)
@@ -1,5 +1,20 @@
-2011-11-21 Charles Suprin <hamaa1vs at gmail.com>
+2011-11-23 Charles Suprin <hamaa1vs at gmail.com>
 
+    * src/gtk-event-list-popup.c
+    * src/gtk-sat-data.c
+    * src/gtk-sat-list-popup.c
+    * src/gtk-sat-map.c
+    * src/gtk-sat-map-popup.c
+    * src/gtk-polar-view.c
+    * src/gtk-polar-view-popup.c
+    * src/gtk-single-sat.c
+    * src/sat-info.c
+    * src/sgpsdp/sgp4sdp4.h
+    Escape satellite nicknames and use them when in markup. (Bug 3441490: Satellite Nickname Not escaped for PANGO.)
+
+
+2011-11-22 Charles Suprin <hamaa1vs at gmail.com>
+
     * src/gtk-sat-selector.c
     Apply compare function to all categories.
 

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/NEWS	2011-11-23 15:15:52 UTC (rev 959)
@@ -22,6 +22,7 @@
 - Fixed bug 3419879: gpredict doesn't change the satellite names on world map.
 - Fixed bug 3292729: Show next pass shows the current pass.
 - Fixed bug 3437555: Graphical Glitch Plotting Footprints near pole.
+- Fixed bug 3441490: Satellite Nickname Not escaped for PANGO.
 
 Changes in version 1.3 (1 Mar 2011)
 

Modified: trunk/src/gtk-event-list-popup.c
===================================================================
--- trunk/src/gtk-event-list-popup.c	2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/gtk-event-list-popup.c	2011-11-23 15:15:52 UTC (rev 959)
@@ -65,7 +65,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);

Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c	2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/gtk-polar-view-popup.c	2011-11-23 15:15:52 UTC (rev 959)
@@ -73,16 +73,16 @@
     gchar            *buff;
     sat_obj_t  *obj = NULL;
     gint           *catnum;
+    
 
 
-
     menu = gtk_menu_new ();
 
     /* first menu item is the satellite name, centered */
     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);

Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c	2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/gtk-polar-view.c	2011-11-23 15:15:52 UTC (rev 959)
@@ -888,7 +888,7 @@
                                       "<tt>Az: %5.1f\302\260\n" \
                                       "El: %5.1f\302\260\n" \
                                       "%s</tt>",
-                                      sat->nickname,
+                                      sat->escapednickname,
                                       sat->az, sat->el,
                                       losstr);
 
@@ -981,7 +981,7 @@
                                           "<tt>Az: %5.1f\302\260\n" \
                                           "El: %5.1f\302\260\n"     \
                                           "</tt>",
-                                          sat->nickname,
+                                          sat->escapednickname,
                                           sat->az, sat->el);
                 
                 obj->marker = goo_canvas_rect_model_new (root,

Modified: trunk/src/gtk-sat-data.c
===================================================================
--- trunk/src/gtk-sat-data.c	2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/gtk-sat-data.c	2011-11-23 15:15:52 UTC (rev 959)
@@ -95,6 +95,8 @@
             g_clear_error (&error);
             sat->nickname = g_strdup (sat->name);
         }
+        sat->escapednickname = g_markup_escape_text (sat->nickname, -1);
+
         sat->website = g_key_file_get_string (data, "Satellite", "WEBSITE", NULL); /* website may be NULL */
 
         /* get TLE data */

Modified: trunk/src/gtk-sat-list-popup.c
===================================================================
--- trunk/src/gtk-sat-list-popup.c	2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/gtk-sat-list-popup.c	2011-11-23 15:15:52 UTC (rev 959)
@@ -66,7 +66,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);

Modified: trunk/src/gtk-sat-map-popup.c
===================================================================
--- trunk/src/gtk-sat-map-popup.c	2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/gtk-sat-map-popup.c	2011-11-23 15:15:52 UTC (rev 959)
@@ -82,7 +82,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);

Modified: trunk/src/gtk-sat-map.c
===================================================================
--- trunk/src/gtk-sat-map.c	2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/gtk-sat-map.c	2011-11-23 15:15:52 UTC (rev 959)
@@ -752,13 +752,13 @@
                         buff = g_strdup_printf (_("<span background=\"#%s\"> "\
                                                 "Next: %s in %s%d:%s%d%s%d </span>"),
                                                 satmap->infobgd,
-                                                sat->nickname,
+                                                sat->escapednickname,
                                                 ch, h, cm, m, cs, s);
                     else 
                         buff = g_strdup_printf (_("<span background=\"#%s\"> " \
                                                 "Next: %s in %s%d%s%d </span>"),
                                                 satmap->infobgd,
-                                                sat->nickname,
+                                                sat->escapednickname,
                                                 cm, m, cs, s);
 
                     g_object_set (satmap->next,
@@ -1831,7 +1831,7 @@
     guint32 col,covcol,shadowcol;
     gfloat x,y;
     gchar *tooltip;
-    
+
     (void) key; /* avoid unusued parameter compiler warning */
 
     if (decayed(sat)) {
@@ -1910,11 +1910,10 @@
                               "Lat: %5.1f\302\260\n" \
                               " Az: %5.1f\302\260\n" \
                               " El: %5.1f\302\260</tt>",
-                              sat->nickname,
+                              sat->escapednickname,
                               sat->ssplon, sat->ssplat,
                               sat->az, sat->el);
 
-
     /* create satellite marker and label + shadows. We create shadows first */
     obj->shadowm = goo_canvas_rect_model_new (root,
                                               x - MARKER_SIZE_HALF + 1,
@@ -2104,7 +2103,7 @@
                               " Az: %5.1f\302\260\n" \
                               " El: %5.1f\302\260\n" \
                               "%s</tt>",
-                              sat->nickname,
+                              sat->escapednickname,
                               sat->ssplon, sat->ssplat,
                               sat->az, sat->el,
                               aosstr);
@@ -2312,11 +2311,11 @@
     if (isgeo) {
         if (sat->el > 0.0) {
             text = g_strdup_printf ("<span background=\"#%s\"> %s: Always in range </span>",
-                                    satmap->infobgd, sat->nickname);
+                                    satmap->infobgd, sat->escapednickname);
         }
         else {
             text = g_strdup_printf ("<span background=\"#%s\"> %s: Always out of range </span>",
-                                    satmap->infobgd, sat->nickname);
+                                    satmap->infobgd, sat->escapednickname);
         }
     }
     else {
@@ -2352,13 +2351,13 @@
         if (h > 0) {
             text = g_strdup_printf ("<span background=\"#%s\"> "\
                                     "%s %s in %s%d:%s%d%s%d </span>",
-                                    satmap->infobgd, sat->nickname,
+                                    satmap->infobgd, sat->escapednickname,
                                     alsstr, ch, h, cm, m, cs, s);
         }
         else {
             text = g_strdup_printf ("<span background=\"#%s\"> "\
                                     "%s %s in %s%d%s%d </span>",
-                                    satmap->infobgd, sat->nickname,
+                                    satmap->infobgd, sat->escapednickname,
                                     alsstr, cm, m, cs, s);
         }
 

Modified: trunk/src/sat-info.c
===================================================================
--- trunk/src/sat-info.c	2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/sat-info.c	2011-11-23 15:15:52 UTC (rev 959)
@@ -97,7 +97,7 @@
     gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
 
     label = gtk_label_new (NULL);
-    str = g_strdup_printf (_("<b>%s</b>"), sat->nickname);
+    str = g_strdup_printf (_("<b>%s</b>"), sat->escapednickname);
     gtk_label_set_markup (GTK_LABEL (label), str);
     gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
     gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1);

Modified: trunk/src/sgpsdp/sgp4sdp4.h
===================================================================
--- trunk/src/sgpsdp/sgp4sdp4.h	2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/sgpsdp/sgp4sdp4.h	2011-11-23 15:15:52 UTC (rev 959)
@@ -156,6 +156,7 @@
 typedef struct {
         char           *name;
         char           *nickname;
+   	char           *escapednickname;
         char           *website;
 	tle_t           tle;     /*!< Keplerian elements */
 	int             flags;   /*!< Flags for algo ctrl */

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