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

[durner]

Author: durner
Date: 2005-06-21 11:44:36 -0700 (Tue, 21 Jun 2005)
New Revision: 969

Modified:
   GNUnet/src/conf/wizard.c
   GNUnet/src/conf/wizard.glade
   GNUnet/src/conf/wizard_callbacks.c
   GNUnet/src/conf/wizard_curs.c
   GNUnet/src/conf/wizard_interface.c
   GNUnet/src/conf/wizard_util.c
Log:
fix creation of a special user account

Modified: GNUnet/src/conf/wizard.c
===================================================================
--- GNUnet/src/conf/wizard.c    2005-06-21 17:53:41 UTC (rev 968)
+++ GNUnet/src/conf/wizard.c    2005-06-21 18:44:36 UTC (rev 969)
@@ -187,16 +187,12 @@
                
                if (user_name)
                        gtk_entry_set_text(GTK_ENTRY(entUser), user_name);
-               else
-                       user_name = strdup("gnunet");
                
                if (group_name)
                        gtk_entry_set_text(GTK_ENTRY(entGroup), group_name);
        
                gtk_widget_set_sensitive(entUser, wiz_useradd_capable());
                gtk_widget_set_sensitive(entGroup, group = 
wiz_groupadd_capable());
-               if (group && !group_name)
-                               group_name = strdup("gnunet");
 }
 
 void load_step5()

Modified: GNUnet/src/conf/wizard.glade
===================================================================
--- GNUnet/src/conf/wizard.glade        2005-06-21 17:53:41 UTC (rev 968)
+++ GNUnet/src/conf/wizard.glade        2005-06-21 18:44:36 UTC (rev 969)
@@ -2293,6 +2293,7 @@
                      <property name="has_frame">True</property>
                      <property name="invisible_char">*</property>
                      <property name="activates_default">False</property>
+                     <signal name="changed" handler="on_entUser_changed" 
last_modification_time="Tue, 21 Jun 2005 18:37:05 GMT"/>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -2314,6 +2315,7 @@
                      <property name="has_frame">True</property>
                      <property name="invisible_char">*</property>
                      <property name="activates_default">False</property>
+                     <signal name="changed" handler="on_entGroup_changed" 
last_modification_time="Tue, 21 Jun 2005 18:37:14 GMT"/>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>

Modified: GNUnet/src/conf/wizard_callbacks.c
===================================================================
--- GNUnet/src/conf/wizard_callbacks.c  2005-06-21 17:53:41 UTC (rev 968)
+++ GNUnet/src/conf/wizard_callbacks.c  2005-06-21 18:44:36 UTC (rev 969)
@@ -364,8 +364,8 @@
 void
 on_entGroup_changed (GtkEditable * editable, gpointer user_data)
 {
-       if (user_name)
-               free(user_name);
+       if (group_name)
+               free(group_name);
        
        group_name = strdup(gtk_editable_get_chars(editable, 0, -1));
 }

Modified: GNUnet/src/conf/wizard_curs.c
===================================================================
--- GNUnet/src/conf/wizard_curs.c       2005-06-21 17:53:41 UTC (rev 968)
+++ GNUnet/src/conf/wizard_curs.c       2005-06-21 18:44:36 UTC (rev 969)
@@ -394,7 +394,7 @@
                                /* Help */
                        }
                        else if (ret <= 0) {
-                               user_name = strdup("gnunet");
+                               user_name = strdup(dialog_input_result);
                                break;
                        }
                }

Modified: GNUnet/src/conf/wizard_interface.c
===================================================================
--- GNUnet/src/conf/wizard_interface.c  2005-06-21 17:53:41 UTC (rev 968)
+++ GNUnet/src/conf/wizard_interface.c  2005-06-21 18:44:36 UTC (rev 969)
@@ -1308,6 +1308,10 @@
 
   g_signal_connect ((gpointer) assi_step4, "destroy",
                    G_CALLBACK (on_assi_destroy), NULL);
+  g_signal_connect ((gpointer) entUser, "changed",
+                   G_CALLBACK (on_entUser_changed), NULL);
+  g_signal_connect ((gpointer) entGroup, "changed",
+                   G_CALLBACK (on_entGroup_changed), NULL);
   g_signal_connect ((gpointer) step4_back, "clicked",
                    G_CALLBACK (on_step4_back_clicked), NULL);
   g_signal_connect ((gpointer) step4_next, "clicked",

Modified: GNUnet/src/conf/wizard_util.c
===================================================================
--- GNUnet/src/conf/wizard_util.c       2005-06-21 17:53:41 UTC (rev 968)
+++ GNUnet/src/conf/wizard_util.c       2005-06-21 18:44:36 UTC (rev 969)
@@ -150,7 +150,7 @@
                if (IsWinNT())
                {
                        char *err = NULL;
-                       DWORD dwErr;
+                       DWORD dwErr = 0;
                        
                        if (username && !strlen(username))
                                username = NULL;