aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-05-07 10:05:28 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-05-07 10:05:28 +0800
commit3219faad0c583cf44add809ded9183ccc9c4f302 (patch)
tree0a4a8b72b38cc3ee8cd8fedd5381cac4a5f74950
parent725d0a088ddafd5f5665f4415c54f12411103e83 (diff)
downloadgsoc2013-evolution-3219faad0c583cf44add809ded9183ccc9c4f302.tar.gz
gsoc2013-evolution-3219faad0c583cf44add809ded9183ccc9c4f302.tar.zst
gsoc2013-evolution-3219faad0c583cf44add809ded9183ccc9c4f302.zip
Fix non-OAF compilation.
svn path=/trunk/; revision=2849
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/main.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index d117aecebf..891872d5ba 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,10 @@
2000-05-06 Ettore Perazzoli <ettore@helixcode.com>
+ * main.c (init_corba) [! USING_OAF]: We have no options no
+ popt context.
+
+2000-05-06 Ettore Perazzoli <ettore@helixcode.com>
+
* All files: Reorganized and redone a lot of the shell. New
features: internal URI namespace, extensible storage/folder
mechanism, configurable shortcuts.
diff --git a/shell/main.c b/shell/main.c
index eda9f10b23..9c914c4dce 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -53,7 +53,7 @@ init_corba (int *argc, char **argv)
CORBA_exception_init (&ev);
gnome_CORBA_init_with_popt_table ("Evolution", VERSION, argc, argv,
- shell_popt_options, 0, &ctx,
+ NULL, 0, NULL,
GNORBA_INIT_SERVER_FUNC, &ev);
if (ev._major != CORBA_NO_EXCEPTION)