applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

handle protocol errors from EDS.

Browse source 
2005-08-06  Diego Gonzalez <diego@pemas.net>

        * gnome-about-me.c (about_me_setup_dialog): handle protocol errors
          from EDS.

          This make the capplet not crash and fixes bug 312450, but the real
          problem is on EDS, not here.
This commit is contained in:
Diego Gonzalez 2005-08-06 17:22:29 +00:00 • committed by Diego González
parent 2abc3de4e1
commit c1446b213a
2 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
capplets/about-me/ChangeLog
View file

@ -1,3 +1,11 @@
2005-08-06 Diego Gonzalez <diego@pemas.net>
* gnome-about-me.c (about_me_setup_dialog): handle protocol errors
from EDS.
This make the capplet not crash and fixes bug 312450, but the real
problem is on EDS, not here.
2005-08-06 Diego Gonzalez <diego@pemas.net> 2005-08-06 Diego Gonzalez <diego@pemas.net>
* gnome-about-me-password.c (update_password): change signature and * gnome-about-me-password.c (update_password): change signature and

19
capplets/about-me/gnome-about-me.c
View file

@ -652,7 +652,7 @@ about_me_passwd_clicked_cb (GtkWidget *button, GnomeAboutMe *me)
gnome_about_me_password (GTK_WINDOW (WID ("about-me-dialog"))); gnome_about_me_password (GTK_WINDOW (WID ("about-me-dialog")));
} }
static void static gint
about_me_setup_dialog (void) about_me_setup_dialog (void)
{ {
GtkWidget *widget; GtkWidget *widget;
@ -702,6 +702,12 @@ about_me_setup_dialog (void)
/* Get the self contact */ /* Get the self contact */
if (!e_book_get_self (&me->contact, &me->book, &error)) { if (!e_book_get_self (&me->contact, &me->book, &error)) {
if (error->code == E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED) {
about_me_error (NULL, _("There was an error while trying to get the addressbook information\n" \
"Evolution Data Server can't handle the protocol"));
return -1;
}
me->create_self = TRUE; me->create_self = TRUE;
me->contact = e_contact_new (); me->contact = e_contact_new ();
@ -731,7 +737,7 @@ about_me_setup_dialog (void)
if (pwent == NULL) { if (pwent == NULL) {
about_me_error (GTK_WINDOW (WID ("about-me-dialog")), about_me_error (GTK_WINDOW (WID ("about-me-dialog")),
_("Unknown login ID, the user database might be corrupted")); _("Unknown login ID, the user database might be corrupted"));
return ; return -1;
} }
gchar **tok; gchar **tok;
tok = g_strsplit (pwent->pw_gecos, ",", 0); tok = g_strsplit (pwent->pw_gecos, ",", 0);
@ -783,6 +789,8 @@ about_me_setup_dialog (void)
about_me_load_info (me); about_me_load_info (me);
gtk_widget_show_all (main_dialog); gtk_widget_show_all (main_dialog);
return 0;
} }
int int
@ -797,8 +805,11 @@ main (int argc, char **argv)
GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR, GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,
NULL); NULL);
about_me_setup_dialog (); if (about_me_setup_dialog () == -1) {
gtk_main (); return -1;
} else {
gtk_main ();
}
return 0; return 0;
} }