[GNUnet-SVN] r992 - GNUnet/src/conf

[durner]

Author: durner
Date: 2005-06-24 14:13:53 -0700 (Fri, 24 Jun 2005)
New Revision: 992

Modified:
   GNUnet/src/conf/wizard_callbacks.c
   GNUnet/src/conf/wizard_curs.c
Log:
error handling

Modified: GNUnet/src/conf/wizard_callbacks.c
===================================================================
--- GNUnet/src/conf/wizard_callbacks.c  2005-06-24 20:59:31 UTC (rev 991)
+++ GNUnet/src/conf/wizard_callbacks.c  2005-06-24 21:13:53 UTC (rev 992)
@@ -242,7 +242,6 @@
 #ifndef MINGW
                showErr(_("Unable to change startup process:"), 
STRERROR(errno));
 #endif
-               return;
        }       
 
        if (!save_conf())

Modified: GNUnet/src/conf/wizard_curs.c
===================================================================
--- GNUnet/src/conf/wizard_curs.c       2005-06-24 20:59:31 UTC (rev 991)
+++ GNUnet/src/conf/wizard_curs.c       2005-06-24 21:13:53 UTC (rev 992)
@@ -38,6 +38,17 @@
 static struct dialog_list_item **nic_items;
 static int nic_item_count = 0;
 
+void showCursErr(char *prefix, char *error) {
+       char *err;
+       
+       err = malloc(strlen(prefix) + strlen(error) + 2);
+       sprintf(err, "%s %s", prefix, error);
+       
+       dialog_msgbox(_("Error"), err, rows, cols - 5, 1);
+       
+       free(err);      
+}
+
 void insert_nic_curs(char *name, int defaultNIC)
 {
        struct dialog_list_item *item;
@@ -496,10 +507,12 @@
 
        /* Save config */
        if (user_name && strlen(user_name) > 0)
-               wiz_addServiceAccount(group_name, user_name);
+               if (!wiz_addServiceAccount(group_name, user_name))
+                       showCursErr(_("Unable to create user account:"), 
STRERROR(errno));
+       
+       if (!wiz_autostart(autostart, user_name, group_name))
+               showCursErr(_("Unable to change startup process:"), 
STRERROR(errno));
 
-       wiz_autostart(autostart, user_name, group_name);
-
        init_dialog();
        dialog_clear();