aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog11
-rw-r--r--shell/e-shell-about-box.c4
-rw-r--r--shell/e-storage-set-view.c2
-rw-r--r--shell/main.c2
4 files changed, 17 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 6973ef6a2a..76a27544a1 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,14 @@
+2002-09-23 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-shell-about-box.c: Added some missing names.
+
+ * main.c (main): Declare --force-upgrade correctly so it works.
+
+2002-09-20 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-storage-set-view.c (class_init): Use PARENT_TYPE instead of
+ e_tree_get_type().
+
2002-09-20 Ettore Perazzoli <ettore@ximian.com>
* e-storage-set-view.c: Removed member sort_idle_id in
diff --git a/shell/e-shell-about-box.c b/shell/e-shell-about-box.c
index 461cda2d08..1e102fa19f 100644
--- a/shell/e-shell-about-box.c
+++ b/shell/e-shell-about-box.c
@@ -56,16 +56,20 @@ static const char *text[] = {
"Arturo Espinoza",
"Larry Ewing",
"Nat Friedman",
+ "Alex Graveley",
"Bertrand Guiheneuf",
"Heath Harrelson",
"Iain Holmes",
+ "Mike Kestner",
"Tuomas Kuosmanen",
"Christopher J. Lahey",
"Miles Lane",
"Jason Leach",
+ "Timothy Lee",
"Matthew Loper",
"Michael MacDonald",
"Kjartan Maraas",
+ "Gerardo Marin",
"Michael Meeks",
"Federico Mena",
"Michael M. Morrison",
diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c
index 6979a8b080..66e1a17b09 100644
--- a/shell/e-storage-set-view.c
+++ b/shell/e-storage-set-view.c
@@ -1790,7 +1790,7 @@ class_init (EStorageSetViewClass *klass)
GtkObjectClass *object_class;
ETreeClass *etree_class;
- parent_class = gtk_type_class (e_tree_get_type ());
+ parent_class = gtk_type_class (PARENT_TYPE);
object_class = GTK_OBJECT_CLASS (klass);
object_class->destroy = impl_destroy;
diff --git a/shell/main.c b/shell/main.c
index d876d1c040..f4e5ea39e8 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -489,7 +489,7 @@ main (int argc, char **argv)
N_("Start in online mode"), NULL },
{ "debug", '\0', POPT_ARG_STRING, &evolution_debug_log, 0,
N_("Send the debugging output of all components to a file."), NULL },
- { "force-upgrade", '\0', POPT_ARG_STRING, &force_upgrade, 0,
+ { "force-upgrade", '\0', POPT_ARG_NONE, &force_upgrade, 0,
N_("Force upgrading of configuration files from Evolution 1.0.x"), NULL },
{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &oaf_popt_options, 0, NULL, NULL },
POPT_AUTOHELP