[Ayttm-commits] CVS: ayttm/modules/msn2 msn.C,1.59,1.60

[Philip S T. <blu...@us...>]

Update of /cvsroot/ayttm/ayttm/modules/msn2
In directory sc8-pr-cvs1:/tmp/cvs-serv710/modules/msn2

Modified Files:
	msn.C 
Log Message:
aim & msn use new account prefs style, keyboard shortcuts no longer clash in prefs window

Index: msn.C
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/msn2/msn.C,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- msn.C	30 Jul 2003 10:20:37 -0000	1.59
+++ msn.C	30 Jul 2003 12:33:40 -0000	1.60
@@ -892,6 +892,33 @@
         msn_new_SB(mlad->mc, NULL);
 }
 
+static void msn_init_account_prefs(eb_local_account * ela)
+{
+	eb_msn_local_account_data *mlad = (eb_msn_local_account_data *)ela->protocol_local_account_data;
+	input_list *il = g_new0(input_list, 1);
+
+	ela->prefs = il;
+
+	il->widget.entry.value = ela->handle;
+	il->widget.entry.name = "SCREEN_NAME";
+	il->widget.entry.label= _("_MSN Passport:");
+	il->type = EB_INPUT_ENTRY;
+
+	il->next = g_new0(input_list, 1);
+	il = il->next;
+	il->widget.entry.value = mlad->password;
+	il->widget.entry.name = "PASSWORD";
+	il->widget.entry.label= _("_Password:");
+	il->type = EB_INPUT_PASSWORD;
+
+	il->next = g_new0(input_list, 1);
+	il = il->next;
+	il->widget.checkbox.value = &ela->connect_at_startup;
+	il->widget.checkbox.name = "CONNECT";
+	il->widget.checkbox.label= _("_Connect at startup");
+	il->type = EB_INPUT_CHECKBOX;
+}
+
 static eb_local_account * eb_msn_read_local_account_config( LList * values )
 {
 	char buff[255];
@@ -906,20 +933,20 @@
 	ela = g_new0(eb_local_account,1);
 	mlad = g_new0( eb_msn_local_account_data, 1);
 
-	ela->handle = value_pair_get_value( values, "SCREEN_NAME" );
-	
-	/*the alias will be the persons login minus the @hotmail.com */
-	strncpy( buff, ela->handle , sizeof(buff));
-	c = strtok( buff, "@" );
-	strncpy(ela->alias, buff , sizeof(ela->alias));
-
 	mlad->status = MSN_OFFLINE;
 	ela->protocol_local_account_data = mlad;
 
 	ela->service_id = SERVICE_INFO.protocol_id;
 
 	msn_init_account_prefs(ela);
+
 	eb_update_from_value_pair(ela->prefs, values);
+
+	/*the alias will be the persons login minus the @hotmail.com */
+	strncpy( buff, ela->handle , sizeof(buff));
+	c = strtok( buff, "@" );
+	strncpy(ela->alias, buff , sizeof(ela->alias));
+
 	return ela;
 }