Mailing List Archive

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

Modified Files:
prefs_dialog.c
Log Message:
Replacing deprecated gtk_toolbar_append_element and gtk_toolbar_append_space
by gtk_toolbar_insert.


Index: prefs_dialog.c
===================================================================
RCS file: /usr/local/cvs/NessusClient/nessus/prefs_dialog/prefs_dialog.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- prefs_dialog.c 2 Feb 2007 00:34:54 -0000 1.20
+++ prefs_dialog.c 4 Feb 2007 23:12:18 -0000 1.21
@@ -327,7 +327,8 @@
GtkWidget *vbox;
GtkWidget *msglogframe;
GtkWidget *icon;
- GtkWidget *toolbar_button;
+ GtkTooltips * toolbar_tips = gtk_tooltips_new();
+ GtkToolItem * tool_button;
GtkWidget *toolbar;
GtkWidget *scrolledwindow;
GtkWidget *textview;
@@ -568,72 +569,67 @@
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
arg_add_value(ctrls, "TOOLBAR", ARG_PTR, -1, toolbar);

- icon = gtk_image_new_from_stock("gtk-help",
- gtk_toolbar_get_icon_size(GTK_TOOLBAR(toolbar)));
- toolbar_button = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
- GTK_TOOLBAR_CHILD_BUTTON, NULL,
- _("Scan Assistant"), _("Scan Assistant"),
- NULL, icon, GTK_SIGNAL_FUNC(prefs_scan_assistant), MainDialog);
- gtk_widget_show(toolbar_button);
-
- icon = gtk_image_new_from_stock("gtk-new",
- gtk_toolbar_get_icon_size(GTK_TOOLBAR(toolbar)));
- toolbar_button = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
- GTK_TOOLBAR_CHILD_BUTTON, NULL,
- _("New"), _("New"),
- NULL, icon, GTK_SIGNAL_FUNC(scopetree_context_new), NULL);
- gtk_widget_show(toolbar_button);
+ tool_button = gtk_tool_button_new_from_stock("gtk-help");
+ gtk_tool_button_set_label(GTK_TOOL_BUTTON(tool_button), _("Scan Assistant"));
+ gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(tool_button),
+ toolbar_tips, _("Scan Assistant"), NULL);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tool_button, -1);
+ g_signal_connect(G_OBJECT(tool_button), "clicked",
+ G_CALLBACK(prefs_scan_assistant), MainDialog);
+ gtk_widget_show(GTK_WIDGET(tool_button));

- icon = gtk_image_new_from_stock("gtk-delete",
- gtk_toolbar_get_icon_size(GTK_TOOLBAR(toolbar)));
- toolbar_button = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
- GTK_TOOLBAR_CHILD_BUTTON, NULL,
- _("Delete"), _("Delete"),
- NULL, icon, GTK_SIGNAL_FUNC(scopetree_context_delete), NULL);
- gtk_widget_show(toolbar_button);
- arg_add_value(ctrls, "DELETECONTEXT_BUTTON", ARG_PTR, -1, toolbar_button);
+ tool_button = gtk_tool_button_new_from_stock("gtk-new");
+ gtk_tool_button_set_label(GTK_TOOL_BUTTON(tool_button), _("New"));
+ gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(tool_button),
+ toolbar_tips, _("New"), NULL);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tool_button, -1);
+ g_signal_connect(G_OBJECT(tool_button), "clicked",
+ G_CALLBACK(scopetree_context_new), NULL);
+ gtk_widget_show(GTK_WIDGET(tool_button));

- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
+ tool_button = gtk_tool_button_new_from_stock("gtk-delete");
+ gtk_tool_button_set_label(GTK_TOOL_BUTTON(tool_button), _("Delete"));
+ gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(tool_button),
+ toolbar_tips, _("Delete"), NULL);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tool_button, -1);
+ g_signal_connect(G_OBJECT(tool_button), "clicked",
+ G_CALLBACK(scopetree_context_delete), NULL);
+ gtk_widget_show(GTK_WIDGET(tool_button));
+ arg_add_value(ctrls, "DELETECONTEXT_BUTTON", ARG_PTR, -1, tool_button);

- icon = gtk_image_new_from_stock("nessus-connect",
- gtk_toolbar_get_icon_size(GTK_TOOLBAR(toolbar)));
- toolbar_button = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
- GTK_TOOLBAR_CHILD_BUTTON, NULL,
- _("Connect"), _("Connect"),
- NULL, icon, GTK_SIGNAL_FUNC(prefs_dialog_auth_connect), MainDialog);
- gtk_widget_show(toolbar_button);
- arg_add_value(ctrls, "CONNECT_BUTTON", ARG_PTR, -1, toolbar_button);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), gtk_separator_tool_item_new(), -1);

- icon = gtk_image_new_from_stock("nessus-disconnect",
- gtk_toolbar_get_icon_size(GTK_TOOLBAR(toolbar)));
- toolbar_button = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
- GTK_TOOLBAR_CHILD_BUTTON, NULL,
- _("Disconnect"), _("Disconnect"),
- NULL, icon, GTK_SIGNAL_FUNC(prefs_dialog_auth_disconnect), MainDialog);
- gtk_widget_show(toolbar_button);
- arg_add_value(ctrls, "DISCONNECT_BUTTON", ARG_PTR, -1, toolbar_button);
+ tool_button = gtk_tool_button_new_from_stock("nessus-connect");
+ gtk_tool_button_set_label(GTK_TOOL_BUTTON(tool_button), _("Connect"));
+ gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(tool_button),
+ toolbar_tips, _("Connect"), NULL);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tool_button, -1);
+ g_signal_connect(G_OBJECT(tool_button), "clicked",
+ G_CALLBACK(prefs_dialog_auth_connect), MainDialog);
+ gtk_widget_show(GTK_WIDGET(tool_button));
+ arg_add_value(ctrls, "CONNECT_BUTTON", ARG_PTR, -1, tool_button);

- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
+ tool_button = gtk_tool_button_new_from_stock("nessus-disconnect");
+ gtk_tool_button_set_label(GTK_TOOL_BUTTON(tool_button), _("Disconnect"));
+ gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(tool_button),
+ toolbar_tips, _("Disconnect"), NULL);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tool_button, -1);
+ g_signal_connect(G_OBJECT(tool_button), "clicked",
+ G_CALLBACK(prefs_dialog_auth_disconnect), MainDialog);
+ gtk_widget_show(GTK_WIDGET(tool_button));
+ arg_add_value(ctrls, "DISCONNECT_BUTTON", ARG_PTR, -1, tool_button);

- icon = gtk_image_new_from_stock("gtk-execute",
- gtk_toolbar_get_icon_size(GTK_TOOLBAR(toolbar)));
- toolbar_button = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
- GTK_TOOLBAR_CHILD_BUTTON, NULL,
- _("Execute"), _("Execute"),
- NULL, icon, GTK_SIGNAL_FUNC(prefs_dialog_execute), ctrls);
- gtk_widget_show(toolbar_button);
- arg_add_value(ctrls, "EXECSCOPE_BUTTON", ARG_PTR, -1, toolbar_button);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), gtk_separator_tool_item_new(), -1);

-#if 0
- icon = gtk_image_new_from_stock("gtk-stop",
- gtk_toolbar_get_icon_size(GTK_TOOLBAR(toolbar)));
- toolbar_button = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
- GTK_TOOLBAR_CHILD_BUTTON, NULL,
- _("Stop"), _("Stop"),
- NULL, icon, GTK_SIGNAL_FUNC(prefs_dialog_execute), NULL);
- gtk_widget_show(toolbar_button);
- gtk_widget_set_sensitive(toolbar_button, FALSE);
-#endif
+ tool_button = gtk_tool_button_new_from_stock("gtk-execute");
+ gtk_tool_button_set_label(GTK_TOOL_BUTTON(tool_button), _("Execute"));
+ gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(tool_button),
+ toolbar_tips, _("Execute"), NULL);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tool_button, -1);
+ g_signal_connect(G_OBJECT(tool_button), "clicked",
+ G_CALLBACK(prefs_dialog_execute), ctrls);
+ gtk_widget_show(GTK_WIDGET(tool_button));
+ arg_add_value(ctrls, "EXECSCOPE_BUTTON", ARG_PTR, -1, tool_button);

/*
* The Scope Tree

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