aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2001-07-19 05:50:40 +0800
committerIain Holmes <iain@src.gnome.org>2001-07-19 05:50:40 +0800
commitf939dcc6c8259dc6156d95a3a65581a2b3b51061 (patch)
treeb4824ddcabbcc4736a814741e1bd4e2d665bbebf
parentcdd1ac0d65dfaed0934f84ce8fbe50d1f055e8ea (diff)
downloadgsoc2013-evolution-f939dcc6c8259dc6156d95a3a65581a2b3b51061.tar
gsoc2013-evolution-f939dcc6c8259dc6156d95a3a65581a2b3b51061.tar.gz
gsoc2013-evolution-f939dcc6c8259dc6156d95a3a65581a2b3b51061.tar.bz2
gsoc2013-evolution-f939dcc6c8259dc6156d95a3a65581a2b3b51061.tar.lz
gsoc2013-evolution-f939dcc6c8259dc6156d95a3a65581a2b3b51061.tar.xz
gsoc2013-evolution-f939dcc6c8259dc6156d95a3a65581a2b3b51061.tar.zst
gsoc2013-evolution-f939dcc6c8259dc6156d95a3a65581a2b3b51061.zip
More stuff
svn path=/trunk/; revision=11214
-rw-r--r--my-evolution/ChangeLog8
-rw-r--r--my-evolution/e-summary-tasks.c3
-rw-r--r--my-evolution/e-summary-weather.c5
-rw-r--r--my-evolution/e-summary.c22
4 files changed, 28 insertions, 10 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index f53d3aa184..8d5cab4a1c 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,5 +1,13 @@
2001-07-18 Iain Holmes <iain@ximian.com>
+ * e-summary-weather.c (weather_make_html): Remove the (more) link.
+
+ * e-summary.c (e_summary_draw): Don't append NULL to the GString.
+
+ * e-summary-tasks.c: Remove spewage.
+
+2001-07-18 Iain Holmes <iain@ximian.com>
+
* e-summary-weather.c (weather_make_html): Remove spewage.
2001-07-18 Iain Holmes <iain@ximian.com>
diff --git a/my-evolution/e-summary-tasks.c b/my-evolution/e-summary-tasks.c
index 8e75245f38..27ef1a4cbe 100644
--- a/my-evolution/e-summary-tasks.c
+++ b/my-evolution/e-summary-tasks.c
@@ -164,9 +164,6 @@ get_todays_uids (CalClient *client,
if (endt >= todays_start && endt <= todays_end) {
today = g_list_append (today, g_strdup (uid));
}
- g_print ("Check da mic\n");
- } else {
- g_print ("Duff\n");
}
}
diff --git a/my-evolution/e-summary-weather.c b/my-evolution/e-summary-weather.c
index 0f3299e002..b64408b76b 100644
--- a/my-evolution/e-summary-weather.c
+++ b/my-evolution/e-summary-weather.c
@@ -121,13 +121,16 @@ weather_make_html (Weather *w)
g_free (s);
g_free (temp);
+#if 0
g_string_append (string, "<font size=\"-1\">");
uri = g_strdup_printf ("<a href=\"weather://%p\">", w);
g_string_append (string, uri);
g_free (uri);
g_string_append (string, "(More)</a></font></font></blockquote></dd>");
-
+#else
+ g_string_append (string, "</font></blockquote></dd>");
+#endif
if (w->html != NULL) {
g_free (w->html);
}
diff --git a/my-evolution/e-summary.c b/my-evolution/e-summary.c
index 79b42cb23e..0de680557a 100644
--- a/my-evolution/e-summary.c
+++ b/my-evolution/e-summary.c
@@ -153,21 +153,31 @@ e_summary_draw (ESummary *summary)
/* Weather and RDF stuff here */
html = e_summary_weather_get_html (summary);
- g_string_append (string, html);
+ if (html != NULL) {
+ g_string_append (string, html);
+ }
html = e_summary_rdf_get_html (summary);
- g_string_append (string, html);
+ if (html != NULL) {
+ g_string_append (string, html);
+ }
g_string_append (string, HTML_4);
html = (char *) e_summary_mail_get_html (summary);
-
- g_string_append (string, html);
+ if (html != NULL) {
+ g_string_append (string, html);
+ }
html = (char *) e_summary_calendar_get_html (summary);
- g_string_append (string, html);
+ if (html != NULL) {
+ g_string_append (string, html);
+ }
+
html = (char *) e_summary_tasks_get_html (summary);
- g_string_append (string, html);
+ if (html != NULL) {
+ g_string_append (string, html);
+ }
g_string_append (string, HTML_5);