[Openvas-commits] r3140 - in trunk/openvas-client: . src/gui
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Apr 20 12:35:07 CEST 2009
Author: felix
Date: 2009-04-20 12:35:06 +0200 (Mon, 20 Apr 2009)
New Revision: 3140
Modified:
trunk/openvas-client/ChangeLog
trunk/openvas-client/src/gui/ssh_keys_dialog.c
Log:
Reformatted, removed define-conditionals around rpm export code.
* src/gui/ssh_keys_dialog.c: Style, removed DEV_SSH_RPM_EXPORT- define
conditionals.
Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog 2009-04-20 10:02:56 UTC (rev 3139)
+++ trunk/openvas-client/ChangeLog 2009-04-20 10:35:06 UTC (rev 3140)
@@ -1,5 +1,12 @@
2009-04-20 Felix Wolfsteller <felix.wolfsteller at intevation.de>
+ Reformatted, removed define-conditionals around rpm export code.
+
+ * src/gui/ssh_keys_dialog.c: Style, removed DEV_SSH_RPM_EXPORT- define
+ conditionals.
+
+2009-04-20 Felix Wolfsteller <felix.wolfsteller at intevation.de>
+
Fixed issue with RMB in report view: Popup menu was shown on information
prioir to selectionm, renamed functions that included the string 'prio'.
Modified: trunk/openvas-client/src/gui/ssh_keys_dialog.c
===================================================================
--- trunk/openvas-client/src/gui/ssh_keys_dialog.c 2009-04-20 10:02:56 UTC (rev 3139)
+++ trunk/openvas-client/src/gui/ssh_keys_dialog.c 2009-04-20 10:35:06 UTC (rev 3140)
@@ -62,7 +62,8 @@
*
* @see ssh_keys_dialog_show
*/
-void ssh_manager_button_cb(GtkWidget* super, void* ignored )
+void
+ssh_manager_button_cb (GtkWidget* super, void* ignored )
{
// So far no pre- or post conditions, show dialog directly.
ssh_keys_dialog_show();
@@ -76,10 +77,10 @@
static void
ssh_keys_dialog_empty (GtkWidget* listnotebook)
{
- ssh_key_info_form* form = ssh_key_info_form_create();
- ssh_key_info_form_fill(form, NULL);
- listnotebook_add_page(listnotebook, form->box, STR_NO_LOGINS_YET, NULL);
- gtk_widget_show_all(listnotebook);
+ ssh_key_info_form* form = ssh_key_info_form_create ();
+ ssh_key_info_form_fill (form, NULL);
+ listnotebook_add_page (listnotebook, form->box, STR_NO_LOGINS_YET, NULL);
+ gtk_widget_show_all (listnotebook);
}
@@ -91,8 +92,8 @@
* @param listnotebook Listnotebook to add the page to.
*/
static void
-ssh_keys_dialog_add_key(char* _ignored, openvas_ssh_login* login,
- GtkWidget* listnotebook)
+ssh_keys_dialog_add_key (char* _ignored, openvas_ssh_login* login,
+ GtkWidget* listnotebook)
{
if (login == NULL)
return;
@@ -124,13 +125,14 @@
{
char* selected_account = NULL;
GtkWidget* dialog = NULL;
-
+ gint response = 0;
+
selected_account = listnotebook_get_selected (notebook);
-
+
// User can not remove the placeholder item (~"No logins yet")
- if (!strcmp (selected_account, STR_NO_LOGINS_YET) )
+ if (!strcmp (selected_account, STR_NO_LOGINS_YET))
return;
-
+
// Initialize dialog with a harder warning if the account is in use somewhere
if (nvt_pref_sshlogin_is_in_use (Global, selected_account) )
{
@@ -149,8 +151,8 @@
_("Are you sure that you want to delete information about login '%s' and all corresponding key files?"),
selected_account);
}
-
- int response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
if (response == GTK_RESPONSE_YES)
@@ -197,7 +199,7 @@
GtkWidget* content_area;
ssh_key_info_form* form;
form = ssh_key_info_form_create();
-
+
dialog = gtk_dialog_new_with_buttons(_("OpenVAS LSC Credentials Manager - Create new Credentials"),
NULL,
GTK_DIALOG_MODAL
@@ -207,14 +209,14 @@
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL,
NULL);
-
+
content_area = GTK_DIALOG(dialog)->vbox;
gtk_container_add (GTK_CONTAINER (content_area), form->box );
-
+
gtk_window_set_default_size(GTK_WINDOW(dialog), 640, 240);
gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_OK);
gtk_widget_show_all(dialog);
-
+
gint result = gtk_dialog_run (GTK_DIALOG (dialog));
while (result == GTK_RESPONSE_OK && ssh_key_info_form_validated(form) == FALSE )
result = gtk_dialog_run(GTK_DIALOG(dialog));
@@ -224,22 +226,22 @@
{
// Check entries
openvas_ssh_login* loginfo = ssh_key_info_form_produce_login(form);
- if( openvas_ssh_key_create(loginfo) == FALSE )
- {
- show_error(_("Error creating key files."));
- break;
- }
-
- if(Global->sshkeys == NULL)
+ if (openvas_ssh_key_create(loginfo) == FALSE)
+ {
+ show_error(_("Error creating key files."));
+ break;
+ }
+
+ if (Global->sshkeys == NULL)
Global->sshkeys = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
- (GDestroyNotify) openvas_ssh_login_free);
- g_hash_table_insert(Global->sshkeys, loginfo->name, loginfo);
-
- char* loginsfile = g_build_filename(prefs_get_nessushome(), ".openvas", ".ssh", ".logins", NULL);
- openvas_ssh_login_file_write(Global->sshkeys, loginsfile);
- efree(&loginsfile);
-
- ssh_keys_dialog_add_key(NULL, loginfo, notebook);
+ (GDestroyNotify) openvas_ssh_login_free);
+ g_hash_table_insert (Global->sshkeys, loginfo->name, loginfo);
+
+ gchar* loginsfile = g_build_filename (prefs_get_nessushome(), ".openvas", ".ssh", ".logins", NULL);
+ openvas_ssh_login_file_write (Global->sshkeys, loginsfile);
+ g_free (loginsfile);
+
+ ssh_keys_dialog_add_key (NULL, loginfo, notebook);
nvt_pref_sshlogin_update_all_comboboxes (Global, loginfo->name);
break;
}
@@ -253,7 +255,6 @@
/**
* @brief Attempts building RPM packages that install a public key.
*/
-#ifdef DEV_SSH_RPM_EXPORT
static void
ssh_keys_dialog_create_rpm_click (GtkWidget* parent, GtkWidget* notebook)
{
@@ -268,13 +269,13 @@
gchar* loc = openvas_ssh_key_create_rpm (login);
if (loc == NULL)
- printf ("failed\n");
+ printf ("It failed\n");
else
- printf ("look at %s\n", loc);
+ printf ("Maybe succeeded. Now look at %s\n", loc);
g_free (loc);
}
-#endif
+
/**
* @brief Shows the OpenVAS LSC Credentials Management Dialog.
*/
@@ -293,26 +294,26 @@
| GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_BUTTONS_NONE,
NULL);
-
+
content_area = GTK_DIALOG(win)->vbox;
-
+
key_notebook = listnotebook_new(TRUE, TRUE);
-
+
// For each key, add a notebookpage
if(Global->sshkeys)
g_hash_table_foreach(Global->sshkeys, (GHFunc) ssh_keys_dialog_add_key,
key_notebook);
-
+
if (Global->sshkeys == NULL || g_hash_table_size (Global->sshkeys) == 0)
{
// Show that there is none yet.
ssh_keys_dialog_empty (key_notebook);
}
-
+
// Add listnotebook with keys
gtk_box_pack_start (GTK_BOX(content_area), key_notebook, TRUE, TRUE, 5);
gtk_widget_show(key_notebook);
-
+
// Add a separator
separator = gtk_hseparator_new();
gtk_container_add (GTK_CONTAINER (content_area), separator);
@@ -326,11 +327,9 @@
GtkWidget* button_new = gtk_button_new_with_label(_("Create a new keypair"));
gtk_box_pack_start (GTK_BOX(buttonbox), button_new, TRUE, TRUE, 5);
-#ifdef DEV_SSH_RPM_EXPORT
// RPM generation
GtkWidget* button_rpm = gtk_button_new_with_label(_("Create RPM"));
gtk_box_pack_start (GTK_BOX(buttonbox), button_rpm, TRUE, TRUE, 5);
-#endif
// Close dialog button
gtk_dialog_add_buttons (GTK_DIALOG(win), GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
@@ -340,14 +339,13 @@
(GtkSignalFunc) ssh_keys_dialog_prompt_new, key_notebook);
g_signal_connect (button_del, "clicked",
(GtkSignalFunc) ssh_keys_dialog_delete_login, key_notebook);
-#ifdef DEV_SSH_RPM_EXPORT
g_signal_connect (button_rpm, "clicked",
(GtkSignalFunc) ssh_keys_dialog_create_rpm_click, key_notebook);
-#endif
g_signal_connect_swapped (win, "response", G_CALLBACK (gtk_widget_destroy),
win);
gtk_window_set_default_size(GTK_WINDOW(win), 640, 240);
gtk_widget_show_all(win);
}
+
#endif /* USE_GTK */
More information about the Openvas-commits
mailing list