[Gpredict-svn] SF.net SVN: gpredict:[200] trunk
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
[Gpredict-svn] SF.net SVN: gpredict:[200] trunk
|
From: <cs...@us...> - 2009-03-17 21:41:17
|
Revision: 200
http://gpredict.svn.sourceforge.net/gpredict/?rev=200&view=rev
Author: csete
Date: 2009-03-17 21:41:06 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
Applied new patch removing proxy configuration.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/src/sat-cfg.c
trunk/src/sat-cfg.h
trunk/src/sat-pref-tle.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-16 20:32:52 UTC (rev 199)
+++ trunk/ChangeLog 2009-03-17 21:41:06 UTC (rev 200)
@@ -1,5 +1,12 @@
2009-03-16 Bruce Cowan <bc...@fa...>
+ * src/sat-cfg.[ch]:
+ * src/sat-pref-tle.c:
+ Remove proxy configuration item, taken care by GVFS.
+
+
+2009-03-16 Bruce Cowan <bc...@fa...>
+
* src/menubar.c:
* src/tle-update.c:
Port TLE download to GIO.
@@ -15,6 +22,7 @@
* NEWS:
Updated.
+
2009-03-01; Alexandru Csete <oz...@gm...>
* configure.ac:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-03-16 20:32:52 UTC (rev 199)
+++ trunk/NEWS 2009-03-17 21:41:06 UTC (rev 200)
@@ -18,6 +18,7 @@
- Fixed bug 2130912: Crash when no rig or no rotator are defined.
- Fixed bug 2170642: Small error in user manual.
- Applied patch 2688135: Use GIO instead of libcurl for TLE download.
+ Note: This removes proxy management from gpredict.
x Windows: New installer instead of ZIP distribution.
- Updated PDF user manual.
- French translation.
Modified: trunk/src/sat-cfg.c
===================================================================
--- trunk/src/sat-cfg.c 2009-03-16 20:32:52 UTC (rev 199)
+++ trunk/src/sat-cfg.c 2009-03-17 21:41:06 UTC (rev 200)
@@ -130,7 +130,6 @@
{ "MODULES", "POLAR_CURSOR_TRACK", TRUE},
{ "MODULES", "POLAR_EXTRA_AZ_TICKS", FALSE},
{ "TLE", "SERVER_AUTH", FALSE},
- { "TLE", "PROXY_AUTH", FALSE},
{ "TLE", "ADD_NEW_SATS", TRUE},
{ "LOG", "KEEP_LOG_FILES", FALSE},
{ "PREDICT", "USE_REAL_T0", FALSE}
@@ -215,7 +214,6 @@
{ "TLE", "SERVER", "http://www.celestrak.com/NORAD/elements/"},
{ "TLE", "FILES", "amateur.txt;cubesat.txt;galileo.txt;geo.txt;gps-ops.txt;"\
"iridium.txt;military.txt;radar.txt;science.txt;weather.txt"},
- { "TLE", "PROXY", NULL},
{ "TLE", "FILE_DIR", NULL},
{ "TLE", "EXTENSION", "*.*"},
{ "PREDICT", "SAVE_DIR", NULL}
Modified: trunk/src/sat-cfg.h
===================================================================
--- trunk/src/sat-cfg.h 2009-03-16 20:32:52 UTC (rev 199)
+++ trunk/src/sat-cfg.h 2009-03-17 21:41:06 UTC (rev 200)
@@ -52,7 +52,6 @@
SAT_CFG_BOOL_POL_SHOW_CURS_TRACK, /*!< Track mouse cursor on polar plot. */
SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS, /*!< Extra Az ticks at every 30 deg. */
SAT_CFG_BOOL_TLE_SERVER_AUTH, /*!< TLE server requires authentication. */
- SAT_CFG_BOOL_TLE_PROXY_AUTH, /*!< Proxy requires authentication. */
SAT_CFG_BOOL_TLE_ADD_NEW, /*!< Add new satellites to database. */
SAT_CFG_BOOL_KEEP_LOG_FILES, /*!< Whether to keep old log files */
SAT_CFG_BOOL_PRED_USE_REAL_T0, /*!< Whether to use current time as T0 fro predictions */
@@ -139,7 +138,6 @@
SAT_CFG_STR_POL_FONT, /*!< Polar view font. */
SAT_CFG_STR_TLE_SERVER, /*!< Server for TLE updates. */
SAT_CFG_STR_TLE_FILES, /*!< ; separated list of files on server. */
- SAT_CFG_STR_TLE_PROXY, /*!< Proxy server. */
SAT_CFG_STR_TLE_FILE_DIR, /*!< Local directory from which tle were last updated. */
SAT_CFG_STR_TLE_FILE_EXT, /*!< File extensions. */
SAT_CFG_STR_PRED_SAVE_DIR, /*!< Last used save directory for pass predictions */
Modified: trunk/src/sat-pref-tle.c
===================================================================
--- trunk/src/sat-pref-tle.c 2009-03-16 20:32:52 UTC (rev 199)
+++ trunk/src/sat-pref-tle.c 2009-03-17 21:41:06 UTC (rev 200)
@@ -42,7 +42,7 @@
static GtkWidget *warn,*autom;
/* internet updates */
-static GtkWidget *server,*proxy,*files;
+static GtkWidget *server,*files;
/* add new sats */
static GtkWidget *addnew;
@@ -134,10 +134,6 @@
sat_cfg_set_str (SAT_CFG_STR_TLE_SERVER,
gtk_entry_get_text (GTK_ENTRY (server)));
- /* proxy */
- sat_cfg_set_str (SAT_CFG_STR_TLE_PROXY,
- gtk_entry_get_text (GTK_ENTRY (proxy)));
-
/* files */
sat_cfg_set_str (SAT_CFG_STR_TLE_FILES,
gtk_entry_get_text (GTK_ENTRY (files)));
@@ -154,7 +150,6 @@
sat_cfg_reset_int (SAT_CFG_INT_TLE_AUTO_UPD_FREQ);
sat_cfg_reset_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION);
sat_cfg_reset_str (SAT_CFG_STR_TLE_SERVER);
- sat_cfg_reset_str (SAT_CFG_STR_TLE_PROXY);
sat_cfg_reset_str (SAT_CFG_STR_TLE_FILES);
sat_cfg_reset_bool (SAT_CFG_BOOL_TLE_ADD_NEW);
@@ -255,24 +250,7 @@
g_signal_connect (server, "changed", G_CALLBACK (value_changed_cb), NULL);
gtk_table_attach (GTK_TABLE (table), server, 1, 2, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-
- /* proxy */
- label = gtk_label_new (_("Proxy server:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
- proxy = gtk_entry_new ();
- if (sat_cfg_get_str (SAT_CFG_STR_TLE_PROXY))
- gtk_entry_set_text (GTK_ENTRY (proxy), sat_cfg_get_str (SAT_CFG_STR_TLE_PROXY));
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, proxy,
- _("Enter URL for local proxy server. e.g.\n"\
- "http://my.proxy.com"),
- NULL);
- g_signal_connect (proxy, "changed", G_CALLBACK (value_changed_cb), NULL);
- gtk_table_attach (GTK_TABLE (table), proxy, 1, 2, 1, 2,
- GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-
/* Files */
label = gtk_label_new (_("Files to fetch:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
@@ -396,9 +374,6 @@
/* server */
gtk_entry_set_text (GTK_ENTRY (server), sat_cfg_get_str_def (SAT_CFG_STR_TLE_SERVER));
- /* proxy */
- gtk_entry_set_text (GTK_ENTRY (proxy), "");
-
/* files */
gtk_entry_set_text (GTK_ENTRY (files), sat_cfg_get_str_def (SAT_CFG_STR_TLE_FILES));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
