[Gpredict-svn] SF.net SVN: gpredict:[387] trunk/src
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
[Gpredict-svn] SF.net SVN: gpredict:[387] trunk/src
|
From: <cs...@us...> - 2009-08-06 21:08:39
|
Revision: 387
http://gpredict.svn.sourceforge.net/gpredict/?rev=387&view=rev
Author: csete
Date: 2009-08-06 21:08:29 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
Uset sat->nickname instead of sat->tle.sat_name.
Modified Paths:
--------------
trunk/src/gtk-polar-view-popup.c
trunk/src/gtk-polar-view.c
trunk/src/gtk-rig-ctrl.c
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-sat-data.c
trunk/src/gtk-sat-list-popup.c
trunk/src/gtk-sat-list.c
trunk/src/gtk-sat-map-ground-track.c
trunk/src/gtk-sat-map-popup.c
trunk/src/gtk-sat-map.c
trunk/src/gtk-sat-module.c
trunk/src/gtk-single-sat.c
trunk/src/gtk-sky-glance.c
trunk/src/main.c
trunk/src/predict-tools.c
trunk/src/sat-info.c
Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c 2009-08-06 20:44:36 UTC (rev 386)
+++ trunk/src/gtk-polar-view-popup.c 2009-08-06 21:08:29 UTC (rev 387)
@@ -85,7 +85,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->tle.sat_name);
+ buff = g_strdup_printf ("<b>%s</b>", sat->nickname);
gtk_label_set_markup (GTK_LABEL (label), buff);
g_free (buff);
gtk_container_add (GTK_CONTAINER (menuitem), label);
@@ -392,7 +392,7 @@
}
if (pass != NULL) {
- show_pass (sat->tle.sat_name, qth, pass, GTK_WIDGET (toplevel));
+ show_pass (sat->nickname, qth, pass, GTK_WIDGET (toplevel));
}
else {
/* show dialog that there are no passes within time frame */
@@ -403,7 +403,7 @@
GTK_BUTTONS_OK,
_("Satellite %s has no passes\n"\
"within the next %d days"),
- sat->tle.sat_name,
+ sat->nickname,
sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -422,7 +422,7 @@
"This can be because the satellite\n"\
"is geostationary, decayed or simply\n"\
"never comes above the horizon"),
- sat->tle.sat_name);
+ sat->nickname);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -462,7 +462,7 @@
if (passes != NULL) {
- show_passes (sat->tle.sat_name, qth, passes, GTK_WIDGET (toplevel));
+ show_passes (sat->nickname, qth, passes, GTK_WIDGET (toplevel));
}
else {
/* show dialog that there are no passes within time frame */
@@ -473,7 +473,7 @@
GTK_BUTTONS_OK,
_("Satellite %s has no passes\n"\
"within the next %d days"),
- sat->tle.sat_name,
+ sat->nickname,
sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -492,7 +492,7 @@
GTK_BUTTONS_OK,
_("Satellite %s has no passes for\n"\
"the current ground station!"),
- sat->tle.sat_name);
+ sat->nickname);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2009-08-06 20:44:36 UTC (rev 386)
+++ trunk/src/gtk-polar-view.c 2009-08-06 21:08:29 UTC (rev 387)
@@ -731,10 +731,10 @@
if (h > 0)
buff = g_strdup_printf (_("Next: %s\nin %s%d:%s%d%s%d"),
- sat->tle.sat_name, ch, h, cm, m, cs, s);
+ sat->nickname, ch, h, cm, m, cs, s);
else
buff = g_strdup_printf (_("Next: %s\nin %s%d%s%d"),
- sat->tle.sat_name, cm, m, cs, s);
+ sat->nickname, cm, m, cs, s);
g_object_set (polv->next,
@@ -914,18 +914,18 @@
if (h > 0) {
text = g_strdup_printf (_("%s\nLOS in %s%d:%s%d%s%d"),
- sat->tle.sat_name, ch, h, cm, m, cs, s);
+ sat->nickname, ch, h, cm, m, cs, s);
}
else {
text = g_strdup_printf (_("%s\nLOS in %s%d%s%d"),
- sat->tle.sat_name, cm, m, cs, s);
+ sat->nickname, cm, m, cs, s);
}
g_free (ch);
g_free (cm);
g_free (cs);
}
else {
- text = g_strdup_printf (_("%s\nAlways in range"), sat->tle.sat_name);
+ text = g_strdup_printf (_("%s\nAlways in range"), sat->nickname);
}
g_object_set (polv->sel, "text", text, NULL);
@@ -956,7 +956,7 @@
"fill-color-rgba", colour,
"stroke-color-rgba", colour,
NULL);
- obj->label = goo_canvas_text_model_new (root, sat->tle.sat_name,
+ obj->label = goo_canvas_text_model_new (root, sat->nickname,
x,
y+2,
-1,
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2009-08-06 20:44:36 UTC (rev 386)
+++ trunk/src/gtk-rig-ctrl.c 2009-08-06 21:08:29 UTC (rev 387)
@@ -524,7 +524,7 @@
for (i = 0; i < n; i++) {
sat = SAT (g_slist_nth_data (ctrl->sats, i));
if (sat) {
- gtk_combo_box_append_text (GTK_COMBO_BOX (satsel), sat->tle.sat_name);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (satsel), sat->nickname);
}
}
gtk_combo_box_set_active (GTK_COMBO_BOX (satsel), 0);
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2009-08-06 20:44:36 UTC (rev 386)
+++ trunk/src/gtk-rot-ctrl.c 2009-08-06 21:08:29 UTC (rev 387)
@@ -413,7 +413,7 @@
for (i = 0; i < n; i++) {
sat = SAT (g_slist_nth_data (ctrl->sats, i));
if (sat) {
- gtk_combo_box_append_text (GTK_COMBO_BOX (satsel), sat->tle.sat_name);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (satsel), sat->nickname);
}
}
gtk_combo_box_set_active (GTK_COMBO_BOX (satsel), 0);
Modified: trunk/src/gtk-sat-data.c
===================================================================
--- trunk/src/gtk-sat-data.c 2009-08-06 20:44:36 UTC (rev 386)
+++ trunk/src/gtk-sat-data.c 2009-08-06 21:08:29 UTC (rev 387)
@@ -265,8 +265,8 @@
dest->tle.elset = source->tle.elset;
dest->tle.revnum = source->tle.revnum;
- for (i = 0; i < 25; i++)
- dest->tle.sat_name[i] = source->tle.sat_name[i];
+ dest->name = g_strdup (source->name);
+ dest->nickname = g_strdup (source->nickname);
for (i = 0; i < 9; i++)
dest->tle.idesg[i] = source->tle.idesg[i];
Modified: trunk/src/gtk-sat-list-popup.c
===================================================================
--- trunk/src/gtk-sat-list-popup.c 2009-08-06 20:44:36 UTC (rev 386)
+++ trunk/src/gtk-sat-list-popup.c 2009-08-06 21:08:29 UTC (rev 387)
@@ -72,7 +72,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->tle.sat_name);
+ buff = g_strdup_printf ("<b>%s</b>", sat->nickname);
gtk_label_set_markup (GTK_LABEL (label), buff);
g_free (buff);
gtk_container_add (GTK_CONTAINER (menuitem), label);
@@ -164,7 +164,7 @@
}
if (pass != NULL) {
- show_pass (sat->tle.sat_name, qth, pass, GTK_WIDGET (toplevel));
+ show_pass (sat->nickname, qth, pass, GTK_WIDGET (toplevel));
}
else {
/* show dialog that there are no passes within time frame */
@@ -175,7 +175,7 @@
GTK_BUTTONS_OK,
_("Satellite %s has no passes\n"\
"within the next %d days"),
- sat->tle.sat_name,
+ sat->nickname,
sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -194,7 +194,7 @@
"This can be because the satellite\n"\
"is geostationary, decayed or simply\n"\
"never comes above the horizon"),
- sat->tle.sat_name);
+ sat->nickname);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -234,7 +234,7 @@
}
if (passes != NULL) {
- show_passes (sat->tle.sat_name, qth, passes, GTK_WIDGET (toplevel));
+ show_passes (sat->nickname, qth, passes, GTK_WIDGET (toplevel));
}
else {
/* show dialog that there are no passes within time frame */
@@ -245,7 +245,7 @@
GTK_BUTTONS_OK,
_("Satellite %s has no passes\n"\
"within the next %d days"),
- sat->tle.sat_name,
+ sat->nickname,
sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -264,7 +264,7 @@
GTK_BUTTONS_OK,
_("Satellite %s has no passes for\n"\
"the current ground station!"),
- sat->tle.sat_name);
+ sat->nickname);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
Modified: trunk/src/gtk-sat-list.c
===================================================================
--- trunk/src/gtk-sat-list.c 2009-08-06 20:44:36 UTC (rev 386)
+++ trunk/src/gtk-sat-list.c 2009-08-06 21:08:29 UTC (rev 387)
@@ -483,7 +483,7 @@
gtk_list_store_append (store, &item);
gtk_list_store_set (store, &item,
- SAT_LIST_COL_NAME, sat->tle.sat_name,
+ SAT_LIST_COL_NAME, sat->nickname,
SAT_LIST_COL_CATNUM, sat->tle.catnr,
SAT_LIST_COL_AZ, sat->az,
SAT_LIST_COL_EL, sat->el,
Modified: trunk/src/gtk-sat-map-ground-track.c
===================================================================
--- trunk/src/gtk-sat-map-ground-track.c 2009-08-06 20:44:36 UTC (rev 386)
+++ trunk/src/gtk-sat-map-ground-track.c 2009-08-06 21:08:29 UTC (rev 387)
@@ -80,7 +80,7 @@
sat_log_log (SAT_LOG_LEVEL_DEBUG,
_("%s: Creating ground track for %s"),
- __FUNCTION__, sat->tle.sat_name);
+ __FUNCTION__, sat->nickname);
/* just to be safe... if empty GSList is not NULL => segfault */
obj->track_data.latlon = NULL;
@@ -189,7 +189,7 @@
{
sat_log_log (SAT_LOG_LEVEL_DEBUG,
_("%s: Updating ground track for %s"),
- __FUNCTION__, sat->tle.sat_name);
+ __FUNCTION__, sat->nickname);
if (recalc == TRUE) {
ground_track_delete (satmap, sat, qth, obj, TRUE);
@@ -219,7 +219,7 @@
sat_log_log (SAT_LOG_LEVEL_DEBUG,
_("%s: Deleting ground track for %s"),
- __FUNCTION__, sat->tle.sat_name);
+ __FUNCTION__, sat->nickname);
root = goo_canvas_get_root_item_model (GOO_CANVAS (satmap->canvas));
Modified: trunk/src/gtk-sat-map-popup.c
===================================================================
--- trunk/src/gtk-sat-map-popup.c 2009-08-06 20:44:36 UTC (rev 386)
+++ trunk/src/gtk-sat-map-popup.c 2009-08-06 21:08:29 UTC (rev 387)
@@ -84,7 +84,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->tle.sat_name);
+ buff = g_strdup_printf ("<b>%s</b>", sat->nickname);
gtk_label_set_markup (GTK_LABEL (label), buff);
g_free (buff);
gtk_container_add (GTK_CONTAINER (menuitem), label);
@@ -294,7 +294,7 @@
}
if (pass != NULL) {
- show_pass (sat->tle.sat_name, qth, pass, GTK_WIDGET (toplevel));
+ show_pass (sat->nickname, qth, pass, GTK_WIDGET (toplevel));
}
else {
/* show dialog that there are no passes within time frame */
@@ -305,7 +305,7 @@
GTK_BUTTONS_OK,
_("Satellite %s has no passes\n"\
"within the next %d days"),
- sat->tle.sat_name,
+ sat->nickname,
sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -324,7 +324,7 @@
"This can be because the satellite\n"\
"is geostationary, decayed or simply\n"\
"never comes above the horizon"),
- sat->tle.sat_name);
+ sat->nickname);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -364,7 +364,7 @@
if (passes != NULL) {
- show_passes (sat->tle.sat_name, qth, passes, GTK_WIDGET (toplevel));
+ show_passes (sat->nickname, qth, passes, GTK_WIDGET (toplevel));
}
else {
/* show dialog that there are no passes within time frame */
@@ -375,7 +375,7 @@
GTK_BUTTONS_OK,
_("Satellite %s has no passes\n"\
"within the next %d days"),
- sat->tle.sat_name,
+ sat->nickname,
sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -394,7 +394,7 @@
GTK_BUTTONS_OK,
_("Satellite %s has no passes for\n"\
"the current ground station!"),
- sat->tle.sat_name);
+ sat->nickname);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
Modified: trunk/src/gtk-sat-map.c
===================================================================
--- trunk/src/gtk-sat-map.c 2009-08-06 20:44:36 UTC (rev 386)
+++ trunk/src/gtk-sat-map.c 2009-08-06 21:08:29 UTC (rev 387)
@@ -671,13 +671,13 @@
buff = g_strdup_printf (_("<span background=\"#%s\"> "\
"Next: %s in %s%d:%s%d%s%d </span>"),
satmap->infobgd,
- sat->tle.sat_name,
+ sat->nickname,
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->tle.sat_name,
+ sat->nickname,
cm, m, cs, s);
g_object_set (satmap->next,
@@ -1683,7 +1683,7 @@
"stroke-color-rgba", col,
NULL);
- obj->label = goo_canvas_text_model_new (root, sat->tle.sat_name,
+ obj->label = goo_canvas_text_model_new (root, sat->nickname,
x,
y+2,
-1,
@@ -1960,11 +1960,11 @@
if (isgeo) {
if (sat->el > 0.0) {
text = g_strdup_printf ("<span background=\"#%s\"> %s: Always in range </span>",
- satmap->infobgd, sat->tle.sat_name);
+ satmap->infobgd, sat->nickname);
}
else {
text = g_strdup_printf ("<span background=\"#%s\"> %s: Always out of range </span>",
- satmap->infobgd, sat->tle.sat_name);
+ satmap->infobgd, sat->nickname);
}
}
else {
@@ -2000,13 +2000,13 @@
if (h > 0) {
text = g_strdup_printf ("<span background=\"#%s\"> "\
"%s %s in %s%d:%s%d%s%d </span>",
- satmap->infobgd, sat->tle.sat_name,
+ satmap->infobgd, sat->nickname,
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->tle.sat_name,
+ satmap->infobgd, sat->nickname,
alsstr, cm, m, cs, s);
}
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2009-08-06 20:44:36 UTC (rev 386)
+++ trunk/src/gtk-sat-module.c 2009-08-06 21:08:29 UTC (rev 387)
@@ -237,18 +237,6 @@
}
-/* static void dump_data(gpointer key, */
-/* gpointer value, */
-/* gpointer user_data) */
-/* { */
-/* gint *catnum = key; */
-
-/* g_print ("SATELLITE: %5d\t%s\t%d\n", */
-/* *catnum, */
-/* SAT(value)->tle.sat_name, */
-/* SAT(value)->flags); */
-/* } */
-
/**** FIXME: Program goes into infinite loop when there is something
wrong with cfg file. */
GtkWidget *
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2009-08-06 20:44:36 UTC (rev 386)
+++ trunk/src/gtk-single-sat.c 2009-08-06 21:08:29 UTC (rev 387)
@@ -258,7 +258,7 @@
/* create header */
sat = SAT (g_slist_nth_data (GTK_SINGLE_SAT (widget)->sats, 0));
- title = g_strdup_printf ("<b>%s</b>", sat ? sat->tle.sat_name : "noname");
+ title = g_strdup_printf ("<b>%s</b>", sat ? sat->nickname : "noname");
GTK_SINGLE_SAT (widget)->header = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (GTK_SINGLE_SAT (widget)->header), title);
@@ -812,7 +812,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->tle.sat_name);
+ buff = g_strdup_printf ("<b>%s</b>", sat->nickname);
gtk_label_set_markup (GTK_LABEL (label), buff);
g_free (buff);
gtk_container_add (GTK_CONTAINER (menuitem), label);
@@ -938,7 +938,7 @@
sat = SAT (g_slist_nth_data (ssat->sats, i));
- title = g_strdup_printf ("<b>%s</b>", sat->tle.sat_name);
+ title = g_strdup_printf ("<b>%s</b>", sat->nickname);
gtk_label_set_markup (GTK_LABEL (ssat->header), title);
g_free (title);
@@ -1042,7 +1042,7 @@
}
if (pass != NULL) {
- show_pass (sat->tle.sat_name, qth, pass, GTK_WIDGET (toplevel));
+ show_pass (sat->nickname, qth, pass, GTK_WIDGET (toplevel));
}
else {
/* show dialog that there are no passes within time frame */
@@ -1053,7 +1053,7 @@
GTK_BUTTONS_OK,
_("Satellite %s has no passes\n"\
"within the next %d days"),
- sat->tle.sat_name,
+ sat->nickname,
sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -1072,7 +1072,7 @@
"This can be because the satellite\n"\
"is geostationary, decayed or simply\n"\
"never comes above the horizon"),
- sat->tle.sat_name);
+ sat->nickname);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -1113,7 +1113,7 @@
if (passes != NULL) {
- show_passes (sat->tle.sat_name, qth, passes, GTK_WIDGET (toplevel));
+ show_passes (sat->nickname, qth, passes, GTK_WIDGET (toplevel));
}
else {
/* show dialog that there are no passes within time frame */
@@ -1124,7 +1124,7 @@
GTK_BUTTONS_OK,
_("Satellite %s has no passes\n"\
"within the next %d days"),
- sat->tle.sat_name,
+ sat->nickname,
sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -1143,7 +1143,7 @@
GTK_BUTTONS_OK,
_("Satellite %s has no passes for\n"\
"the current ground station!"),
- sat->tle.sat_name);
+ sat->nickname);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
Modified: trunk/src/gtk-sky-glance.c
===================================================================
--- trunk/src/gtk-sky-glance.c 2009-08-06 20:44:36 UTC (rev 386)
+++ trunk/src/gtk-sky-glance.c 2009-08-06 21:08:29 UTC (rev 387)
@@ -885,7 +885,7 @@
n = g_slist_length (passes);
sat_log_log (SAT_LOG_LEVEL_DEBUG,
_("%s:%d: %s has %d passes within %.4f days\n"),
- __FILE__, __LINE__, sat->tle.sat_name, n, maxdt);
+ __FILE__, __LINE__, sat->nickname, n, maxdt);
/* add sky_pass_t items to skg->passes */
if (passes != NULL) {
@@ -920,7 +920,7 @@
free_passes (passes);
/* add satellite label */
- lab = goo_canvas_text_model_new (root, sat->tle.sat_name,
+ lab = goo_canvas_text_model_new (root, sat->nickname,
5, 0, -1, GTK_ANCHOR_W,
"font", "Sans 8",
"fill-color-rgba", bcol,
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2009-08-06 20:44:36 UTC (rev 386)
+++ trunk/src/main.c 2009-08-06 21:08:29 UTC (rev 387)
@@ -84,8 +84,7 @@
static void test_ui (void);
-int
- main (int argc, char *argv[])
+int main (int argc, char *argv[])
{
guint error = 0;
@@ -108,6 +107,7 @@
/* check that user settings are ok */
error = first_time_check_run ();
+
if (error) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: User config check failed (code %d). This is fatal.\n"\
@@ -118,15 +118,6 @@
return 1;
}
- /* initialise sub-systems */
- if (tle_lookup_init (NULL) != TLE_LOOKUP_INIT_OK) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: TLE check failed! This is fatal."),
- __FUNCTION__);
-
- return -1;
- }
-
sat_cfg_load ();
/* get logging level */
@@ -141,7 +132,7 @@
/* launch TLE monitoring task; 10 min interval */
tle_mon_id = g_timeout_add (600000, tle_mon_task, NULL);
- test_ui ();
+ //test_ui ();
gtk_main ();
@@ -236,7 +227,7 @@
* to make a clean exit.
*/
static void
- gpredict_sig_handler (int sig)
+gpredict_sig_handler (int sig)
{
/* satlog_log (SAT_LOG_ERROR, "Received signal: %d\n", sig); */
/* satlog_log (SAT_LOG_ERROR, "Trying clean exit...\n"); */
@@ -258,9 +249,9 @@
*
*/
static gint
- gpredict_app_delete (GtkWidget *widget,
- GdkEvent *event,
- gpointer data)
+gpredict_app_delete (GtkWidget *widget,
+ GdkEvent *event,
+ gpointer data)
{
return FALSE;
}
@@ -277,8 +268,8 @@
*
*/
static void
- gpredict_app_destroy (GtkWidget *widget,
- gpointer data)
+gpredict_app_destroy (GtkWidget *widget,
+ gpointer data)
{
/* stop TLE monitoring task */
@@ -325,7 +316,7 @@
*
*/
static gboolean
- gpredict_app_config (GtkWidget *widget, GdkEventConfigure *event, gpointer data)
+gpredict_app_config (GtkWidget *widget, GdkEventConfigure *event, gpointer data)
{
gint x, y;
@@ -375,7 +366,7 @@
* avoid a new notification the next time the taks would be run.
*/
static gboolean
- tle_mon_task (gpointer data)
+tle_mon_task (gpointer data)
{
glong last,now,thrld;
GTimeVal tval;
@@ -474,7 +465,7 @@
/** \brief Stop TLE monitoring and any pending updates. */
static void
- tle_mon_stop ()
+tle_mon_stop ()
{
gboolean retcode;
@@ -498,7 +489,7 @@
/** \brief Thread function which invokes TLE update */
static gpointer
- update_tle_thread (gpointer data)
+update_tle_thread (gpointer data)
{
tle_upd_running = TRUE;
Modified: trunk/src/predict-tools.c
===================================================================
--- trunk/src/predict-tools.c 2009-08-06 20:44:36 UTC (rev 386)
+++ trunk/src/predict-tools.c 2009-08-06 21:08:29 UTC (rev 387)
@@ -484,7 +484,7 @@
pass->vis[1] = '-';
pass->vis[2] = '-';
pass->vis[3] = 0;
- pass->satname = g_strdup (sat->tle.sat_name);
+ pass->satname = g_strdup (sat->nickname);
pass->details = NULL;
/* iterate over each time step */
@@ -901,7 +901,7 @@
pass->vis[1] = '-';
pass->vis[2] = '-';
pass->vis[3] = 0;
- pass->satname = g_strdup (sat->tle.sat_name);
+ pass->satname = g_strdup (sat->nickname);
pass->details = NULL;
/* iterate over each time step */
Modified: trunk/src/sat-info.c
===================================================================
--- trunk/src/sat-info.c 2009-08-06 20:44:36 UTC (rev 386)
+++ trunk/src/sat-info.c 2009-08-06 21:08:29 UTC (rev 387)
@@ -86,7 +86,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->tle.sat_name);
+ str = g_strdup_printf (_("<b>%s</b>"), sat->nickname);
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
