aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--my-evolution/ChangeLog8
-rw-r--r--my-evolution/component-factory.c5
-rw-r--r--my-evolution/e-summary-preferences.c2
-rw-r--r--my-evolution/e-summary.c6
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-storage-set-view.c7
-rw-r--r--shell/e-summary-storage.c4
7 files changed, 27 insertions, 11 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 91493d6a07..daef38524c 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-15 Iain Holmes <iain@ximian.com>
+
+ * e-summary.c: s/My Evolution/Summary/
+
+ * e-summary-preferences.c: s/My Evolution/Summary/
+
+ * component-factory.c: s/My Evolution/Summary/
+
2001-08-13 Iain Holmes <iain@ximian.com>
* e-summary-weather.c: Set the default weather stations to Boston (boo)
diff --git a/my-evolution/component-factory.c b/my-evolution/component-factory.c
index 659342506f..832042e7c6 100644
--- a/my-evolution/component-factory.c
+++ b/my-evolution/component-factory.c
@@ -27,7 +27,7 @@
static gint running_objects = 0;
static const EvolutionShellComponentFolderType folder_types[] = {
- { "My Evolution", "evolution-today.png", FALSE, NULL, NULL },
+ { "Summary", "evolution-today.png", FALSE, NULL, NULL },
{ NULL, NULL }
};
@@ -48,7 +48,8 @@ create_view (EvolutionShellComponent *shell,
BonoboControl *control;
- if (g_strcasecmp (folder_type, "My Evolution") != 0) {
+ g_print ("folder_type: %s\n", folder_type);
+ if (g_strcasecmp (folder_type, "Summary") != 0) {
return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
}
diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c
index d055de9430..5cd7099d36 100644
--- a/my-evolution/e-summary-preferences.c
+++ b/my-evolution/e-summary-preferences.c
@@ -1400,7 +1400,7 @@ e_summary_configure (GtkWidget *widget,
g_return_if_fail (pd->xml != NULL);
pd->box = GNOME_PROPERTY_BOX (glade_xml_get_widget (pd->xml, "dialog1"));
- gtk_window_set_title (GTK_WINDOW (pd->box), _("My Evolution Settings"));
+ gtk_window_set_title (GTK_WINDOW (pd->box), _("Summary Settings"));
if (make_property_dialog (pd) == FALSE) {
g_warning ("Missing some part of XML file");
free_property_dialog (pd);
diff --git a/my-evolution/e-summary.c b/my-evolution/e-summary.c
index dba1e5e0bd..23818019f7 100644
--- a/my-evolution/e-summary.c
+++ b/my-evolution/e-summary.c
@@ -382,7 +382,7 @@ alarm_fn (gpointer alarm_id,
e_summary_reconfigure (summary);
}
-#define DEFAULT_HTML "<html><head><title>My Evolution</title></head><body bgcolor=\"#ffffff\">hello</body></html>"
+#define DEFAULT_HTML "<html><head><title>Summary</title></head><body bgcolor=\"#ffffff\">hello</body></html>"
static void
e_summary_init (ESummary *summary)
@@ -469,7 +469,7 @@ do_summary_print (ESummary *summary,
int collate = FALSE;
if (!preview) {
- gpd = GNOME_PRINT_DIALOG (gnome_print_dialog_new (_("Print My Evolution"), GNOME_PRINT_DIALOG_COPIES));
+ gpd = GNOME_PRINT_DIALOG (gnome_print_dialog_new (_("Print Summary"), GNOME_PRINT_DIALOG_COPIES));
gnome_dialog_set_default (GNOME_DIALOG (gpd), GNOME_PRINT_PRINT);
switch (gnome_dialog_run (GNOME_DIALOG (gpd))) {
@@ -515,7 +515,7 @@ do_summary_print (ESummary *summary,
if (result == -1) {
e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
- _("Printing of My Evolution failed"));
+ _("Printing of Summary failed"));
}
}
diff --git a/shell/ChangeLog b/shell/ChangeLog
index f390c83f56..8b7784fceb 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-15 Iain Holmes <iain@ximian.com>
+
+ * e-summary-storage.c: s/My Evolution/Summary
+
+ * e-storage-set-view.c: s/My Evolution/Summary
+
2001-08-15 Jason Leach <jleach@ximian.com>
* Evolution-Shell.idl: Add a new IDL function,
diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c
index 461b05411d..370e11c104 100644
--- a/shell/e-storage-set-view.c
+++ b/shell/e-storage-set-view.c
@@ -1363,13 +1363,14 @@ etree_icon_at (ETreeModel *etree,
path = (char*)e_tree_memory_node_get_data (E_TREE_MEMORY(etree), tree_path);
- /* Storages, My Evolution is the only special case for now */
+ /* Storages, Summary (nee My Evolution) is the only special case for now */
+ g_print ("path: %s\n", path);
if (depth == 1 && !strcmp (path, "/summary")) { /* Storages */
folder_type_registry = e_storage_set_get_folder_type_registry (storage_set);
icon_pixbuf = e_folder_type_registry_get_icon_for_type (folder_type_registry,
- "My Evolution", TRUE);
+ "Summary", TRUE);
return icon_pixbuf;
}
/* Folders */
@@ -1461,7 +1462,7 @@ etree_value_at (ETreeModel *etree, ETreePath tree_path, int col, void *model_dat
}
if (col == 0)
- return _("My Evolution");
+ return _("Summary");
else
return (void *) TRUE;
}
diff --git a/shell/e-summary-storage.c b/shell/e-summary-storage.c
index 5d18fa3b36..200aee1a6b 100644
--- a/shell/e-summary-storage.c
+++ b/shell/e-summary-storage.c
@@ -75,7 +75,7 @@ impl_get_name (EStorage *storage)
static const char *
impl_get_display_name (EStorage *storage)
{
- return _("My Evolution");
+ return _("Summary");
}
@@ -116,7 +116,7 @@ e_summary_storage_new (void)
storage = gtk_type_new (e_summary_storage_get_type ());
- e_storage_construct (storage, "/", "My Evolution");
+ e_storage_construct (storage, "/", "Summary");
return storage;
}