Remove the wipe trackers option.

svn path=/trunk/; revision=11486

5 files changed, 17 insertions, 78 deletions

diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index c08ca3bbc1..0c6927468a 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,5 +1,17 @@
 2001-07-30  Iain Holmes  <iain@ximian.com>
 
+	* e-summary-preferences.c: Remove the Wipe Trackers references.
+	
+	* e-summary-rdf.c: Remove the wip trackers as I'm not 100% sure what it
+	does, and it didn't work.
+
+	* e-summary.h: Remove the wipe_trackers boolean
+
+	* my-evolution.glade: Remove the wipe trackers and shrink the New Feed
+	button
+
+2001-07-30  Iain Holmes  <iain@ximian.com>
+
 	* e-sumary-calendar.c (generate_html): Correct the URL for the links.
 
 2001-07-27  Iain Holmes  <iain@ximian.com>
diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c
index 7f42dea9b5..42d96b4b61 100644
--- a/my-evolution/e-summary-preferences.c
+++ b/my-evolution/e-summary-preferences.c
@@ -165,7 +165,6 @@ e_summary_preferences_restore (ESummaryPrefs *prefs)
 	prefs->rdf_refresh_time = bonobo_config_get_long_with_default (db, "My-Evolution/RDF/rdf_refresh_time", 600, NULL);
 
 	prefs->limit = bonobo_config_get_long_with_default (db, "My-Evolution/RDF/limit", 10, NULL);
-	prefs->wipe_trackers = bonobo_config_get_boolean_with_default (db, "My-Evolution/RDF/wipe_trackers", FALSE, NULL);
 
 	vector = bonobo_config_get_string (db, "My-Evolution/Weather/stations", &ev);
 	if (BONOBO_EX (&ev) || vector == NULL) {
@@ -245,7 +244,6 @@ e_summary_preferences_save (ESummaryPrefs *prefs)
 
 	bonobo_config_set_long (db, "My-Evolution/RDF/rdf_refresh_time", prefs->rdf_refresh_time, NULL);
 	bonobo_config_set_long (db, "My-Evolution/RDF/limit", prefs->limit, NULL);
-	bonobo_config_set_boolean (db, "My-Evolution/RDF/wipe_trackers", prefs->wipe_trackers, NULL);
 
 	vector = vector_from_str_list (prefs->stations);
 	bonobo_config_set_string (db, "My-Evolution/Weather/stations", vector, NULL);
@@ -319,7 +317,6 @@ e_summary_preferences_copy (ESummaryPrefs *prefs)
 	prefs_copy->rdf_urls = copy_str_list (prefs->rdf_urls);
 	prefs_copy->rdf_refresh_time = prefs->rdf_refresh_time;
 	prefs_copy->limit = prefs->limit;
-	prefs_copy->wipe_trackers = prefs->wipe_trackers;
 
 	prefs_copy->stations = copy_str_list (prefs->stations);
 	prefs_copy->units = prefs->units;
@@ -356,7 +353,6 @@ e_summary_preferences_init (ESummary *summary)
 	make_initial_rdf_list (prefs);
 	prefs->rdf_refresh_time = 600;
 	prefs->limit = 10;
-	prefs->wipe_trackers = FALSE;
 
 	/* Weather */
 	make_initial_weather_list (prefs);
@@ -375,7 +371,7 @@ struct _MailPage {
 
 struct _RDFPage {
 	GtkWidget *all, *shown;
-	GtkWidget *refresh, *limit, *wipe_trackers;
+	GtkWidget *refresh, *limit;
 	GtkWidget *add, *remove;
 	GtkWidget *new_url;
 
@@ -769,15 +765,6 @@ rdf_shown_unselect_row_cb (GtkCList *clist,
 }
 
 static void
-rdf_wipe_trackers_toggled_cb (GtkToggleButton *tb,
-			      PropertyData *pd)
-{
-	pd->summary->preferences->wipe_trackers = gtk_toggle_button_get_active (tb);
-
-	gnome_property_box_changed (pd->box);
-}
-
-static void
 rdf_add_clicked_cb (GtkButton *button,
 		    PropertyData *pd)
 {
@@ -1216,10 +1203,6 @@ make_property_dialog (PropertyData *pd)
 	gtk_signal_connect (GTK_OBJECT (GTK_SPIN_BUTTON (rdf->limit)->adjustment), "value_changed",
 			    GTK_SIGNAL_FUNC (rdf_limit_value_changed_cb), pd);
 
-	rdf->wipe_trackers = glade_xml_get_widget (pd->xml, "checkbutton2");
-	g_return_val_if_fail (rdf->wipe_trackers != NULL, FALSE);
-	gtk_signal_connect (GTK_OBJECT (rdf->wipe_trackers), "toggled",
-			    GTK_SIGNAL_FUNC (rdf_wipe_trackers_toggled_cb), pd);
 	rdf->add = glade_xml_get_widget (pd->xml, "button9");
 	g_return_val_if_fail (rdf->add != NULL, FALSE);
 
diff --git a/my-evolution/e-summary-rdf.c b/my-evolution/e-summary-rdf.c
index 5677e5628d..3a6eae6754 100644
--- a/my-evolution/e-summary-rdf.c
+++ b/my-evolution/e-summary-rdf.c
@@ -154,7 +154,6 @@ tree_walk (xmlNodePtr root,
 	xmlNodePtr channel = NULL;
 	xmlNodePtr image = NULL;
 	xmlNodePtr item[16];
-	gboolean wipe_trackers;
 	int items = 0;
 	int limit;
 	int i;
@@ -163,10 +162,8 @@ tree_walk (xmlNodePtr root,
 
 	if (r->summary->preferences == NULL) {
 		limit = 10;
-		wipe_trackers = FALSE;
 	} else {
 		limit = r->summary->preferences->limit;
-		wipe_trackers = r->summary->preferences->wipe_trackers;
 	}
 
 	/* FIXME: Need arrows */
@@ -257,38 +254,9 @@ tree_walk (xmlNodePtr root,
 	for (i = 0; i < items; i++) {
 		char *p = layer_find (item[i]->childs, "title", "No information");
 		
-		if (wipe_trackers) {
-			char *p = layer_find_url (item[i]->childs, "link", "");
-			char *x = strchr (p, '?');
-			unsigned char *r, *w;
-			int n;
-			if (x == NULL)
-				continue;
-			x++;
-			r = x;
-			w = x;
-			while (*r) {
-				if (*r == '+') {
-					*w++ = ' ';
-				} else if (*r == '%') {
-					sscanf (r+1, "%02x", &n);
-					*w++ = n;
-					r += 2;
-				} else {
-					*w++ = *r;
-					}
-				r++;
-			}
-			*w = 0;
-			tmp = g_strdup_printf ("<LI><font size=\"-1\"><A href=\"%s\">\n", x+4);
-			g_string_append (html, tmp);
-			g_free (tmp);
-		}
-		else {
-			tmp = g_strdup_printf ("<LI><font size=\"-1\"><A href=\"%s\">\n", layer_find_url(item[i]->childs, "link", ""));
-			g_string_append (html, tmp);
-			g_free (tmp);
-		}
+		tmp = g_strdup_printf ("<LI><font size=\"-1\"><A href=\"%s\">\n", layer_find_url(item[i]->childs, "link", ""));
+		g_string_append (html, tmp);
+		g_free (tmp);
 		
 		p = e_utf8_from_locale_string (p);
 		tmp = g_strdup_printf ("%s\n</A></font></li>", p);
diff --git a/my-evolution/e-summary.h b/my-evolution/e-summary.h
index 24e643b787..8c2b4e7ee9 100644
--- a/my-evolution/e-summary.h
+++ b/my-evolution/e-summary.h
@@ -69,7 +69,6 @@ struct _ESummaryPrefs {
 	GList *rdf_urls;
 	int rdf_refresh_time;
 	int limit;
-	gboolean wipe_trackers;
 
 	/* Weather */
 	GList *stations;
diff --git a/my-evolution/my-evolution.glade b/my-evolution/my-evolution.glade
index 15f24d2670..90be02ea0f 100644
--- a/my-evolution/my-evolution.glade
+++ b/my-evolution/my-evolution.glade
@@ -735,29 +735,6 @@
 	  </widget>
 
 	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton2</name>
-	    <can_focus>True</can_focus>
-	    <label>Wipe trackers</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>5</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
 	    <class>GtkButton</class>
 	    <name>button11</name>
 	    <can_focus>True</can_focus>
@@ -770,7 +747,7 @@
 	      <bottom_attach>1</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
+	      <xexpand>False</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>