Mailing List Archive

Update of /usr/local/cvs/NessusClient/nessus/prefs_dialog
In directory raccoon.nessus.org:/tmp/cvs-serv74647

Modified Files:
prefs_dialog_user.c
Log Message:
Migrating from GtkCombo to GtkComboBoxEntry
as recommended for GTK+ >= 2.4.0.


Index: prefs_dialog_user.c
===================================================================
RCS file: /usr/local/cvs/NessusClient/nessus/prefs_dialog/prefs_dialog_user.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- prefs_dialog_user.c 23 Aug 2006 10:32:29 -0000 1.4
+++ prefs_dialog_user.c 19 Oct 2006 21:51:08 -0000 1.5
@@ -176,7 +176,7 @@
GtkWidget * w;
struct arglist * ctrls;
{
- GtkCombo * action_combo;
+ GtkComboBoxEntry * action_combo;
GtkEntry * target_entry;
GtkWidget * tree;
GtkTreeStore * store;
@@ -187,7 +187,7 @@
GtkTreePath * path;

action_combo = arg_get_value(ctrls, "ACTION");
- action = (char *)gtk_entry_get_text(GTK_ENTRY(action_combo->entry));
+ action = (char *)gtk_entry_get_text(GTK_ENTRY(GTK_BIN(action_combo)->child));
target_entry = arg_get_value(ctrls, "TARGET");
target = (char*)gtk_entry_get_text(target_entry);
tree = arg_get_value(ctrls, "RULES_TREE");
@@ -265,8 +265,7 @@
GtkWidget * vbox;
GtkWidget * hbox;
GtkWidget * label;
- GtkWidget * combo;
- GList * combo_items = NULL;
+ GtkWidget * action_combobox;
GtkWidget * scrolledwindow;
GtkTreeStore *store;
GtkWidget *tree;
@@ -299,18 +298,17 @@
gtk_widget_show(label);

/* A combo selection for the action */
- combo_items = g_list_append(combo_items, "accept");
- combo_items = g_list_append(combo_items, "reject");
- combo_items = g_list_append(combo_items, "deny");
- combo_items = g_list_append(combo_items, "default accept");
- combo_items = g_list_append(combo_items, "default reject");
- combo_items = g_list_append(combo_items, "default deny");
- combo = gtk_combo_new();
- gtk_combo_set_value_in_list(GTK_COMBO(combo), TRUE, FALSE);
- gtk_widget_show(combo);
- gtk_box_pack_start(GTK_BOX(hbox), combo, FALSE, FALSE, 0);
- gtk_combo_set_popdown_strings(GTK_COMBO(combo), combo_items);
- arg_add_value(ctrls, "ACTION", ARG_PTR, -1, combo);
+ action_combobox = gtk_combo_box_new_text();
+ gtk_combo_box_append_text(GTK_COMBO_BOX(action_combobox), "accept");
+ gtk_combo_box_append_text(GTK_COMBO_BOX(action_combobox), "reject");
+ gtk_combo_box_append_text(GTK_COMBO_BOX(action_combobox), "deny");
+ gtk_combo_box_append_text(GTK_COMBO_BOX(action_combobox), "default accept");
+ gtk_combo_box_append_text(GTK_COMBO_BOX(action_combobox), "default reject");
+ gtk_combo_box_append_text(GTK_COMBO_BOX(action_combobox), "default deny");
+ gtk_combo_box_set_active(GTK_COMBO_BOX(action_combobox), 0);
+ gtk_widget_show(action_combobox);
+ gtk_box_pack_start(GTK_BOX(hbox), action_combobox, FALSE, FALSE, 0);
+ arg_add_value(ctrls, "ACTION", ARG_PTR, -1, action_combobox);

/* The label for target entry */
label = gtk_label_new(_("Target:"));

_______________________________________________
Nessus-cvs mailing list
Nessus-cvs@list.nessus.org
http://mail.nessus.org/mailman/listinfo/nessus-cvs