diff options
| -rw-r--r-- | addressbook/ChangeLog | 10 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/e-select-names.c | 7 |
3 files changed, 18 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 300cb9da08..382d2d9119 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,13 @@ +2001-10-28 Jon Trowbridge <trow@ximian.com> + + * gui/component/select-names/e-select-names.c + (e_select_names_hookup_shell_listeners): Change "this should never + happen" dialog to not give my name/e-mail. Sorry translators. + But this really should never happen, thanks to my fix below. + + * gui/component/addressbook-component.c: Initialize + global_shell_client to NULL. (Bug #6625) + 2001-10-27 Chris Toshok <toshok@ximian.com> [ bug #12979 ] diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 75c9a227a6..c1585f0c17 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -54,7 +54,7 @@ #define GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID "OAFIID:GNOME_Evolution_Addressbook_ShellComponent" -EvolutionShellClient *global_shell_client; +EvolutionShellClient *global_shell_client = NULL; EvolutionShellClient * addressbook_component_get_shell_client (void) diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index a3245447b2..cb04e973a6 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -520,12 +520,19 @@ e_select_names_hookup_shell_listeners (ESelectNames *e_select_names) if (storage == CORBA_OBJECT_NIL) { GtkWidget *oh_shit; +#if 0 oh_shit = gnome_error_dialog (_("Evolution is unable to get the addressbook local storage.\n" "This may have been caused by the evolution-addressbook component crashing.\n" "To help us better understand and ultimately resolve this problem,\n" "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n" "detailed description of the circumstances under which this error\n" "occurred. Thank you.")); +#endif + + oh_shit = gnome_error_dialog (_("Evolution is unable to get the addressbook local storage.\n" + "Under normal circumstances, this should never happen.\n" + "You may need to exit and restart Evolution in order to\n" + "correct this problem.")); gtk_widget_show (oh_shit); return; } |