aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2002-11-17 14:36:32 +0800
committerChris Toshok <toshok@src.gnome.org>2002-11-17 14:36:32 +0800
commit637ebdab223e3a5c59bb238ec818da78625727e5 (patch)
tree2c19011061f6614d5e3200da041ac71f42cb1771 /shell
parent68b8639345327b84e0e524d29539e0aefbbfe3a1 (diff)
downloadgsoc2013-evolution-637ebdab223e3a5c59bb238ec818da78625727e5.tar
gsoc2013-evolution-637ebdab223e3a5c59bb238ec818da78625727e5.tar.gz
gsoc2013-evolution-637ebdab223e3a5c59bb238ec818da78625727e5.tar.bz2
gsoc2013-evolution-637ebdab223e3a5c59bb238ec818da78625727e5.tar.lz
gsoc2013-evolution-637ebdab223e3a5c59bb238ec818da78625727e5.tar.xz
gsoc2013-evolution-637ebdab223e3a5c59bb238ec818da78625727e5.tar.zst
gsoc2013-evolution-637ebdab223e3a5c59bb238ec818da78625727e5.zip
init the corba exception before loading each config page, so previous
2002-11-16 Chris Toshok <toshok@ximian.com> * e-shell-settings-dialog.c (load_pages): init the corba exception before loading each config page, so previous errors don't make subsequence pages to fail to load. svn path=/trunk/; revision=18809
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-shell-settings-dialog.c12
2 files changed, 15 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index ec585ad2af..fa7407a399 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-16 Chris Toshok <toshok@ximian.com>
+
+ * e-shell-settings-dialog.c (load_pages): init the corba exception
+ before loading each config page, so previous errors don't make
+ subsequence pages to fail to load.
+
2002-11-15 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am: Added rule to generate
diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index 55a2c74889..a99a0dfc54 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -160,6 +160,8 @@ load_pages (EShellSettingsDialog *dialog)
return;
}
+ CORBA_exception_free (&ev);
+
language_list = e_get_language_list ();
page_list = NULL;
@@ -174,6 +176,8 @@ load_pages (EShellSettingsDialog *dialog)
int priority;
GdkPixbuf *icon;
+ CORBA_exception_init (&ev);
+
info = & control_list->_buffer[i];
title = bonobo_server_info_prop_lookup (info, "evolution:config_item:title", language_list);
@@ -213,11 +217,15 @@ load_pages (EShellSettingsDialog *dialog)
page_list = g_list_prepend (page_list, page);
} else {
- g_warning ("Cannot activate %s -- %s", info->iid, BONOBO_EX_REPOID (&ev));
+ char *bonobo_ex_text = bonobo_exception_get_text (&ev);
+ g_warning ("Cannot activate %s -- %s", info->iid, bonobo_ex_text);
+ g_free (bonobo_ex_text);
}
if (icon != NULL)
gdk_pixbuf_unref (icon);
+
+ CORBA_exception_free (&ev);
}
page_list = sort_page_list (page_list);
@@ -249,8 +257,6 @@ load_pages (EShellSettingsDialog *dialog)
g_list_free (page_list);
e_free_language_list (language_list);
CORBA_free (control_list);
-
- CORBA_exception_free (&ev);
}