aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--art/Makefile.am3
-rw-r--r--my-evolution/ChangeLog9
-rw-r--r--my-evolution/e-summary-calendar.c4
-rw-r--r--my-evolution/e-summary-mail.c45
-rw-r--r--my-evolution/e-summary-tasks.c8
5 files changed, 54 insertions, 15 deletions
diff --git a/art/Makefile.am b/art/Makefile.am
index ab7ca76f6b..0828716318 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -69,6 +69,9 @@ images_DATA = \
mail-config-druid-receive.png \
mail-config-druid-send.png \
mail-config-druid-account-name.png \
+ myevo-appointments.png \
+ myevo-mail-summary.png \
+ myevo-post-it.png \
myweather-rain.png \
myweather-snow.png \
myweather-storm.png \
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index c108a1c758..b7a56d49d4 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-02 Jason Leach <jleach@ximian.com>
+
+ * e-summary-calendar.c (generate_html): Use the new and beautiful
+ icon from Jakub.
+
+ * e-summary-mail.c (e_summary_mail_generate_html): Ditto.
+
+ * e-summary-tasks.c (generate_html): Ditto.
+
2001-07-23 Zbigniew Chyla <cyba@gnome.pl>
* e-summary-rdf.c (display_doc): Convert translated string to UTF8.
diff --git a/my-evolution/e-summary-calendar.c b/my-evolution/e-summary-calendar.c
index 33d4f15a39..442bf1db6e 100644
--- a/my-evolution/e-summary-calendar.c
+++ b/my-evolution/e-summary-calendar.c
@@ -176,7 +176,7 @@ generate_html (gpointer data)
s1 = e_utf8_from_locale_string (_("Appointments"));
s2 = e_utf8_from_locale_string (_("No appointments"));
g_free (calendar->html);
- calendar->html = g_strconcat ("<dl><dt><img src=\"ico-calendar.png\" align=\"middle\" "
+ calendar->html = g_strconcat ("<dl><dt><img src=\"myevo-appointments.png\" align=\"middle\" "
"alt=\"\" width=\"48\" height=\"48\"> <b><a href=\"evolution:/local/Calendar\">",
s1, "</a></b></dt><dd><b>", s2, "</b></dd></dl>", NULL);
g_free (s1);
@@ -189,7 +189,7 @@ generate_html (gpointer data)
uids = cal_list_sort (uids, sort_uids, summary);
- string = g_string_new ("<dl><dt><img src=\"ico-calendar.png\" align=\"middle\" "
+ string = g_string_new ("<dl><dt><img src=\"myevo-appointments.png\" align=\"middle\" "
"alt=\"\" width=\"48\" height=\"48\"> <b><a href=\"evolution:/local/Calendar\">");
s = e_utf8_from_locale_string (_("Appointments"));
g_string_append (string, s);
diff --git a/my-evolution/e-summary-mail.c b/my-evolution/e-summary-mail.c
index dda2fa6ed4..b024e42c4f 100644
--- a/my-evolution/e-summary-mail.c
+++ b/my-evolution/e-summary-mail.c
@@ -18,6 +18,7 @@
#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
+#include <libgnome/gnome-util.h> /* gnome_util_prepend_user_home */
#include <gtk/gtksignal.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-listener.h>
@@ -98,7 +99,7 @@ e_summary_mail_generate_html (ESummary *summary)
g_return_if_fail (IS_E_SUMMARY (summary));
mail = summary->mail;
- string = g_string_new ("<dl><dt><img src=\"ico-mail.png\" "
+ string = g_string_new ("<dl><dt><img src=\"myevo-mail-summary.png\" "
"align=\"middle\" alt=\"\" width=\"48\" "
"height=\"48\"> <b><a href=\"evolution:/local/Inbox\">");
s = e_utf8_from_locale_string (_("Mail summary"));
@@ -183,6 +184,29 @@ new_folder_cb (EvolutionStorageListener *listener,
}
static void
+update_folder_cb (EvolutionStorageListener *listener,
+ const char *path,
+ const char *display_name,
+ ESummary *summary)
+{
+ char *evolution_dir;
+ char *proto;
+ char *uri;
+
+ evolution_dir = gnome_util_prepend_user_home ("evolution/local");
+
+ proto = g_strconcat ("file://", evolution_dir, NULL);
+ uri = e_path_to_physical (proto, path);
+ printf ("uri in update: %s\n", uri);
+
+ e_summary_mail_get_info (summary->mail, uri, summary->mail->listener);
+
+ g_free (uri);
+ g_free (evolution_dir);
+ g_free (proto);
+}
+
+static void
remove_folder_cb (EvolutionStorageListener *listener,
const char *path,
ESummary *summary)
@@ -265,7 +289,9 @@ e_summary_mail_register_storage (ESummary *summary,
GTK_SIGNAL_FUNC (new_folder_cb), summary);
gtk_signal_connect (GTK_OBJECT (mail->storage_listener), "removed-folder",
GTK_SIGNAL_FUNC (remove_folder_cb), summary);
- }
+ gtk_signal_connect (GTK_OBJECT (mail->storage_listener), "update_folder",
+ GTK_SIGNAL_FUNC (update_folder_cb), summary);
+ }
listener = mail->storage_listener;
corba_listener = evolution_storage_listener_corba_objref (listener);
@@ -278,10 +304,11 @@ e_summary_mail_register_storage (ESummary *summary,
CORBA_exception_free (&ev);
g_free (mail);
- return TRUE;
+ return FALSE;
}
CORBA_exception_free (&ev);
+
return TRUE;
}
@@ -289,14 +316,13 @@ static gboolean
e_summary_mail_register_storages (ESummary *summary,
GNOME_Evolution_Shell corba_shell)
{
- GNOME_Evolution_LocalStorage local_storage;
+ GNOME_Evolution_Storage local_storage;
CORBA_Environment ev;
g_return_val_if_fail (summary != NULL, FALSE);
g_return_val_if_fail (IS_E_SUMMARY (summary), FALSE);
CORBA_exception_init (&ev);
-
local_storage = GNOME_Evolution_Shell_getLocalStorage (corba_shell, &ev);
if (BONOBO_EX (&ev)) {
g_warning ("Exception getting local storage: %s",
@@ -305,11 +331,12 @@ e_summary_mail_register_storages (ESummary *summary,
return FALSE;
}
-
- e_summary_mail_register_storage (summary, local_storage);
-
CORBA_exception_free (&ev);
- return TRUE;
+
+ if (e_summary_mail_register_storage (summary, local_storage))
+ return TRUE;
+ else
+ return FALSE;
}
void
diff --git a/my-evolution/e-summary-tasks.c b/my-evolution/e-summary-tasks.c
index 27ef1a4cbe..d691b58e1e 100644
--- a/my-evolution/e-summary-tasks.c
+++ b/my-evolution/e-summary-tasks.c
@@ -205,9 +205,9 @@ generate_html (gpointer data)
s1 = e_utf8_from_locale_string (_("Tasks"));
s2 = e_utf8_from_locale_string (_("No tasks"));
g_free (tasks->html);
- tasks->html = g_strconcat ("<dl><dt><img src=\"ico-calendar.png\" align=\"middle\" "
- "alt=\"\" width=\"48\" height=\"48\"> <b><a href=\"evolution:/local/Tasks\">",
- s1, "</a></b></dt><dd><b>", s2, "</b></dd></dl>", NULL);
+ tasks->html = g_strconcat ("<dl><dt><img src=\"myevo-post-it.png\" align=\"middle\" "
+ "alt=\"\" width=\"48\" height=\"48\"> <b><a href=\"evolution:/local/Tasks\">",
+ s1, "</a></b></dt><dd><b>", s2, "</b></dd></dl>", NULL);
g_free (s1);
g_free (s2);
@@ -216,7 +216,7 @@ generate_html (gpointer data)
} else {
char *s;
- string = g_string_new ("<dl><dt><img src=\"ico-calendar.png\" align=\"middle\" "
+ string = g_string_new ("<dl><dt><img src=\"myevo-post-it.png\" align=\"middle\" "
"alt=\"\" width=\"48\" height=\"48\"> <b><a href=\"evolution:/local/Tasks\">");
s = e_utf8_from_locale_string (_("Tasks"));
g_string_append (string, s);
generated by cgit (git 2.34.1) at 2024-11-12 05:39:29 +0800