[Openvas-commits] r1998 - in trunk/openvas-client: . nessus/prefs_dialog src/gui

[scm-commit@wald.intevation.org]

Author: felix
Date: 2008-12-15 12:50:20 +0100 (Mon, 15 Dec 2008)
New Revision: 1998

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c
   trunk/openvas-client/src/gui/ssh_key_info_form.c
Log:
Display empty strings as info if no ssh key is selected in
ssh_key_info_form.

* nessus/prefs_dialog/prefs_dialog_plugins_prefs.c (show_sshinfo_cb) : 
removed check for NULLness.
* src/gui/ssh_key_info_form.c (ssh_key_info_form_fill) : Accept NULL
as login info parameter and then blank out all text fields.


Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2008-12-15 11:41:28 UTC (rev 1997)
+++ trunk/openvas-client/ChangeLog	2008-12-15 11:50:20 UTC (rev 1998)
@@ -1,5 +1,18 @@
 2008-12-15  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
+	Display empty strings as info if no ssh key is selected in
+	ssh_key_info_form.
+	
+	* nessus/prefs_dialog/prefs_dialog_plugins_prefs.c (show_sshinfo_cb) : 
+	removed check for NULLness.
+
+	* src/gui/ssh_key_info_form.c (ssh_key_info_form_fill) : Accept NULL
+	as login info parameter and then blank out all text fields.
+	
+	
+
+2008-12-15  Felix Wolfsteller <felix.wolfsteller at intevation.de>
+
 	Changed visual representation of new "sshlogin" preference to display
 	infomation of selected key directly within the preference area.
 	

Modified: trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c
===================================================================
--- trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c	2008-12-15 11:41:28 UTC (rev 1997)
+++ trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c	2008-12-15 11:50:20 UTC (rev 1998)
@@ -467,8 +467,7 @@
 show_sshinfo_cb(GtkWidget* combobox, ssh_key_info_form* form)
 {
   openvas_ssh_login* sellogin = g_hash_table_lookup(Global->sshkeys, gtk_combo_box_get_active_text(GTK_COMBO_BOX(combobox)));
-  if(sellogin)
-    ssh_key_info_form_fill(form, sellogin);
+  ssh_key_info_form_fill(form, sellogin);
 }
 
 /**

Modified: trunk/openvas-client/src/gui/ssh_key_info_form.c
===================================================================
--- trunk/openvas-client/src/gui/ssh_key_info_form.c	2008-12-15 11:41:28 UTC (rev 1997)
+++ trunk/openvas-client/src/gui/ssh_key_info_form.c	2008-12-15 11:50:20 UTC (rev 1998)
@@ -51,18 +51,33 @@
 /**
  * Fills a ssh_key_info_form with values of a openvas_ssh_login struct and sets
  * text fields (gtk_entries) to be non-editable.
+ * If NULL is passed as second argument, the form will be cleared (all fields
+ * set to the empty string).
  * @param form The initialized ssh_key_info_form.
- * @param loginfo The openvas_ssh_login struct to take values from.
+ * @param loginfo The openvas_ssh_login struct to take values from or NULL to
+ *                clear form.
  */
 void
 ssh_key_info_form_fill(ssh_key_info_form* form, openvas_ssh_login* loginfo)
 {
-  gtk_entry_set_text(GTK_ENTRY(form->name), loginfo->name);
-  gtk_entry_set_text(GTK_ENTRY(form->username), loginfo->username);
-  gtk_entry_set_text(GTK_ENTRY(form->public_key_path), loginfo->public_key_path);
-  gtk_entry_set_text(GTK_ENTRY(form->private_key_path), loginfo->private_key_path);
-  gtk_entry_set_text(GTK_ENTRY(form->comment), loginfo->comment);
-  gtk_entry_set_text(GTK_ENTRY(form->ssh_key_passphrase), loginfo->ssh_key_passphrase);
+  if(loginfo == NULL)
+  {
+    gtk_entry_set_text(GTK_ENTRY(form->name), "");
+    gtk_entry_set_text(GTK_ENTRY(form->username), "");
+    gtk_entry_set_text(GTK_ENTRY(form->public_key_path), "");
+    gtk_entry_set_text(GTK_ENTRY(form->private_key_path), "");
+    gtk_entry_set_text(GTK_ENTRY(form->comment), "");
+    gtk_entry_set_text(GTK_ENTRY(form->ssh_key_passphrase), "");
+  }
+  else
+  {
+    gtk_entry_set_text(GTK_ENTRY(form->name), loginfo->name);
+    gtk_entry_set_text(GTK_ENTRY(form->username), loginfo->username);
+    gtk_entry_set_text(GTK_ENTRY(form->public_key_path), loginfo->public_key_path);
+    gtk_entry_set_text(GTK_ENTRY(form->private_key_path), loginfo->private_key_path);
+    gtk_entry_set_text(GTK_ENTRY(form->comment), loginfo->comment);
+    gtk_entry_set_text(GTK_ENTRY(form->ssh_key_passphrase), loginfo->ssh_key_passphrase);
+  }
   
   gtk_entry_set_editable(GTK_ENTRY(form->name), FALSE);
   gtk_entry_set_editable(GTK_ENTRY(form->username), FALSE);