[prev in list] [next in list] [prev in thread] [next in thread]
List: evms-devel
Subject: [Evms-devel] GTK+ 2 patch
From: "Steinar H. Gunderson" <sgunderson () bigfoot ! com>
Date: 2006-08-09 19:53:58
Message-ID: 20060809195358.GA8453 () uio ! no
[Download RAW message or body]
Hi,
Are there any short-term plans for fusing the available GTK+ 2.x patch for
EVMS into upstream? It's been included in Ubuntu for a while now, has
recently been accepted into Debian, and probably exists in other
distributions as well -- GTK+ 1.x is obsolete and not supported anymore, and
there does not seem to be any particular problems with the patch. (There were
issues with keyboard shortcuts and with the configure scripts -- both have
been solved.)
For the reference, I'm attaching the latest version of the patch as it is in
the Debian and Ubuntu packages -- it's based on the patch on the SourceForge
tracker, but with the two bugfixes mentioned above.
/* Steinar */
--
Homepage: http://www.sesse.net/
["evms-gtk2-patch-with-bugfixes.diff" (text/plain)]
--- evms-2.5.5.orig/ui/gtk/interfaces/about.glade
+++ evms-2.5.5/ui/gtk/interfaces/about.glade
@@ -150,7 +150,7 @@
<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
<widget>
- <class>GtkText</class>
+ <class>GtkTextView</class>
<name>credits_text</name>
<can_focus>True</can_focus>
<editable>False</editable>
--- evms-2.5.5.orig/ui/gtk/modify_volume.c
+++ evms-2.5.5/ui/gtk/modify_volume.c
@@ -53,7 +53,7 @@
tooltips = gtk_tooltips_new();
- modify_volume_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ modify_volume_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name(modify_volume_window, "modify_volume_window");
gtk_object_set_data(GTK_OBJECT(modify_volume_window), "modify_volume_window",
modify_volume_window);
--- evms-2.5.5.orig/ui/gtk/selection.c
+++ evms-2.5.5/ui/gtk/selection.c
@@ -62,7 +62,7 @@
accel_group = gtk_accel_group_new();
- selection_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ selection_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name(selection_window, "selection_window");
gtk_object_set_data(GTK_OBJECT(selection_window), "selection_window", \
selection_window); gtk_widget_set_usize(selection_window, 630, 475);
@@ -209,7 +209,7 @@
GTK_WIDGET_SET_FLAGS(help_button, GTK_CAN_DEFAULT);
gtk_tooltips_set_tip(tooltips, help_button, _("Get help on this dialog window"), \
NULL); gtk_widget_add_accelerator(help_button, "clicked", accel_group,
- GDK_H, 0, GTK_ACCEL_VISIBLE);
+ GDK_H, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
hbox2 = gtk_hbox_new(FALSE, 0);
gtk_widget_set_name(hbox2, "hbox2");
@@ -262,7 +262,7 @@
GTK_WIDGET_SET_FLAGS(selection_window_cancel_button, GTK_CAN_DEFAULT);
gtk_tooltips_set_tip(tooltips, selection_window_cancel_button, _("Cancel the \
operation"), NULL);
- gtk_widget_add_accelerator(selection_window_cancel_button, "clicked", accel_group, \
GDK_C, 0, + gtk_widget_add_accelerator(selection_window_cancel_button, "clicked", \
accel_group, GDK_C, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
hbox3 = gtk_hbox_new(FALSE, 0);
@@ -303,7 +303,7 @@
GTK_WIDGET_SET_FLAGS(selection_window_prev_button, GTK_CAN_DEFAULT);
gtk_tooltips_set_tip(tooltips, selection_window_prev_button,
_("Move to the previous window"), NULL);
- gtk_widget_add_accelerator(selection_window_prev_button, "clicked", accel_group, \
GDK_P, 0, + gtk_widget_add_accelerator(selection_window_prev_button, "clicked", \
accel_group, GDK_P, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
selection_window_prev_button_hbox = gtk_hbox_new(FALSE, 0);
@@ -351,7 +351,7 @@
GTK_WIDGET_SET_FLAGS(selection_window_next_button, GTK_CAN_DEFAULT);
gtk_tooltips_set_tip(tooltips, selection_window_next_button,
_("Proceed to the next window"), NULL);
- gtk_widget_add_accelerator(selection_window_next_button, "clicked", accel_group, \
GDK_N, 0, + gtk_widget_add_accelerator(selection_window_next_button, "clicked", \
accel_group, GDK_N, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
selection_window_next_button_hbox = gtk_hbox_new(FALSE, 0);
--- evms-2.5.5.orig/ui/gtk/thing.c
+++ evms-2.5.5/ui/gtk/thing.c
@@ -236,7 +236,7 @@
button = gtk_button_new();
pixmap = gtk_pixmap_new(gdk_pixmap, mask);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(window));
get_ok_pixmap(&gdk_pixmap, &mask);
add_pixmap_label_to_button(button, gdk_pixmap, mask, _("_OK"), accel_group);
@@ -562,7 +562,7 @@
tooltips = gtk_tooltips_new();
accel_group = gtk_accel_group_new();
- window = gtk_window_new(GTK_WINDOW_DIALOG);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
vbox = gtk_vbox_new(FALSE, 0);
text_box_frame = gtk_frame_new(NULL);
scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
@@ -575,7 +575,7 @@
button = gtk_button_new();
*rclist = (GtkCList *) clist;
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(window));
get_ok_pixmap(&pixmap, &mask);
add_pixmap_label_to_button(button, pixmap, mask, _("_OK"), accel_group);
--- evms-2.5.5.orig/ui/gtk/commit.c
+++ evms-2.5.5/ui/gtk/commit.c
@@ -438,7 +438,7 @@
tooltips = gtk_tooltips_new();
accel_group = gtk_accel_group_new();
- window = gtk_window_new(GTK_WINDOW_DIALOG);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
vbox = gtk_vbox_new(FALSE, 0);
text_box_frame = gtk_frame_new(NULL);
scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
@@ -450,8 +450,8 @@
hbuttonbox = gtk_hbutton_box_new();
button = gtk_button_new();
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
-
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(window));
+
get_ok_pixmap(&pixmap, &mask);
add_pixmap_label_to_button(button, pixmap, mask, _("_OK"), accel_group);
@@ -555,10 +555,10 @@
tooltips = gtk_tooltips_new();
accel_group = gtk_accel_group_new();
- commit_changes_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ commit_changes_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(commit_changes_window), _("Unsaved Changes \
Detected")); gtk_window_set_position(GTK_WINDOW(commit_changes_window), \
GTK_WIN_POS_CENTER);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(commit_changes_window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(commit_changes_window));
vbox = gtk_vbox_new(FALSE, 0);
label = gtk_label_new(_("Save changes before quitting?"));
@@ -679,11 +679,11 @@
get_dialog_pixmap(QUESTION_PIXMAP, &gdk_pixmap, &mask);
- commit_confirmation_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ commit_confirmation_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(commit_confirmation_window),
_("Save Changes Confirmation"));
gtk_window_set_position(GTK_WINDOW(commit_confirmation_window), \
GTK_WIN_POS_CENTER);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(commit_confirmation_window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(commit_confirmation_window));
vbox = gtk_vbox_new(FALSE, 0);
question_label = gtk_label_new(_("Do you wish to save changes now or cancel?"));
@@ -809,11 +809,11 @@
get_dialog_pixmap(QUESTION_PIXMAP, &gdk_pixmap, &mask);
- commit_confirmation_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ commit_confirmation_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(commit_confirmation_window),
_("Save Changes Confirmation"));
gtk_window_set_position(GTK_WINDOW(commit_confirmation_window), \
GTK_WIN_POS_CENTER);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(commit_confirmation_window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(commit_confirmation_window));
vbox = gtk_vbox_new(FALSE, 0);
question_label = gtk_label_new(prompt);
--- evms-2.5.5.orig/ui/gtk/weblinks.c
+++ evms-2.5.5/ui/gtk/weblinks.c
@@ -173,7 +173,7 @@
accel_group = gtk_accel_group_new();
- web_links_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ web_links_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name(web_links_window, "web_links_window");
gtk_object_set_data(GTK_OBJECT(web_links_window), "web_links_window", \
web_links_window); gtk_window_set_title(GTK_WINDOW(web_links_window), _("Web \
Links")); @@ -253,7 +253,7 @@
gtk_widget_show(button);
gtk_container_add(GTK_CONTAINER(hbuttonbox), button);
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
- gtk_widget_add_accelerator(button, "clicked", accel_group, GDK_O, 0, \
GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator(button, "clicked", accel_group, \
GDK_O, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
hbox1 = gtk_hbox_new(FALSE, 0);
gtk_widget_set_name(hbox1, "hbox1");
--- evms-2.5.5.orig/ui/gtk/support.c
+++ evms-2.5.5/ui/gtk/support.c
@@ -22,6 +22,8 @@
#include <unistd.h>
#include <frontend.h>
#include <gtk/gtk.h>
+#define GTK_ENABLE_BROKEN
+#include <gtk/gtktext.h>
#include "support.h"
#include "results.h"
@@ -161,14 +163,14 @@
GdkBitmap *mask;
GtkAccelGroup *accel_group;
- popup = gtk_window_new(GTK_WINDOW_DIALOG);
+ popup = gtk_window_new(GTK_WINDOW_TOPLEVEL);
vbox = gtk_vbox_new(FALSE, 10);
label = gtk_label_new(message);
button = gtk_button_new();
separator = gtk_hseparator_new();
accel_group = gtk_accel_group_new();
- gtk_accel_group_attach(accel_group, GTK_OBJECT(popup));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(popup));
get_ok_pixmap(&pixmap, &mask);
add_pixmap_label_to_button(button, pixmap, mask, _("_OK"), accel_group);
@@ -229,7 +231,7 @@
get_dialog_pixmap(INFO_PIXMAP, &gdk_pixmap, &mask);
- help_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ help_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
top_vbox = gtk_vbox_new(FALSE, 0);
hbox = gtk_hbox_new(FALSE, 10);
frame = gtk_frame_new(NULL);
@@ -240,7 +242,7 @@
button = gtk_button_new();
pixmap = gtk_pixmap_new(gdk_pixmap, mask);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(help_window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(help_window));
get_ok_pixmap(&gdk_pixmap, &mask);
add_pixmap_label_to_button(button, gdk_pixmap, mask, _("_OK"), accel_group);
@@ -282,8 +284,8 @@
gtk_container_add(GTK_CONTAINER(hbuttonbox), button);
gtk_container_set_border_width(GTK_CONTAINER(button), 10);
- gtk_text_insert(GTK_TEXT(help_text), NULL, NULL, NULL, text, -1);
- gtk_text_insert(GTK_TEXT(help_text), NULL, NULL, NULL, \
get_key_navigation_help_text(), -1); + gtk_text_insert(GTK_TEXT_VIEW(help_text), \
NULL, NULL, NULL, text, -1); + gtk_text_insert(GTK_TEXT_VIEW(help_text), NULL, NULL, \
NULL, get_key_navigation_help_text(), -1);
gtk_tooltips_set_tip(tooltips, button, _("Close the help window"), NULL);
@@ -1325,7 +1327,7 @@
label = gtk_label_new("");
key = gtk_label_parse_uline(GTK_LABEL(label), text);
- gtk_widget_add_accelerator(button, "clicked", accel_group, key, GDK_NONE, \
GDK_NONE); + gtk_widget_add_accelerator(button, "clicked", accel_group, key, \
GDK_MOD1_MASK, 0); } else
label = gtk_label_new(text);
--- evms-2.5.5.orig/ui/gtk/main.c
+++ evms-2.5.5/ui/gtk/main.c
@@ -202,7 +202,7 @@
*/
void display_startup_window(void)
{
- startup_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ startup_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_position(GTK_WINDOW(startup_window), GTK_WIN_POS_CENTER);
startup_label = gtk_label_new(_("EVMS is examining your system. Please wait..."));
@@ -461,6 +461,7 @@
if (geteuid() == 0) {
g_thread_init(NULL);
+ gdk_threads_init();
gtk_init(&argc, &argv);
rc = parse_options(argc, argv);
--- evms-2.5.5.orig/ui/gtk/about.c
+++ evms-2.5.5/ui/gtk/about.c
@@ -14,6 +14,8 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
+#define GTK_ENABLE_BROKEN
+#include <gtk/gtktext.h>
#include "support.h"
#include "about.h"
@@ -43,7 +45,7 @@
accel_group = gtk_accel_group_new();
- about_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ about_window = gtk_window_new(GTK_WINDOW_POPUP);
gtk_widget_set_name(about_window, "about_window");
gtk_object_set_data(GTK_OBJECT(about_window), "about_window", about_window);
gtk_window_set_title(GTK_WINDOW(about_window), _("About"));
@@ -143,7 +145,7 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(credits_text);
gtk_container_add(GTK_CONTAINER(credits_scrolledwindow), credits_text);
- gtk_text_insert(GTK_TEXT(credits_text), NULL, NULL, NULL,
+ gtk_text_insert(GTK_TEXT_VIEW(credits_text), NULL, NULL, NULL,
"Steven Pratt\nMark A. Peloquin\nBen Rafanello \nKevin \
Corry\nSteve Dobbelstein\nDon Mulvey\nMarty Ridgeway\nMike Tran\nJohn C. Stiles\nMatt \
Zimmerman\nAndrew Clausen\nRamachandra N. Pai\nLuciano Chavez",
-1);
@@ -186,7 +188,7 @@
gtk_widget_show(button);
gtk_container_add(GTK_CONTAINER(hbuttonbox), button);
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
- gtk_widget_add_accelerator(button, "clicked", accel_group, GDK_O, 0, \
GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator(button, "clicked", accel_group, \
GDK_O, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
hbox1 = gtk_hbox_new(FALSE, 0);
gtk_widget_set_name(hbox1, "hbox1");
--- evms-2.5.5.orig/ui/gtk/task.c
+++ evms-2.5.5/ui/gtk/task.c
@@ -308,7 +308,7 @@
if (range->timer) {
gtk_timeout_remove(range->timer);
range->timer = 0;
- range->need_timer = FALSE;
+// range->need_timer = FALSE;
}
}
@@ -974,7 +974,7 @@
tooltips = gtk_tooltips_new();
accel_group = gtk_accel_group_new();
- window = gtk_window_new(GTK_WINDOW_DIALOG);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
vbox = gtk_vbox_new(FALSE, 0);
text_box_frame = gtk_frame_new(NULL);
scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
@@ -986,7 +986,7 @@
hbuttonbox = gtk_hbutton_box_new();
button = gtk_button_new();
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(window));
get_ok_pixmap(&pixmap, &mask);
add_pixmap_label_to_button(button, pixmap, mask, _("_OK"), accel_group);
@@ -1085,7 +1085,7 @@
accel_group = gtk_accel_group_new();
tooltips = gtk_tooltips_new();
- window = gtk_window_new(GTK_WINDOW_DIALOG);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
vbox = gtk_vbox_new(FALSE, 0);
hbox = gtk_hbox_new(FALSE, 10);
frame = gtk_frame_new(NULL);
@@ -1099,7 +1099,7 @@
button = gtk_button_new();
pixmap = gtk_pixmap_new(gdk_pixmap, mask);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(window));
get_ok_pixmap(&gdk_pixmap, &mask);
add_pixmap_label_to_button(button, gdk_pixmap, mask, _("_OK"), accel_group);
@@ -2280,10 +2280,10 @@
get_dialog_pixmap(QUESTION_PIXMAP, &gdk_pixmap, &mask);
- window = gtk_window_new(GTK_WINDOW_DIALOG);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), title);
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(window));
vbox = gtk_vbox_new(FALSE, 0);
question_label = gtk_label_new(question);
--- evms-2.5.5.orig/ui/gtk/backup.c
+++ evms-2.5.5/ui/gtk/backup.c
@@ -118,7 +118,7 @@
tooltips = gtk_tooltips_new();
accel_group = gtk_accel_group_new();
- window = gtk_window_new(GTK_WINDOW_DIALOG);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
vbox = gtk_vbox_new(FALSE, 0);
text_box_frame = gtk_frame_new(NULL);
scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
@@ -130,7 +130,7 @@
hbuttonbox = gtk_hbutton_box_new();
button = gtk_button_new();
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(window));
get_ok_pixmap(&pixmap, &mask);
add_pixmap_label_to_button(button, pixmap, mask, _("_OK"), accel_group);
@@ -233,12 +233,12 @@
get_dialog_pixmap(QUESTION_PIXMAP, &gdk_pixmap, &mask);
- cannot_backup_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ cannot_backup_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(cannot_backup_window),
_("Cannot Backup Metadata"));
gtk_window_set_position(GTK_WINDOW(cannot_backup_window), GTK_WIN_POS_CENTER);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(cannot_backup_window));
-
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(cannot_backup_window));
+
vbox = gtk_vbox_new(FALSE, 0);
question_label = gtk_label_new(_("The metadata cannot be backed up because metadata \
are scheduled to be written.")); hbuttonbox = gtk_hbutton_box_new();
@@ -364,11 +364,11 @@
get_dialog_pixmap(QUESTION_PIXMAP, &gdk_pixmap, &mask);
- backup_confirmation_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ backup_confirmation_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(backup_confirmation_window),
_("Backup Metadata Confirmation"));
gtk_window_set_position(GTK_WINDOW(backup_confirmation_window), \
GTK_WIN_POS_CENTER);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(backup_confirmation_window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(backup_confirmation_window));
vbox = gtk_vbox_new(FALSE, 0);
question_label = gtk_label_new(_("Do you wish to backup the metadata now or \
cancel?"));
--- evms-2.5.5.orig/ui/gtk/main_window.c
+++ evms-2.5.5/ui/gtk/main_window.c
@@ -1,4 +1,4 @@
-/*
+/*8
*
* (C) Copyright IBM Corp. 2001, 2004
*
@@ -42,13 +42,10 @@
GtkWidget *main_window_vbox;
GtkWidget *menubar_handlebox;
GtkWidget *main_menubar;
- guint tmp_key;
GtkWidget *actions_menu_item;
GtkWidget *actions_menu_item_menu;
- GtkAccelGroup *actions_menu_item_menu_accels;
GtkWidget *create_submenu;
GtkWidget *create_submenu_menu;
- GtkAccelGroup *create_submenu_menu_accels;
GtkWidget *create_evms_volume_menu_item;
GtkWidget *create_compatibility_volume_menu_item;
GtkWidget *create_object_menu_item;
@@ -57,59 +54,49 @@
GtkWidget *create_segment_menu_item;
GtkWidget *delete_submenu;
GtkWidget *delete_submenu_menu;
- GtkAccelGroup *delete_submenu_menu_accels;
GtkWidget *delete_volume_menu_item;
GtkWidget *delete_object_menu_item;
GtkWidget *delete_container_menu_item;
GtkWidget *expand_submenu;
GtkWidget *expand_submenu_menu;
- GtkAccelGroup *expand_submenu_menu_accels;
GtkWidget *expand_volume_menu_item;
GtkWidget *expand_object_menu_item;
GtkWidget *expand_container_menu_item;
GtkWidget *shrink_submenu;
GtkWidget *shrink_submenu_menu;
- GtkAccelGroup *shrink_submenu_menu_accels;
GtkWidget *shrink_volume_menu_item;
GtkWidget *shrink_object_menu_item;
GtkWidget *shrink_container_menu_item;
GtkWidget *add_submenu;
GtkWidget *add_submenu_menu;
- GtkAccelGroup *add_submenu_menu_accels;
GtkWidget *add_feature_to_volume_menu_item;
GtkWidget *assign_segment_manager_to_storage_object;
GtkWidget *remove_submenu;
GtkWidget *remove_submenu_menu;
- GtkAccelGroup *remove_submenu_menu_accels;
GtkWidget *remove_object_from_container_menu_item;
GtkWidget *separator5;
GtkWidget *remove_segment_manager_menu_item;
GtkWidget *modify_submenu;
GtkWidget *modify_submenu_menu;
- GtkAccelGroup *modify_submenu_menu_accels;
GtkWidget *modify_volume_menu_item;
GtkWidget *modify_object_menu_item;
GtkWidget *modify_container_menu_item;
GtkWidget *view_submenu;
GtkWidget *view_submenu_menu;
- GtkAccelGroup *view_submenu_menu_accels;
GtkWidget *view_messages_menu_item;
GtkWidget *view_log_menu_item;
GtkWidget *convert_submenu;
GtkWidget *convert_submenu_menu;
- GtkAccelGroup *convert_submenu_menu_accels;
GtkWidget *convert_to_evms_volume_menu_item;
GtkWidget *convert_to_compatibility_volume_menu_item;
GtkWidget *activation_submenu;
GtkWidget *activation_submenu_menu;
- GtkAccelGroup *activation_submenu_menu_accels;
GtkWidget *activate_menu_item;
GtkWidget *deactivate_menu_item;
GtkWidget *replace_menu_item;
GtkWidget *separator2;
GtkWidget *other_tasks_submenu;
GtkWidget *other_tasks_submenu_menu;
- GtkAccelGroup *other_tasks_submenu_menu_accels;
GtkWidget *volume_tasks_menu_item;
GtkWidget *object_tasks_menu_item;
GtkWidget *container_tasks_menu_item;
@@ -117,7 +104,6 @@
GtkWidget *separator6;
GtkWidget *file_system_submenu;
GtkWidget *file_system_submenu_menu;
- GtkAccelGroup *file_system_submenu_menu_accels;
GtkWidget *mkfs_menu_item;
GtkWidget *fsck_menu_item;
GtkWidget *mount_menu_item;
@@ -130,14 +116,10 @@
GtkWidget *exit_menu_item;
GtkWidget *evmsgui_settings;
GtkWidget *evmsgui_settings_menu;
- GtkAccelGroup *evmsgui_settings_menu_accels;
GtkWidget *admin_node_menu_item;
GtkWidget *set_log_level_submenu;
GtkWidget *set_log_level_submenu_menu;
- GtkAccelGroup *set_log_level_submenu_menu_accels;
-/* GtkWidget *engine_log_level_submenu; */
GtkWidget *engine_log_level_submenu_menu;
- GtkAccelGroup *engine_log_level_submenu_menu_accels;
GSList *engine_debug_levels_group = NULL;
GtkWidget *critical_engine_level_menuitem;
GtkWidget *serious_engine_level_menuitem;
@@ -149,23 +131,8 @@
GtkWidget *debug_engine_level_menuitem;
GtkWidget *extra_engine_level_menuitem;
GtkWidget *everything_engine_level_menuitem;
-/* GtkWidget *kernel_info_level_submenu;
- GtkWidget *kernel_info_level_submenu_menu;
- GtkAccelGroup *kernel_info_level_submenu_menu_accels;
- GSList *kernel_debug_levels_group = NULL;
- GtkWidget *critical_kernel_level_menuitem;
- GtkWidget *serious_kernel_level_menuitem;
- GtkWidget *error_kernel_level_menuitem;
- GtkWidget *warning_kernel_level_menuitem;
- GtkWidget *default_kernel_level_menuitem;
- GtkWidget *details_kernel_level_menuitem;
- GtkWidget *debug_kernel_level_menuitem;
- GtkWidget *extra_kernel_level_menuitem;
- GtkWidget *entry_exit_kernel_level_menuitem;
- GtkWidget *everything_kernel_level_menuitem; */
GtkWidget *help_menu_item;
GtkWidget *help_menu_item_menu;
- GtkAccelGroup *help_menu_item_menu_accels;
GtkWidget *web_links_menu_item;
GtkWidget *help_separator;
GtkWidget *about_menu_item;
@@ -276,7 +243,6 @@
accel_group = gtk_accel_group_new();
main_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_widget_set_name(main_window, "main_window");
gtk_object_set_data(GTK_OBJECT(main_window), "main_window", main_window);
gtk_window_set_title(GTK_WINDOW(main_window), _("EVMS Administration Utility"));
gtk_window_set_position(GTK_WINDOW(main_window), GTK_WIN_POS_CENTER);
@@ -284,1357 +250,591 @@
gtk_window_set_policy(GTK_WINDOW(main_window), TRUE, TRUE, FALSE);
main_window_vbox = gtk_vbox_new(FALSE, 0);
- gtk_widget_set_name(main_window_vbox, "main_window_vbox");
- gtk_widget_ref(main_window_vbox);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "main_window_vbox", \
main_window_vbox,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(main_window_vbox);
gtk_container_add(GTK_CONTAINER(main_window), main_window_vbox);
menubar_handlebox = gtk_handle_box_new();
- gtk_widget_set_name(menubar_handlebox, "menubar_handlebox");
- gtk_widget_ref(menubar_handlebox);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "menubar_handlebox", \
menubar_handlebox,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(menubar_handlebox);
gtk_box_pack_start(GTK_BOX(main_window_vbox), menubar_handlebox, FALSE, FALSE, 0);
main_menubar = gtk_menu_bar_new();
- gtk_widget_set_name(main_menubar, "main_menubar");
- gtk_widget_ref(main_menubar);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "main_menubar", main_menubar,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(main_menubar);
gtk_container_add(GTK_CONTAINER(menubar_handlebox), main_menubar);
- actions_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(actions_menu_item)->child),
- _("_Actions"));
- gtk_widget_add_accelerator(actions_menu_item, "activate_item", accel_group,
- tmp_key, GDK_MOD1_MASK, (GtkAccelFlags) 0);
- gtk_widget_set_name(actions_menu_item, "actions_menu_item");
- gtk_widget_ref(actions_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "actions_menu_item", \
actions_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(actions_menu_item);
- gtk_container_add(GTK_CONTAINER(main_menubar), actions_menu_item);
+ actions_menu_item = gtk_menu_item_new_with_mnemonic ("_Action");
+ gtk_widget_show(actions_menu_item);
+ gtk_container_add(GTK_CONTAINER(main_menubar), actions_menu_item);
+
+
actions_menu_item_menu = gtk_menu_new();
- gtk_widget_set_name(actions_menu_item_menu, "actions_menu_item_menu");
- gtk_widget_ref(actions_menu_item_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "actions_menu_item_menu",
- actions_menu_item_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(actions_menu_item), \
actions_menu_item_menu);
- actions_menu_item_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(actions_menu_item_menu));
- create_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(create_submenu)->child), \
_("_Create"));
- gtk_widget_add_accelerator(create_submenu, "activate_item", \
actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(create_submenu, "create_submenu");
- gtk_widget_ref(create_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "create_submenu", create_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(create_submenu);
- gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), create_submenu);
+
+
+
+ create_submenu = gtk_menu_item_new_with_mnemonic ("_Create");
+ gtk_widget_show(create_submenu);
+ gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), create_submenu);
+
+
create_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(create_submenu_menu, "create_submenu_menu");
- gtk_widget_ref(create_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "create_submenu_menu",
- create_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(create_submenu), create_submenu_menu);
- create_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(create_submenu_menu));
- create_evms_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(create_evms_volume_menu_item)->child),
- _("_EVMS Volume..."));
- gtk_widget_add_accelerator(create_evms_volume_menu_item, "activate_item",
- create_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(create_evms_volume_menu_item, "create_evms_volume_menu_item");
- gtk_widget_ref(create_evms_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "create_evms_volume_menu_item",
- create_evms_volume_menu_item, (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(create_evms_volume_menu_item);
+
+ create_evms_volume_menu_item = gtk_menu_item_new_with_mnemonic ("_EVMS \
Volume..."); + gtk_widget_show(create_evms_volume_menu_item);
gtk_container_add(GTK_CONTAINER(create_submenu_menu), \
create_evms_volume_menu_item);
- create_compatibility_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(create_compatibility_volume_menu_item)->child),
- _("Compatibility _Volume..."));
- gtk_widget_add_accelerator(create_compatibility_volume_menu_item, "activate_item",
- create_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(create_compatibility_volume_menu_item,
- "create_compatibility_volume_menu_item");
- gtk_widget_ref(create_compatibility_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), \
"create_compatibility_volume_menu_item",
- create_compatibility_volume_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(create_compatibility_volume_menu_item);
+
+
+ create_compatibility_volume_menu_item = gtk_menu_item_new_with_mnemonic \
("Compatibility _Volume..."); gtk_container_add(GTK_CONTAINER(create_submenu_menu),
create_compatibility_volume_menu_item);
- create_object_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(create_object_menu_item)->child),
- _("_Feature Object..."));
- gtk_widget_add_accelerator(create_object_menu_item, "activate_item",
- create_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(create_object_menu_item, "create_object_menu_item");
- gtk_widget_ref(create_object_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "create_object_menu_item",
- create_object_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+
+ create_object_menu_item = gtk_menu_item_new_with_mnemonic ("_Feature Object...");
gtk_widget_show(create_object_menu_item);
gtk_container_add(GTK_CONTAINER(create_submenu_menu), create_object_menu_item);
- create_region_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(create_region_menu_item)->child),
- _("_Region..."));
- gtk_widget_add_accelerator(create_region_menu_item, "activate_item",
- create_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(create_region_menu_item, "create_region_menu_item");
- gtk_widget_ref(create_region_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "create_region_menu_item",
- create_region_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+
+
+ create_region_menu_item = gtk_menu_item_new_with_mnemonic("_Region...");
gtk_widget_show(create_region_menu_item);
gtk_container_add(GTK_CONTAINER(create_submenu_menu), create_region_menu_item);
- create_container_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(create_container_menu_item)->child),
- _("_Container..."));
- gtk_widget_add_accelerator(create_container_menu_item, "activate_item",
- create_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(create_container_menu_item, "create_container_menu_item");
- gtk_widget_ref(create_container_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "create_container_menu_item",
- create_container_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+ create_container_menu_item = gtk_menu_item_new_with_mnemonic("_Container...");
gtk_widget_show(create_container_menu_item);
gtk_container_add(GTK_CONTAINER(create_submenu_menu), create_container_menu_item);
- create_segment_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(create_segment_menu_item)->child),
- _("_Segment..."));
- gtk_widget_add_accelerator(create_segment_menu_item, "activate_item",
- create_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(create_segment_menu_item, "create_segment_menu_item");
- gtk_widget_ref(create_segment_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "create_segment_menu_item",
- create_segment_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+ create_segment_menu_item = gtk_menu_item_new_with_mnemonic("_Segment...");
gtk_widget_show(create_segment_menu_item);
gtk_container_add(GTK_CONTAINER(create_submenu_menu), create_segment_menu_item);
- delete_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(delete_submenu)->child), \
_("_Delete"));
- gtk_widget_add_accelerator(delete_submenu, "activate_item", \
actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(delete_submenu, "delete_submenu");
- gtk_widget_ref(delete_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "delete_submenu", delete_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+ delete_submenu = gtk_menu_item_new_with_mnemonic("_Delete");
gtk_widget_show(delete_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), delete_submenu);
+
delete_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(delete_submenu_menu, "delete_submenu_menu");
- gtk_widget_ref(delete_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "delete_submenu_menu",
- delete_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(delete_submenu), delete_submenu_menu);
- delete_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(delete_submenu_menu));
- delete_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(delete_volume_menu_item)->child),
- _("_Volume..."));
- gtk_widget_add_accelerator(delete_volume_menu_item, "activate_item",
- delete_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(delete_volume_menu_item, "delete_volume_menu_item");
- gtk_widget_ref(delete_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "delete_volume_menu_item",
- delete_volume_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+ delete_volume_menu_item = gtk_menu_item_new_with_mnemonic("_Volume...");
gtk_widget_show(delete_volume_menu_item);
gtk_container_add(GTK_CONTAINER(delete_submenu_menu), delete_volume_menu_item);
+
- delete_object_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(delete_object_menu_item)->child),
- _("_Storage Object..."));
- gtk_widget_add_accelerator(delete_object_menu_item, "activate_item",
- delete_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(delete_object_menu_item, "delete_object_menu_item");
- gtk_widget_ref(delete_object_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "delete_object_menu_item",
- delete_object_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+ delete_object_menu_item = gtk_menu_item_new_with_mnemonic("_Storage Object...");
gtk_widget_show(delete_object_menu_item);
gtk_container_add(GTK_CONTAINER(delete_submenu_menu), delete_object_menu_item);
- delete_container_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(delete_container_menu_item)->child),
- _("_Container..."));
- gtk_widget_add_accelerator(delete_container_menu_item, "activate_item",
- delete_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(delete_container_menu_item, "delete_container_menu_item");
- gtk_widget_ref(delete_container_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "delete_container_menu_item",
- delete_container_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ delete_container_menu_item = gtk_menu_item_new_with_mnemonic("_Container...");
gtk_widget_show(delete_container_menu_item);
gtk_container_add(GTK_CONTAINER(delete_submenu_menu), delete_container_menu_item);
- activation_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(activation_submenu)->child), \
_("Ac_tivation"));
- gtk_widget_add_accelerator(activation_submenu, "activate_item", \
actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(activation_submenu, "activation_submenu");
- gtk_widget_ref(activation_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "activation_submenu", \
activation_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ activation_submenu = gtk_menu_item_new_with_mnemonic("Ac_tivation");
gtk_widget_show(activation_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), activation_submenu);
+
activation_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(activation_submenu_menu, "activation_submenu_menu");
- gtk_widget_ref(activation_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "activation_submenu_menu",
- activation_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(activation_submenu), \
activation_submenu_menu);
- activation_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(activation_submenu_menu));
- activate_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(activate_menu_item)->child),
- _("_Activate..."));
- gtk_widget_add_accelerator(activate_menu_item, "activate_item",
- activation_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(activate_menu_item, "activate_menu_item");
- gtk_widget_ref(activate_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "activate_menu_item",
- activate_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ activate_menu_item = gtk_menu_item_new_with_mnemonic("_Activate...");
gtk_widget_show(activate_menu_item);
gtk_container_add(GTK_CONTAINER(activation_submenu_menu), activate_menu_item);
- deactivate_menu_item = gtk_menu_item_new_with_label("");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL
- (GTK_BIN(deactivate_menu_item)->child),
- _("_Deactivate..."));
- gtk_widget_add_accelerator(deactivate_menu_item, "activate_item",
- activation_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(deactivate_menu_item,
- "deactivate_menu_item");
- gtk_widget_ref(deactivate_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window),
- "deactivate_menu_item",
- deactivate_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ deactivate_menu_item = gtk_menu_item_new_with_mnemonic("_Deactivate...");
gtk_widget_show(deactivate_menu_item);
gtk_container_add(GTK_CONTAINER(activation_submenu_menu),
deactivate_menu_item);
- expand_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(expand_submenu)->child), \
_("_Expand"));
- gtk_widget_add_accelerator(expand_submenu, "activate_item", \
actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(expand_submenu, "expand_submenu");
- gtk_widget_ref(expand_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "expand_submenu", expand_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+ expand_submenu = gtk_menu_item_new_with_mnemonic("_Expand");
gtk_widget_show(expand_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), expand_submenu);
+
expand_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(expand_submenu_menu, "expand_submenu_menu");
- gtk_widget_ref(expand_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "expand_submenu_menu",
- expand_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(expand_submenu), expand_submenu_menu);
- expand_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(expand_submenu_menu));
- expand_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(expand_volume_menu_item)->child),
- _("_Volume..."));
- gtk_widget_add_accelerator(expand_volume_menu_item, "activate_item",
- expand_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(expand_volume_menu_item, "expand_volume_menu_item");
- gtk_widget_ref(expand_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "expand_volume_menu_item",
- expand_volume_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ expand_volume_menu_item = gtk_menu_item_new_with_mnemonic("_Volume...");
gtk_widget_show(expand_volume_menu_item);
gtk_container_add(GTK_CONTAINER(expand_submenu_menu), expand_volume_menu_item);
- expand_object_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(expand_object_menu_item)->child),
- _("_Storage Object..."));
- gtk_widget_add_accelerator(expand_object_menu_item, "activate_item",
- expand_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(expand_object_menu_item, "expand_object_menu_item");
- gtk_widget_ref(expand_object_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "expand_object_menu_item",
- expand_object_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ expand_object_menu_item = gtk_menu_item_new_with_mnemonic("_Storage Object...");
gtk_widget_show(expand_object_menu_item);
gtk_container_add(GTK_CONTAINER(expand_submenu_menu), expand_object_menu_item);
- expand_container_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(expand_container_menu_item)->child),
- _("_Container..."));
- gtk_widget_add_accelerator(expand_container_menu_item, "activate_item",
- expand_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(expand_container_menu_item, "expand_container_menu_item");
- gtk_widget_ref(expand_container_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "expand_container_menu_item",
- expand_container_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ expand_container_menu_item = gtk_menu_item_new_with_mnemonic("_Container...");
gtk_widget_show(expand_container_menu_item);
gtk_container_add(GTK_CONTAINER(expand_submenu_menu), expand_container_menu_item);
- shrink_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(shrink_submenu)->child), \
_("S_hrink"));
- gtk_widget_add_accelerator(shrink_submenu, "activate_item", \
actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(shrink_submenu, "shrink_submenu");
- gtk_widget_ref(shrink_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "shrink_submenu", shrink_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ shrink_submenu = gtk_menu_item_new_with_mnemonic("S_hrink");
gtk_widget_show(shrink_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), shrink_submenu);
+
shrink_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(shrink_submenu_menu, "shrink_submenu_menu");
- gtk_widget_ref(shrink_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "shrink_submenu_menu",
- shrink_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(shrink_submenu), shrink_submenu_menu);
- shrink_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(shrink_submenu_menu));
- shrink_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(shrink_volume_menu_item)->child),
- _("_Volume..."));
- gtk_widget_add_accelerator(shrink_volume_menu_item, "activate_item",
- shrink_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(shrink_volume_menu_item, "shrink_volume_menu_item");
- gtk_widget_ref(shrink_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "shrink_volume_menu_item",
- shrink_volume_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+ shrink_volume_menu_item = gtk_menu_item_new_with_mnemonic("_Volume...");
gtk_widget_show(shrink_volume_menu_item);
gtk_container_add(GTK_CONTAINER(shrink_submenu_menu), shrink_volume_menu_item);
- shrink_object_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(shrink_object_menu_item)->child),
- _("_Storage Object..."));
- gtk_widget_add_accelerator(shrink_object_menu_item, "activate_item",
- shrink_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(shrink_object_menu_item, "shrink_object_menu_item");
- gtk_widget_ref(shrink_object_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "shrink_object_menu_item",
- shrink_object_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ shrink_object_menu_item = gtk_menu_item_new_with_mnemonic("_Storage Object...");
gtk_widget_show(shrink_object_menu_item);
gtk_container_add(GTK_CONTAINER(shrink_submenu_menu), shrink_object_menu_item);
- shrink_container_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(shrink_container_menu_item)->child),
- _("_Container..."));
- gtk_widget_add_accelerator(shrink_container_menu_item, "activate_item",
- shrink_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(shrink_container_menu_item, "shrink_container_menu_item");
- gtk_widget_ref(shrink_container_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "shrink_container_menu_item",
- shrink_container_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ shrink_container_menu_item = gtk_menu_item_new_with_mnemonic("_Container...");
gtk_widget_show(shrink_container_menu_item);
gtk_container_add(GTK_CONTAINER(shrink_submenu_menu), shrink_container_menu_item);
- add_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(add_submenu)->child), _("_Add"));
- gtk_widget_add_accelerator(add_submenu, "activate_item", \
actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(add_submenu, "add_submenu");
- gtk_widget_ref(add_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "add_submenu", add_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ add_submenu = gtk_menu_item_new_with_mnemonic("_Add");
gtk_widget_show(add_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), add_submenu);
+
add_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(add_submenu_menu, "add_submenu_menu");
- gtk_widget_ref(add_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "add_submenu_menu", \
add_submenu_menu,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(add_submenu), add_submenu_menu);
- add_submenu_menu_accels = \
gtk_menu_ensure_uline_accel_group(GTK_MENU(add_submenu_menu));
- add_feature_to_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(add_feature_to_volume_menu_item)->child),
- _("_Feature to Volume..."));
- gtk_widget_add_accelerator(add_feature_to_volume_menu_item, "activate_item",
- add_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(add_feature_to_volume_menu_item, \
"add_feature_to_volume_menu_item");
- gtk_widget_ref(add_feature_to_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), \
"add_feature_to_volume_menu_item",
- add_feature_to_volume_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ add_feature_to_volume_menu_item = gtk_menu_item_new_with_mnemonic("_Feature to \
Volume..."); gtk_widget_show(add_feature_to_volume_menu_item);
gtk_container_add(GTK_CONTAINER(add_submenu_menu), \
add_feature_to_volume_menu_item);
- assign_segment_manager_to_storage_object = gtk_menu_item_new_with_label("");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL
- (GTK_BIN(assign_segment_manager_to_storage_object)->child),
- _("_Segment Manager to Storage Object..."));
- gtk_widget_add_accelerator(assign_segment_manager_to_storage_object, \
"activate_item",
- add_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(assign_segment_manager_to_storage_object,
- "assign_segment_manager_to_storage_object");
- gtk_widget_ref(assign_segment_manager_to_storage_object);
- gtk_object_set_data_full(GTK_OBJECT(main_window),
- "assign_segment_manager_to_storage_object",
- assign_segment_manager_to_storage_object,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ assign_segment_manager_to_storage_object = \
gtk_menu_item_new_with_mnemonic("_Segment Manager to Storage Object..."); \
gtk_widget_show(assign_segment_manager_to_storage_object); \
gtk_container_add(GTK_CONTAINER(add_submenu_menu), \
assign_segment_manager_to_storage_object);
- remove_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(remove_submenu)->child), \
_("_Remove"));
- gtk_widget_add_accelerator(remove_submenu, "activate_item", \
actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(remove_submenu, "remove_submenu");
- gtk_widget_ref(remove_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "remove_submenu", remove_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ remove_submenu = gtk_menu_item_new_with_mnemonic("_Remove");
gtk_widget_show(remove_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), remove_submenu);
+
remove_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(remove_submenu_menu, "remove_submenu_menu");
- gtk_widget_ref(remove_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "remove_submenu_menu",
- remove_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(remove_submenu), remove_submenu_menu);
- remove_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(remove_submenu_menu));
- remove_object_from_container_menu_item = gtk_menu_item_new_with_label("");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(remove_object_from_container_menu_item)->child),
- _("Storage _Object from Container..."));
- gtk_widget_add_accelerator(remove_object_from_container_menu_item, "activate_item",
- remove_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(remove_object_from_container_menu_item,
- "remove_object_from_container_menu_item");
- gtk_widget_ref(remove_object_from_container_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), \
"remove_object_from_container_menu_item",
- remove_object_from_container_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ remove_object_from_container_menu_item = gtk_menu_item_new_with_mnemonic("Storage \
_Object from Container..."); \
gtk_widget_show(remove_object_from_container_menu_item); \
gtk_container_add(GTK_CONTAINER(remove_submenu_menu), \
remove_object_from_container_menu_item);
+
separator5 = gtk_menu_item_new();
- gtk_widget_set_name(separator5, "separator5");
- gtk_widget_ref(separator5);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "separator5", separator5,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(separator5);
gtk_container_add(GTK_CONTAINER(remove_submenu_menu), separator5);
gtk_widget_set_sensitive(separator5, FALSE);
- remove_segment_manager_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(remove_segment_manager_menu_item)->child),
- _("Seg_ment Manager from Storage Object..."));
- gtk_widget_add_accelerator(remove_segment_manager_menu_item, "activate_item",
- remove_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(remove_segment_manager_menu_item, \
"remove_segment_manager_menu_item");
- gtk_widget_ref(remove_segment_manager_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), \
"remove_segment_manager_menu_item",
- remove_segment_manager_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ remove_segment_manager_menu_item = gtk_menu_item_new_with_mnemonic("Seg_ment \
Manager from Storage Object..."); gtk_widget_show(remove_segment_manager_menu_item);
gtk_container_add(GTK_CONTAINER(remove_submenu_menu), \
remove_segment_manager_menu_item);
- modify_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(modify_submenu)->child), \
_("_Modify"));
- gtk_widget_add_accelerator(modify_submenu, "activate_item", \
actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(modify_submenu, "modify_submenu");
- gtk_widget_ref(modify_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "modify_submenu", modify_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ modify_submenu = gtk_menu_item_new_with_mnemonic("_Modify");
gtk_widget_show(modify_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), modify_submenu);
+
modify_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(modify_submenu_menu, "modify_submenu_menu");
- gtk_widget_ref(modify_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "modify_submenu_menu",
- modify_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(modify_submenu), modify_submenu_menu);
- modify_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(modify_submenu_menu));
- modify_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(modify_volume_menu_item)->child),
- _("_Volume..."));
- gtk_widget_add_accelerator(modify_volume_menu_item, "activate_item",
- modify_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(modify_volume_menu_item, "modify_volume_menu_item");
- gtk_widget_ref(modify_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "modify_volume_menu_item",
- modify_volume_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+ modify_volume_menu_item = gtk_menu_item_new_with_mnemonic("_Volume...");
gtk_widget_show(modify_volume_menu_item);
gtk_container_add(GTK_CONTAINER(modify_submenu_menu), modify_volume_menu_item);
- modify_object_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(modify_object_menu_item)->child),
- _("_Storage Object..."));
- gtk_widget_add_accelerator(modify_object_menu_item, "activate_item",
- modify_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(modify_object_menu_item, "modify_object_menu_item");
- gtk_widget_ref(modify_object_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "modify_object_menu_item",
- modify_object_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ modify_object_menu_item = gtk_menu_item_new_with_mnemonic("_Storage Object...");
gtk_widget_show(modify_object_menu_item);
gtk_container_add(GTK_CONTAINER(modify_submenu_menu), modify_object_menu_item);
- modify_container_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(modify_container_menu_item)->child),
- _("_Container..."));
- gtk_widget_add_accelerator(modify_container_menu_item, "activate_item",
- modify_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(modify_container_menu_item, "modify_container_menu_item");
- gtk_widget_ref(modify_container_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "modify_container_menu_item",
- modify_container_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ modify_container_menu_item = gtk_menu_item_new_with_mnemonic("_Container...");
gtk_widget_show(modify_container_menu_item);
gtk_container_add(GTK_CONTAINER(modify_submenu_menu), modify_container_menu_item);
- view_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(view_submenu)->child), \
_("_View"));
- gtk_widget_add_accelerator(view_submenu, "activate_item", \
actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(view_submenu, "view_submenu");
- gtk_widget_ref(view_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "view_submenu", view_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ view_submenu = gtk_menu_item_new_with_mnemonic("_View");
gtk_widget_show(view_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), view_submenu);
+
view_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(view_submenu_menu, "view_submenu_menu");
- gtk_widget_ref(view_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "view_submenu_menu", \
view_submenu_menu,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(view_submenu), view_submenu_menu);
- view_submenu_menu_accels = \
gtk_menu_ensure_uline_accel_group(GTK_MENU(view_submenu_menu));
- view_messages_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(view_messages_menu_item)->child),
- _("_Messages..."));
- gtk_widget_add_accelerator(view_messages_menu_item, "activate_item",
- view_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(view_messages_menu_item, "view_messages_menu_item");
- gtk_widget_ref(view_messages_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "view_messages_menu_item",
- view_messages_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+ view_messages_menu_item = gtk_menu_item_new_with_mnemonic("_Messages...");
gtk_widget_show(view_messages_menu_item);
gtk_container_add(GTK_CONTAINER(view_submenu_menu), view_messages_menu_item);
- view_log_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(view_log_menu_item)->child),
- _("_Log File..."));
- gtk_widget_add_accelerator(view_log_menu_item, "activate_item", \
view_submenu_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(view_log_menu_item, "view_log_menu_item");
- gtk_widget_ref(view_log_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "view_log_menu_item", \
view_log_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ view_log_menu_item = gtk_menu_item_new_with_mnemonic("_Log File...");
gtk_widget_show(view_log_menu_item);
gtk_container_add(GTK_CONTAINER(view_submenu_menu), view_log_menu_item);
gtk_widget_set_sensitive(view_log_menu_item, FALSE);
- convert_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(convert_submenu)->child), \
_("C_onvert"));
- gtk_widget_add_accelerator(convert_submenu, "activate_item", \
actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(convert_submenu, "convert_submenu");
- gtk_widget_ref(convert_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "convert_submenu", \
convert_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ convert_submenu = gtk_menu_item_new_with_mnemonic("C_onvert");
gtk_widget_show(convert_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), convert_submenu);
+
convert_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(convert_submenu_menu, "convert_submenu_menu");
- gtk_widget_ref(convert_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "convert_submenu_menu",
- convert_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(convert_submenu), convert_submenu_menu);
- convert_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(convert_submenu_menu));
- convert_to_evms_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(convert_to_evms_volume_menu_item)->child),
- _("_Compatibility Volume to EVMS Volume..."));
- gtk_widget_add_accelerator(convert_to_evms_volume_menu_item, "activate_item",
- convert_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(convert_to_evms_volume_menu_item, \
"convert_to_evms_volume_menu_item");
- gtk_widget_ref(convert_to_evms_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), \
"convert_to_evms_volume_menu_item",
- convert_to_evms_volume_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ convert_to_evms_volume_menu_item = gtk_menu_item_new_with_mnemonic("_Compatibility \
Volume to EVMS Volume..."); gtk_widget_show(convert_to_evms_volume_menu_item);
gtk_container_add(GTK_CONTAINER(convert_submenu_menu), \
convert_to_evms_volume_menu_item);
- convert_to_compatibility_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL
- (GTK_BIN(convert_to_compatibility_volume_menu_item)->child),
- _("_EVMS Volume to Compatibility Volume..."));
- gtk_widget_add_accelerator(convert_to_compatibility_volume_menu_item, \
"activate_item",
- convert_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(convert_to_compatibility_volume_menu_item,
- "convert_to_compatibility_volume_menu_item");
- gtk_widget_ref(convert_to_compatibility_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window),
- "convert_to_compatibility_volume_menu_item",
- convert_to_compatibility_volume_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ convert_to_compatibility_volume_menu_item = gtk_menu_item_new_with_mnemonic("_EVMS \
Volume to Compatibility Volume..."); \
gtk_widget_show(convert_to_compatibility_volume_menu_item); \
gtk_container_add(GTK_CONTAINER(convert_submenu_menu), \
convert_to_compatibility_volume_menu_item);
- replace_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(replace_menu_item)->child),
- _("Re_place..."));
- gtk_widget_add_accelerator(replace_menu_item, "activate_item",
- actions_menu_item_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(replace_menu_item, "replace_menu_item");
- gtk_widget_ref(replace_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "replace_menu_item", \
replace_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ replace_menu_item = gtk_menu_item_new_with_mnemonic("Re_place...");
gtk_widget_show(replace_menu_item);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), replace_menu_item);
+
separator2 = gtk_menu_item_new();
- gtk_widget_set_name(separator2, "separator2");
- gtk_widget_ref(separator2);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "separator2", separator2,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(separator2);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), separator2);
gtk_widget_set_sensitive(separator2, FALSE);
- other_tasks_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(other_tasks_submenu)->child),
- _("O_ther"));
- gtk_widget_add_accelerator(other_tasks_submenu, "activate_item",
- actions_menu_item_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(other_tasks_submenu, "other_tasks_submenu");
- gtk_widget_ref(other_tasks_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "other_tasks_submenu",
- other_tasks_submenu, (GtkDestroyNotify) gtk_widget_unref);
+
+ other_tasks_submenu = gtk_menu_item_new_with_mnemonic("O_ther");
gtk_widget_show(other_tasks_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), other_tasks_submenu);
+
other_tasks_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(other_tasks_submenu_menu, "other_tasks_submenu_menu");
- gtk_widget_ref(other_tasks_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "other_tasks_submenu_menu",
- other_tasks_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(other_tasks_submenu), \
other_tasks_submenu_menu);
- other_tasks_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(other_tasks_submenu_menu));
- volume_tasks_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(volume_tasks_menu_item)->child),
- _("_Volume Tasks..."));
- gtk_widget_add_accelerator(volume_tasks_menu_item, "activate_item",
- other_tasks_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(volume_tasks_menu_item, "volume_tasks_menu_item");
- gtk_widget_ref(volume_tasks_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "volume_tasks_menu_item",
- volume_tasks_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ volume_tasks_menu_item = gtk_menu_item_new_with_mnemonic("_Volume Tasks...");
gtk_widget_show(volume_tasks_menu_item);
gtk_container_add(GTK_CONTAINER(other_tasks_submenu_menu), volume_tasks_menu_item);
- object_tasks_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(object_tasks_menu_item)->child),
- _("_Storage Object Tasks..."));
- gtk_widget_add_accelerator(object_tasks_menu_item, "activate_item",
- other_tasks_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(object_tasks_menu_item, "object_tasks_menu_item");
- gtk_widget_ref(object_tasks_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "object_tasks_menu_item",
- object_tasks_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ object_tasks_menu_item = gtk_menu_item_new_with_mnemonic("_Storage Object \
Tasks..."); gtk_widget_show(object_tasks_menu_item);
gtk_container_add(GTK_CONTAINER(other_tasks_submenu_menu), object_tasks_menu_item);
- container_tasks_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(container_tasks_menu_item)->child),
- _("_Container Tasks..."));
- gtk_widget_add_accelerator(container_tasks_menu_item, "activate_item",
- other_tasks_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(container_tasks_menu_item, "container_tasks_menu_item");
- gtk_widget_ref(container_tasks_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "container_tasks_menu_item",
- container_tasks_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ container_tasks_menu_item = gtk_menu_item_new_with_mnemonic("_Container Tasks...");
gtk_widget_show(container_tasks_menu_item);
gtk_container_add(GTK_CONTAINER(other_tasks_submenu_menu), \
container_tasks_menu_item);
- plugin_tasks_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(plugin_tasks_menu_item)->child),
- _("_Plugin Tasks..."));
- gtk_widget_add_accelerator(plugin_tasks_menu_item, "activate_item",
- other_tasks_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(plugin_tasks_menu_item, "plugin_tasks_menu_item");
- gtk_widget_ref(plugin_tasks_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "plugin_tasks_menu_item",
- plugin_tasks_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ plugin_tasks_menu_item = gtk_menu_item_new_with_mnemonic("_Plugin Tasks...");
gtk_widget_show(plugin_tasks_menu_item);
gtk_container_add(GTK_CONTAINER(other_tasks_submenu_menu), plugin_tasks_menu_item);
+
separator6 = gtk_menu_item_new();
- gtk_widget_set_name(separator6, "separator6");
- gtk_widget_ref(separator6);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "separator6", separator6,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(separator6);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), separator6);
gtk_widget_set_sensitive(separator6, FALSE);
- file_system_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(file_system_submenu)->child),
- _("_File System"));
- gtk_widget_add_accelerator(file_system_submenu, "activate_item",
- actions_menu_item_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(file_system_submenu, "file_system_submenu");
- gtk_widget_ref(file_system_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "file_system_submenu",
- file_system_submenu, (GtkDestroyNotify) gtk_widget_unref);
+
+ file_system_submenu = gtk_menu_item_new_with_mnemonic("_File System");
gtk_widget_show(file_system_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), file_system_submenu);
+
file_system_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(file_system_submenu_menu, "file_system_submenu_menu");
- gtk_widget_ref(file_system_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "file_system_submenu_menu",
- file_system_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(file_system_submenu), \
file_system_submenu_menu);
- file_system_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(file_system_submenu_menu));
- mkfs_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(mkfs_menu_item)->child), \
_("_Make..."));
- gtk_widget_add_accelerator(mkfs_menu_item, "activate_item", \
file_system_submenu_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(mkfs_menu_item, "mkfs_menu_item");
- gtk_widget_ref(mkfs_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "mkfs_menu_item", mkfs_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ mkfs_menu_item = gtk_menu_item_new_with_mnemonic("_Make...");
gtk_widget_show(mkfs_menu_item);
gtk_container_add(GTK_CONTAINER(file_system_submenu_menu), mkfs_menu_item);
- fsck_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(fsck_menu_item)->child),
- _("_Check/Repair..."));
- gtk_widget_add_accelerator(fsck_menu_item, "activate_item", \
file_system_submenu_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(fsck_menu_item, "fsck_menu_item");
- gtk_widget_ref(fsck_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "fsck_menu_item", fsck_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+ fsck_menu_item = gtk_menu_item_new_with_mnemonic("_Check/Repair...");
gtk_widget_show(fsck_menu_item);
gtk_container_add(GTK_CONTAINER(file_system_submenu_menu), fsck_menu_item);
- obliterate_filesystem_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(obliterate_filesystem_menu_item)->child),
- _("_Remove..."));
- gtk_widget_add_accelerator(obliterate_filesystem_menu_item, "activate_item",
- file_system_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(obliterate_filesystem_menu_item, \
"obliterate_filesystem_menu_item");
- gtk_widget_ref(obliterate_filesystem_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), \
"obliterate_filesystem_menu_item",
- obliterate_filesystem_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ obliterate_filesystem_menu_item = gtk_menu_item_new_with_mnemonic("_Remove...");
gtk_widget_show(obliterate_filesystem_menu_item);
gtk_container_add(GTK_CONTAINER(file_system_submenu_menu), \
obliterate_filesystem_menu_item);
- mount_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(mount_menu_item)->child), \
_("M_ount..."));
- gtk_widget_add_accelerator(mount_menu_item, "activate_item",
- file_system_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(mount_menu_item, "mount_menu_item");
- gtk_widget_ref(mount_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "mount_menu_item", \
mount_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ mount_menu_item = gtk_menu_item_new_with_mnemonic("M_ount...");
gtk_widget_show(mount_menu_item);
gtk_container_add(GTK_CONTAINER(file_system_submenu_menu), mount_menu_item);
- unmount_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(unmount_menu_item)->child),
- _("_Unmount..."));
- gtk_widget_add_accelerator(unmount_menu_item, "activate_item",
- file_system_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(unmount_menu_item, "unmount_menu_item");
- gtk_widget_ref(unmount_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "unmount_menu_item", \
unmount_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ unmount_menu_item = gtk_menu_item_new_with_mnemonic("_Unmount...");
gtk_widget_show(unmount_menu_item);
gtk_container_add(GTK_CONTAINER(file_system_submenu_menu), unmount_menu_item);
+
separator3 = gtk_menu_item_new();
- gtk_widget_set_name(separator3, "separator3");
- gtk_widget_ref(separator3);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "separator3", separator3,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(separator3);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), separator3);
gtk_widget_set_sensitive(separator3, FALSE);
- commit_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(commit_menu_item)->child), \
_("_Save..."));
- gtk_widget_add_accelerator(commit_menu_item, "activate_item", \
actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(commit_menu_item, "commit_menu_item");
- gtk_widget_ref(commit_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "commit_menu_item", \
commit_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ commit_menu_item = gtk_menu_item_new_with_mnemonic("_Save...");
gtk_widget_show(commit_menu_item);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), commit_menu_item);
gtk_widget_add_accelerator(commit_menu_item, "activate", accel_group,
GDK_S, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
- backup_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(backup_menu_item)->child), \
_("_Backup..."));
- gtk_widget_add_accelerator(backup_menu_item, "activate_item", \
actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(backup_menu_item, "backup_menu_item");
- gtk_widget_ref(backup_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "backup_menu_item", \
backup_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ backup_menu_item = gtk_menu_item_new_with_mnemonic("_Backup...");
gtk_widget_show(backup_menu_item);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), backup_menu_item);
+
separator1 = gtk_menu_item_new();
- gtk_widget_set_name(separator1, "separator1");
- gtk_widget_ref(separator1);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "separator1", separator1,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(separator1);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), separator1);
gtk_widget_set_sensitive(separator1, FALSE);
- exit_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(exit_menu_item)->child), \
_("_Quit"));
- gtk_widget_add_accelerator(exit_menu_item, "activate_item", \
actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(exit_menu_item, "exit_menu_item");
- gtk_widget_ref(exit_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "exit_menu_item", exit_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ exit_menu_item = gtk_menu_item_new_with_mnemonic("_Quit");
gtk_widget_show(exit_menu_item);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), exit_menu_item);
gtk_widget_add_accelerator(exit_menu_item, "activate", accel_group,
GDK_Q, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
- evmsgui_settings = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(evmsgui_settings)->child),
- _("_Settings"));
- gtk_widget_add_accelerator(evmsgui_settings, "activate_item", accel_group,
- tmp_key, GDK_MOD1_MASK, (GtkAccelFlags) 0);
- gtk_widget_set_name(evmsgui_settings, "evmsgui_settings");
- gtk_widget_ref(evmsgui_settings);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "evmsgui_settings", \
evmsgui_settings,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ evmsgui_settings = gtk_menu_item_new_with_mnemonic("_Settings");
gtk_widget_show(evmsgui_settings);
gtk_container_add(GTK_CONTAINER(main_menubar), evmsgui_settings);
+
evmsgui_settings_menu = gtk_menu_new();
- gtk_widget_set_name(evmsgui_settings_menu, "evmsgui_settings_menu");
- gtk_widget_ref(evmsgui_settings_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "evmsgui_settings_menu",
- evmsgui_settings_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(evmsgui_settings), evmsgui_settings_menu);
- evmsgui_settings_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(evmsgui_settings_menu));
- set_log_level_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(set_log_level_submenu)->child),
- _("_Log Level"));
- gtk_widget_add_accelerator(set_log_level_submenu, "activate_item",
- evmsgui_settings_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(set_log_level_submenu, "set_log_level_submenu");
- gtk_widget_ref(set_log_level_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "set_log_level_submenu",
- set_log_level_submenu, (GtkDestroyNotify) gtk_widget_unref);
+
+ set_log_level_submenu = gtk_menu_item_new_with_mnemonic("_Log Level");
gtk_widget_show(set_log_level_submenu);
gtk_container_add(GTK_CONTAINER(evmsgui_settings_menu), set_log_level_submenu);
- admin_node_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(admin_node_menu_item)->child),
- _("_Node Administered..."));
- gtk_widget_add_accelerator(admin_node_menu_item, "activate_item",
- evmsgui_settings_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(admin_node_menu_item, "admin_node_menu_item");
- gtk_widget_ref(admin_node_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "admin_node_menu_item",
- admin_node_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ admin_node_menu_item = gtk_menu_item_new_with_mnemonic("_Node Administered...");
gtk_widget_show(admin_node_menu_item);
gtk_container_add(GTK_CONTAINER(evmsgui_settings_menu), admin_node_menu_item);
if (get_number_of_nodes() <= 1) {
gtk_widget_set_sensitive(admin_node_menu_item, FALSE);
}
+
set_log_level_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(set_log_level_submenu_menu, "set_log_level_submenu_menu");
- gtk_widget_ref(set_log_level_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "set_log_level_submenu_menu",
- set_log_level_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(set_log_level_submenu), \
set_log_level_submenu_menu);
- set_log_level_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(set_log_level_submenu_menu));
-/*
- engine_log_level_submenu = gtk_menu_item_new_with_label ("");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN \
(engine_log_level_submenu)->child),
- _("_Engine"));
- gtk_widget_add_accelerator (engine_log_level_submenu, "activate_item", \
set_log_level_submenu_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name (engine_log_level_submenu, "engine_log_level_submenu");
- gtk_widget_ref (engine_log_level_submenu);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "engine_log_level_submenu", \
engine_log_level_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (engine_log_level_submenu);
- gtk_container_add (GTK_CONTAINER (set_log_level_submenu_menu), \
engine_log_level_submenu);
-*/
+
engine_log_level_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(engine_log_level_submenu_menu, \
"engine_log_level_submenu_menu");
- gtk_widget_ref(engine_log_level_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "engine_log_level_submenu_menu",
- engine_log_level_submenu_menu,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(set_log_level_submenu),
- engine_log_level_submenu_menu);
- engine_log_level_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(engine_log_level_submenu_menu));
-
- critical_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(critical_engine_level_menuitem)->child),
- _("_Critical (Least Information)"));
- gtk_widget_add_accelerator(critical_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(critical_engine_level_menuitem));
- gtk_widget_set_name(critical_engine_level_menuitem, \
"critical_engine_level_menuitem");
- gtk_widget_ref(critical_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "critical_engine_level_menuitem",
- critical_engine_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(critical_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- critical_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(critical_engine_level_menuitem),
- TRUE);
-
- serious_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(serious_engine_level_menuitem)->child),
- _("_Serious"));
- gtk_widget_add_accelerator(serious_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(serious_engine_level_menuitem));
- gtk_widget_set_name(serious_engine_level_menuitem, \
"serious_engine_level_menuitem");
- gtk_widget_ref(serious_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "serious_engine_level_menuitem",
- serious_engine_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(serious_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- serious_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(serious_engine_level_menuitem),
- TRUE);
-
- error_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(error_engine_level_menuitem)->child),
- _("_Error"));
- gtk_widget_add_accelerator(error_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(error_engine_level_menuitem));
- gtk_widget_set_name(error_engine_level_menuitem, "error_engine_level_menuitem");
- gtk_widget_ref(error_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "error_engine_level_menuitem",
- error_engine_level_menuitem, (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(error_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- error_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(error_engine_level_menuitem), \
TRUE);
-
- warning_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(warning_engine_level_menuitem)->child),
- _("_Warning"));
- gtk_widget_add_accelerator(warning_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(warning_engine_level_menuitem));
- gtk_widget_set_name(warning_engine_level_menuitem, \
"warning_engine_level_menuitem");
- gtk_widget_ref(warning_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "warning_engine_level_menuitem",
- warning_engine_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(warning_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- warning_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(warning_engine_level_menuitem),
- TRUE);
-
- default_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(default_engine_level_menuitem)->child),
- _("_Default"));
- gtk_widget_add_accelerator(default_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(default_engine_level_menuitem));
- gtk_widget_set_name(default_engine_level_menuitem, \
"default_engine_level_menuitem");
- gtk_widget_ref(default_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "default_engine_level_menuitem",
- default_engine_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(default_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- default_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(default_engine_level_menuitem),
- TRUE);
-
- details_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(details_engine_level_menuitem)->child),
- _("De_tails"));
- gtk_widget_add_accelerator(details_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(details_engine_level_menuitem));
- gtk_widget_set_name(details_engine_level_menuitem, \
"details_engine_level_menuitem");
- gtk_widget_ref(details_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "details_engine_level_menuitem",
- details_engine_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(details_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- details_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(details_engine_level_menuitem),
- TRUE);
-
- entry_exit_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(entry_exit_engine_level_menuitem)->child),
- _("E_ntry/Exit"));
- gtk_widget_add_accelerator(entry_exit_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(entry_exit_engine_level_menuitem));
- gtk_widget_set_name(entry_exit_engine_level_menuitem, \
"entry_exit_engine_level_menuitem");
- gtk_widget_ref(entry_exit_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), \
"entry_exit_engine_level_menuitem",
- entry_exit_engine_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(entry_exit_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- entry_exit_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(entry_exit_engine_level_menuitem),
- TRUE);
-
- debug_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(debug_engine_level_menuitem)->child),
- _("De_bug"));
- gtk_widget_add_accelerator(debug_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(debug_engine_level_menuitem));
- gtk_widget_set_name(debug_engine_level_menuitem, "debug_engine_level_menuitem");
- gtk_widget_ref(debug_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "debug_engine_level_menuitem",
- debug_engine_level_menuitem, (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(debug_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- debug_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(debug_engine_level_menuitem), \
TRUE);
-
- extra_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(extra_engine_level_menuitem)->child),
- _("E_xtra"));
- gtk_widget_add_accelerator(extra_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(extra_engine_level_menuitem));
- gtk_widget_set_name(extra_engine_level_menuitem, "extra_engine_level_menuitem");
- gtk_widget_ref(extra_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "extra_engine_level_menuitem",
- extra_engine_level_menuitem, (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(extra_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- extra_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(extra_engine_level_menuitem), \
TRUE);
-
- everything_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(everything_engine_level_menuitem)->child),
- _("E_verything (Most Information)"));
- gtk_widget_add_accelerator(everything_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(everything_engine_level_menuitem));
- gtk_widget_set_name(everything_engine_level_menuitem, \
"everything_engine_level_menuitem");
- gtk_widget_ref(everything_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), \
"everything_engine_level_menuitem",
- everything_engine_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(everything_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- everything_engine_level_menuitem);
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(everything_engine_level_menuitem), \
TRUE);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(everything_engine_level_menuitem),
- TRUE);
-
-/*
- kernel_info_level_submenu = gtk_menu_item_new_with_label ("");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN \
(kernel_info_level_submenu)->child),
- _("_Kernel"));
- gtk_widget_add_accelerator (kernel_info_level_submenu, "activate_item", \
set_log_level_submenu_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name (kernel_info_level_submenu, "kernel_info_level_submenu");
- gtk_widget_ref (kernel_info_level_submenu);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "kernel_info_level_submenu", \
kernel_info_level_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (kernel_info_level_submenu);
- gtk_container_add (GTK_CONTAINER (set_log_level_submenu_menu), \
kernel_info_level_submenu);
-
- kernel_info_level_submenu_menu = gtk_menu_new ();
- gtk_widget_set_name (kernel_info_level_submenu_menu, \
"kernel_info_level_submenu_menu");
- gtk_widget_ref (kernel_info_level_submenu_menu);
- gtk_object_set_data_full (GTK_OBJECT (main_window), \
"kernel_info_level_submenu_menu", kernel_info_level_submenu_menu,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (kernel_info_level_submenu), \
kernel_info_level_submenu_menu);
- kernel_info_level_submenu_menu_accels = gtk_menu_ensure_uline_accel_group \
(GTK_MENU (kernel_info_level_submenu_menu));
-
- critical_kernel_level_menuitem = gtk_radio_menu_item_new_with_label \
(kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN \
(critical_kernel_level_menuitem)->child),
- _("_Critical (Least Information)"));
- gtk_widget_add_accelerator (critical_kernel_level_menuitem, "activate_item", \
kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM \
(critical_kernel_level_menuitem));
- gtk_widget_set_name (critical_kernel_level_menuitem, \
"critical_kernel_level_menuitem");
- gtk_widget_ref (critical_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), \
"critical_kernel_level_menuitem", critical_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (critical_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), \
critical_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM \
(critical_kernel_level_menuitem), TRUE);
-
- serious_kernel_level_menuitem = gtk_radio_menu_item_new_with_label \
(kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN \
(serious_kernel_level_menuitem)->child),
- _("_Serious"));
- gtk_widget_add_accelerator (serious_kernel_level_menuitem, "activate_item", \
kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM \
(serious_kernel_level_menuitem));
- gtk_widget_set_name (serious_kernel_level_menuitem, \
"serious_kernel_level_menuitem");
- gtk_widget_ref (serious_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), \
"serious_kernel_level_menuitem", serious_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (serious_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), \
serious_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM \
(serious_kernel_level_menuitem), TRUE);
-
- error_kernel_level_menuitem = gtk_radio_menu_item_new_with_label \
(kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN \
(error_kernel_level_menuitem)->child),
- _("_Error"));
- gtk_widget_add_accelerator (error_kernel_level_menuitem, "activate_item", \
kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM \
(error_kernel_level_menuitem));
- gtk_widget_set_name (error_kernel_level_menuitem, "error_kernel_level_menuitem");
- gtk_widget_ref (error_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "error_kernel_level_menuitem", \
error_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (error_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), \
error_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM \
(error_kernel_level_menuitem), TRUE);
-
- warning_kernel_level_menuitem = gtk_radio_menu_item_new_with_label \
(kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN \
(warning_kernel_level_menuitem)->child),
- _("_Warning"));
- gtk_widget_add_accelerator (warning_kernel_level_menuitem, "activate_item", \
kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM \
(warning_kernel_level_menuitem));
- gtk_widget_set_name (warning_kernel_level_menuitem, \
"warning_kernel_level_menuitem");
- gtk_widget_ref (warning_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), \
"warning_kernel_level_menuitem", warning_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (warning_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), \
warning_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM \
(warning_kernel_level_menuitem), TRUE);
-
- default_kernel_level_menuitem = gtk_radio_menu_item_new_with_label \
(kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN \
(default_kernel_level_menuitem)->child),
- _("_Default"));
- gtk_widget_add_accelerator (default_kernel_level_menuitem, "activate_item", \
kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM \
(default_kernel_level_menuitem));
- gtk_widget_set_name (default_kernel_level_menuitem, \
"default_kernel_level_menuitem");
- gtk_widget_ref (default_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), \
"default_kernel_level_menuitem", default_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (default_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), \
default_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM \
(default_kernel_level_menuitem), TRUE);
-
- details_kernel_level_menuitem = gtk_radio_menu_item_new_with_label \
(kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN \
(details_kernel_level_menuitem)->child),
- _("De_tails"));
- gtk_widget_add_accelerator (details_kernel_level_menuitem, "activate_item", \
kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM \
(details_kernel_level_menuitem));
- gtk_widget_set_name (details_kernel_level_menuitem, \
"details_kernel_level_menuitem");
- gtk_widget_ref (details_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), \
"details_kernel_level_menuitem", details_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (details_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), \
details_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM \
(details_kernel_level_menuitem), TRUE);
-
- debug_kernel_level_menuitem = gtk_radio_menu_item_new_with_label \
(kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN \
(debug_kernel_level_menuitem)->child),
- _("De_bug"));
- gtk_widget_add_accelerator (debug_kernel_level_menuitem, "activate_item", \
kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM \
(debug_kernel_level_menuitem));
- gtk_widget_set_name (debug_kernel_level_menuitem, "debug_kernel_level_menuitem");
- gtk_widget_ref (debug_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "debug_kernel_level_menuitem", \
debug_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (debug_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), \
debug_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM \
(debug_kernel_level_menuitem), TRUE);
-
- extra_kernel_level_menuitem = gtk_radio_menu_item_new_with_label \
(kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN \
(extra_kernel_level_menuitem)->child),
- _("E_xtra"));
- gtk_widget_add_accelerator (extra_kernel_level_menuitem, "activate_item", \
kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM \
(extra_kernel_level_menuitem));
- gtk_widget_set_name (extra_kernel_level_menuitem, "extra_kernel_level_menuitem");
- gtk_widget_ref (extra_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "extra_kernel_level_menuitem", \
extra_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (extra_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), \
extra_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM \
(extra_kernel_level_menuitem), TRUE);
-
- entry_exit_kernel_level_menuitem = gtk_radio_menu_item_new_with_label \
(kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN \
(entry_exit_kernel_level_menuitem)->child),
- _("E_ntry/Exit"));
- gtk_widget_add_accelerator (entry_exit_kernel_level_menuitem, "activate_item", \
kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM \
(entry_exit_kernel_level_menuitem));
- gtk_widget_set_name (entry_exit_kernel_level_menuitem, \
"entry_exit_kernel_level_menuitem");
- gtk_widget_ref (entry_exit_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), \
"entry_exit_kernel_level_menuitem", entry_exit_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (entry_exit_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), \
entry_exit_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM \
(entry_exit_kernel_level_menuitem), TRUE);
-
- everything_kernel_level_menuitem = gtk_radio_menu_item_new_with_label \
(kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN \
(everything_kernel_level_menuitem)->child),
- _("E_verything (Most Information)"));
- gtk_widget_add_accelerator (everything_kernel_level_menuitem, "activate_item", \
kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM \
(everything_kernel_level_menuitem));
- gtk_widget_set_name (everything_kernel_level_menuitem, \
"everything_kernel_level_menuitem");
- gtk_widget_ref (everything_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), \
"everything_kernel_level_menuitem", everything_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (everything_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), \
everything_kernel_level_menuitem);
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM \
(everything_kernel_level_menuitem), TRUE);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM \
(everything_kernel_level_menuitem), TRUE);
-*/
- help_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(help_menu_item)->child), \
_("_Help"));
- gtk_widget_add_accelerator(help_menu_item, "activate_item", accel_group,
- tmp_key, GDK_MOD1_MASK, (GtkAccelFlags) 0);
- gtk_widget_set_name(help_menu_item, "help_menu_item");
- gtk_widget_ref(help_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "help_menu_item", help_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(set_log_level_submenu), \
engine_log_level_submenu_menu); +
+
+
+
+ critical_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, \
"_Critical (Least Information)"); + engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(critical_engine_level_menuitem));
+ gtk_widget_ref(critical_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), \
"critical_engine_level_menuitem", + \
critical_engine_level_menuitem, + (GtkDestroyNotify) \
gtk_widget_unref); + gtk_widget_show(critical_engine_level_menuitem);
+ gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
+ critical_engine_level_menuitem);
+ gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(critical_engine_level_menuitem),
+ TRUE);
+
+
+
+ serious_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, \
"_Serious"); + engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(serious_engine_level_menuitem));
+ gtk_widget_ref(serious_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), \
"serious_engine_level_menuitem", + \
serious_engine_level_menuitem, + (GtkDestroyNotify) \
gtk_widget_unref); + gtk_widget_show(serious_engine_level_menuitem);
+ gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
+ serious_engine_level_menuitem);
+ gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(serious_engine_level_menuitem),
+ TRUE);
+
+ error_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, \
"_Error"); + engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(error_engine_level_menuitem));
+ gtk_widget_ref(error_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), \
"error_engine_level_menuitem", + \
error_engine_level_menuitem, (GtkDestroyNotify) gtk_widget_unref); + \
gtk_widget_show(error_engine_level_menuitem); + \
gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu), + \
error_engine_level_menuitem); + \
gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(error_engine_level_menuitem), \
TRUE); +
+
+
+
+
+ warning_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, \
"_Warning"); + engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(warning_engine_level_menuitem));
+ gtk_widget_ref(warning_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), \
"warning_engine_level_menuitem", + \
warning_engine_level_menuitem, + (GtkDestroyNotify) \
gtk_widget_unref); + gtk_widget_show(warning_engine_level_menuitem);
+ gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
+ warning_engine_level_menuitem);
+ gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(warning_engine_level_menuitem),
+ TRUE);
+
+
+ default_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, \
"_Default"); + engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(default_engine_level_menuitem));
+ gtk_widget_ref(default_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), \
"default_engine_level_menuitem", + \
default_engine_level_menuitem, + (GtkDestroyNotify) \
gtk_widget_unref); + gtk_widget_show(default_engine_level_menuitem);
+ gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
+ default_engine_level_menuitem);
+ gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(default_engine_level_menuitem),
+ TRUE);
+
+
+
+
+ details_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, \
"De_tails"); + engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(details_engine_level_menuitem));
+ gtk_widget_ref(details_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), \
"details_engine_level_menuitem", + \
details_engine_level_menuitem, + (GtkDestroyNotify) \
gtk_widget_unref); + gtk_widget_show(details_engine_level_menuitem);
+ gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
+ details_engine_level_menuitem);
+ gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(details_engine_level_menuitem),
+ TRUE);
+
+
+
+
+ entry_exit_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, \
"E_ntry/Exit"); + engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(entry_exit_engine_level_menuitem));
+ gtk_widget_ref(entry_exit_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), \
"entry_exit_engine_level_menuitem", + \
entry_exit_engine_level_menuitem, + \
(GtkDestroyNotify) gtk_widget_unref); + \
gtk_widget_show(entry_exit_engine_level_menuitem); + \
gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu), + \
entry_exit_engine_level_menuitem); + \
gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(entry_exit_engine_level_menuitem),
+ TRUE);
+
+
+
+ debug_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, \
"De_bug"); + engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(debug_engine_level_menuitem));
+ gtk_widget_ref(debug_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), \
"debug_engine_level_menuitem", + \
debug_engine_level_menuitem, (GtkDestroyNotify) gtk_widget_unref); + \
gtk_widget_show(debug_engine_level_menuitem); + \
gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu), + \
debug_engine_level_menuitem); + \
gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(debug_engine_level_menuitem), \
TRUE); +
+
+
+ extra_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, \
"E_xtra"); + engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(extra_engine_level_menuitem));
+ gtk_widget_ref(extra_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), \
"extra_engine_level_menuitem", + \
extra_engine_level_menuitem, (GtkDestroyNotify) gtk_widget_unref); + \
gtk_widget_show(extra_engine_level_menuitem); + \
gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu), + \
extra_engine_level_menuitem); + \
gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(extra_engine_level_menuitem), \
TRUE); +
+
+
+ everything_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, \
"E_verything (Most Information)"); + engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(everything_engine_level_menuitem));
+ gtk_widget_ref(everything_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), \
"everything_engine_level_menuitem", + \
everything_engine_level_menuitem, + \
(GtkDestroyNotify) gtk_widget_unref); + \
gtk_widget_show(everything_engine_level_menuitem); + \
gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu), + \
everything_engine_level_menuitem); + \
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(everything_engine_level_menuitem), \
TRUE); + gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(everything_engine_level_menuitem),
+ TRUE);
+
+
+
+
+ help_menu_item = gtk_menu_item_new_with_mnemonic("_Help");
gtk_widget_show(help_menu_item);
gtk_container_add(GTK_CONTAINER(main_menubar), help_menu_item);
help_menu_item_menu = gtk_menu_new();
- gtk_widget_set_name(help_menu_item_menu, "help_menu_item_menu");
- gtk_widget_ref(help_menu_item_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "help_menu_item_menu",
- help_menu_item_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(help_menu_item), help_menu_item_menu);
- help_menu_item_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(help_menu_item_menu));
- web_links_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(web_links_menu_item)->child),
- _("_Web links"));
- gtk_widget_add_accelerator(web_links_menu_item, "activate_item",
- help_menu_item_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(web_links_menu_item, "web_links_menu_item");
- gtk_widget_ref(web_links_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "web_links_menu_item",
- web_links_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+ web_links_menu_item = gtk_menu_item_new_with_mnemonic("_Web links");
gtk_widget_show(web_links_menu_item);
gtk_container_add(GTK_CONTAINER(help_menu_item_menu), web_links_menu_item);
help_separator = gtk_menu_item_new();
- gtk_widget_set_name(help_separator, "help_separator");
- gtk_widget_ref(help_separator);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "help_separator", help_separator,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(help_separator);
gtk_container_add(GTK_CONTAINER(help_menu_item_menu), help_separator);
gtk_widget_set_sensitive(help_separator, FALSE);
- about_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(about_menu_item)->child), \
_("_About"));
- gtk_widget_add_accelerator(about_menu_item, "activate_item", \
help_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(about_menu_item, "about_menu_item");
- gtk_widget_ref(about_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "about_menu_item", \
about_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+ about_menu_item = gtk_menu_item_new_with_mnemonic("_About");
gtk_widget_show(about_menu_item);
gtk_container_add(GTK_CONTAINER(help_menu_item_menu), about_menu_item);
toolbar_handlebox = gtk_handle_box_new();
- gtk_widget_set_name(toolbar_handlebox, "toolbar_handlebox");
- gtk_widget_ref(toolbar_handlebox);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "toolbar_handlebox", \
toolbar_handlebox,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(toolbar_handlebox);
gtk_box_pack_start(GTK_BOX(main_window_vbox), toolbar_handlebox, FALSE, FALSE, 0);
- icon_button_toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, \
GTK_TOOLBAR_BOTH); + icon_button_toolbar = gtk_toolbar_new();
gtk_widget_set_name(icon_button_toolbar, "icon_button_toolbar");
gtk_widget_ref(icon_button_toolbar);
gtk_object_set_data_full(GTK_OBJECT(main_window), "icon_button_toolbar",
@@ -1642,8 +842,7 @@
gtk_widget_show(icon_button_toolbar);
gtk_container_add(GTK_CONTAINER(toolbar_handlebox), icon_button_toolbar);
gtk_container_set_border_width(GTK_CONTAINER(icon_button_toolbar), 5);
- gtk_toolbar_set_space_size(GTK_TOOLBAR(icon_button_toolbar), 8);
- gtk_toolbar_set_button_relief(GTK_TOOLBAR(icon_button_toolbar), GTK_RELIEF_NONE);
+
tmp_toolbar_icon = create_pixmap(main_window, "commit.xpm");
toolbar_commit_button = \
gtk_toolbar_append_element(GTK_TOOLBAR(icon_button_toolbar), @@ -2914,6 +2113,7 @@
GTK_SIGNAL_FUNC(on_engine_log_level_submenu_menu_realize), NULL);
gtk_signal_connect(GTK_OBJECT(engine_log_level_submenu_menu), "map",
GTK_SIGNAL_FUNC(on_engine_log_level_submenu_menu_map), NULL);
+
gtk_signal_connect(GTK_OBJECT(critical_engine_level_menuitem), "activate",
GTK_SIGNAL_FUNC(set_engine_log_level), GUINT_TO_POINTER(CRITICAL));
gtk_signal_connect(GTK_OBJECT(serious_engine_level_menuitem), "activate",
@@ -2934,44 +2134,7 @@
GTK_SIGNAL_FUNC(set_engine_log_level), GUINT_TO_POINTER(EXTRA));
gtk_signal_connect(GTK_OBJECT(everything_engine_level_menuitem), "activate",
GTK_SIGNAL_FUNC(set_engine_log_level), GUINT_TO_POINTER(EVERYTHING));
-/*
- gtk_signal_connect (GTK_OBJECT (kernel_info_level_submenu_menu), "realize",
- GTK_SIGNAL_FUNC (on_kernel_info_level_submenu_menu_realize),
- NULL);
- gtk_signal_connect (GTK_OBJECT (kernel_info_level_submenu_menu), "map",
- GTK_SIGNAL_FUNC (on_kernel_info_level_submenu_menu_map),
- NULL);
- gtk_signal_connect (GTK_OBJECT (critical_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(CRITICAL));
- gtk_signal_connect (GTK_OBJECT (serious_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(SERIOUS));
- gtk_signal_connect (GTK_OBJECT (error_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(ERROR));
- gtk_signal_connect (GTK_OBJECT (warning_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(WARNING));
- gtk_signal_connect (GTK_OBJECT (default_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(DEFAULT));
- gtk_signal_connect (GTK_OBJECT (details_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(DETAILS));
- gtk_signal_connect (GTK_OBJECT (debug_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(DEBUG));
- gtk_signal_connect (GTK_OBJECT (extra_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(EXTRA));
- gtk_signal_connect (GTK_OBJECT (entry_exit_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(ENTRY_EXIT));
- gtk_signal_connect (GTK_OBJECT (everything_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(EVERYTHING));
-*/
+
gtk_signal_connect(GTK_OBJECT(web_links_menu_item), "activate",
GTK_SIGNAL_FUNC(on_web_links_menu_item_activate), NULL);
gtk_signal_connect(GTK_OBJECT(about_menu_item), "activate",
--- evms-2.5.5.orig/ui/gtk/results.c
+++ evms-2.5.5/ui/gtk/results.c
@@ -35,7 +35,7 @@
accel_group = gtk_accel_group_new();
- results_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ results_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name(results_window, "results_window");
gtk_object_set_data(GTK_OBJECT(results_window), "results_window", results_window);
gtk_widget_set_usize(results_window, 470, 410);
@@ -72,7 +72,7 @@
gtk_container_add(GTK_CONTAINER(results_window_hbuttonbox), results_window_button);
GTK_WIDGET_SET_FLAGS(results_window_button, GTK_CAN_DEFAULT);
gtk_widget_add_accelerator(results_window_button, "clicked", accel_group,
- GDK_O, 0, GTK_ACCEL_VISIBLE);
+ GDK_O, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
hbox1 = gtk_hbox_new(FALSE, 0);
gtk_widget_set_name(hbox1, "hbox1");
--- evms-2.5.5.orig/ui/gtk/message.c
+++ evms-2.5.5/ui/gtk/message.c
@@ -27,6 +27,8 @@
#include <frontend.h>
#include <gtk/gtk.h>
+#define GTK_ENABLE_BROKEN
+#include <gtk/gtktext.h>
#include "support.h"
#include "message.h"
@@ -178,20 +180,20 @@
/*
*
- * void on_message_clear_button_clicked (GtkButton *, GtkText *)
+ * void on_message_clear_button_clicked (GtkButton *, GtkTextView *)
*
* Description:
* This routine
*
* Entry:
* button - address of the GtkButton widget
- * text - address of the GtkText widget
+ * text - address of the GtkTextView widget
*
* Exit:
* Clears the text in the message window.
*
*/
-void on_message_clear_button_clicked(GtkButton * button, GtkText * text)
+void on_message_clear_button_clicked(GtkButton * button, GtkTextView * text)
{
gtk_text_backward_delete(text, gtk_text_get_length(text));
}
@@ -358,7 +360,7 @@
pixmap = gtk_pixmap_new(gdk_pixmap, mask);
label = gtk_label_new(_("Alert messages received from plug-ins are shown \
below:"));
- gtk_accel_group_attach(accel_group, GTK_OBJECT(message_window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(message_window));
get_ok_pixmap(&gdk_pixmap, &mask);
add_pixmap_label_to_button(ok_button, gdk_pixmap, mask, _("_OK"), accel_group);
@@ -448,7 +450,7 @@
connect_info_ok_button_clicked_handler(GTK_BUTTON(ok_button), args);
}
- gtk_text_insert(GTK_TEXT(text_box), NULL, NULL, NULL, timestamped_text, -1);
+ gtk_text_insert(GTK_TEXT_VIEW(text_box), NULL, NULL, NULL, timestamped_text, -1);
gtk_widget_grab_default(ok_button);
g_free(timestamped_text);
@@ -533,7 +535,7 @@
gtk_box_reorder_child(box, button, g_list_length(box->children) - 1);
accel_group = gtk_accel_group_new();
- gtk_accel_group_attach(accel_group,
+ gtk_window_add_accel_group(accel_group,
GTK_OBJECT(gtk_widget_get_toplevel(button)));
get_cancel_pixmap(&gdk_pixmap, &mask);
@@ -712,7 +714,7 @@
ok_button = gtk_button_new();
pixmap = gtk_pixmap_new(gdk_pixmap, mask);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(window));
get_ok_pixmap(&gdk_pixmap, &mask);
add_pixmap_label_to_button(ok_button, gdk_pixmap, mask, _("_OK"), accel_group);
--- evms-2.5.5.orig/ui/gtk/task_window.c
+++ evms-2.5.5/ui/gtk/task_window.c
@@ -60,7 +60,7 @@
accel_group = gtk_accel_group_new();
- task_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ task_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name(task_window, "task_window");
gtk_object_set_data(GTK_OBJECT(task_window), "task_window", task_window);
gtk_widget_set_usize(task_window, 630, 475);
@@ -200,7 +200,7 @@
GTK_WIDGET_SET_FLAGS(help_button, GTK_CAN_DEFAULT);
gtk_tooltips_set_tip(tooltips, help_button, _("Get help on this dialog window"), \
NULL); gtk_widget_add_accelerator(help_button, "clicked", accel_group,
- GDK_H, 0, GTK_ACCEL_VISIBLE);
+ GDK_H, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
hbox3 = gtk_hbox_new(FALSE, 0);
gtk_widget_set_name(hbox3, "hbox3");
@@ -253,7 +253,7 @@
GTK_WIDGET_SET_FLAGS(selection_window_cancel_button, GTK_CAN_DEFAULT);
gtk_tooltips_set_tip(tooltips, selection_window_cancel_button, _("Cancel the \
operation"), NULL);
- gtk_widget_add_accelerator(selection_window_cancel_button, "clicked", accel_group, \
GDK_C, 0, + gtk_widget_add_accelerator(selection_window_cancel_button, "clicked", \
accel_group, GDK_C, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
hbox4 = gtk_hbox_new(FALSE, 0);
@@ -294,7 +294,7 @@
GTK_WIDGET_SET_FLAGS(selection_window_prev_button, GTK_CAN_DEFAULT);
gtk_tooltips_set_tip(tooltips, selection_window_prev_button, _("Move to previous \
window"), NULL);
- gtk_widget_add_accelerator(selection_window_prev_button, "clicked", accel_group, \
GDK_P, 0, + gtk_widget_add_accelerator(selection_window_prev_button, "clicked", \
accel_group, GDK_P, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
selection_window_prev_button_hbox = gtk_hbox_new(FALSE, 0);
--- evms-2.5.5.orig/aclocal.m4
+++ evms-2.5.5/aclocal.m4
@@ -3356,3 +3356,199 @@
fi
])
+# Configure paths for GTK+
+# Owen Taylor 1997-2001
+
+dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, \
MODULES]]]]) +dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is \
specified in MODULES, +dnl pass to pkg-config
+dnl
+AC_DEFUN([AM_PATH_GTK_2_0],
+[dnl
+dnl Get the cflags and libraries from pkg-config
+dnl
+AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a \
test GTK+ program], + , enable_gtktest=yes)
+
+ pkg_config_args=gtk+-2.0
+ for module in . $4
+ do
+ case "$module" in
+ gthread)
+ pkg_config_args="$pkg_config_args gthread-2.0"
+ ;;
+ esac
+ done
+
+ no_gtk=""
+
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+ if test x$PKG_CONFIG != xno ; then
+ if pkg-config --atleast-pkgconfig-version 0.7 ; then
+ :
+ else
+ echo "*** pkg-config too old; version 0.7 or better required."
+ no_gtk=yes
+ PKG_CONFIG=no
+ fi
+ else
+ no_gtk=yes
+ fi
+
+ min_gtk_version=ifelse([$1], ,2.0.0,$1)
+ AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
+
+ if test x$PKG_CONFIG != xno ; then
+ ## don't try to run the test against uninstalled libtool libs
+ if $PKG_CONFIG --uninstalled $pkg_config_args; then
+ echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
+ enable_gtktest=no
+ fi
+
+ if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
+ :
+ else
+ no_gtk=yes
+ fi
+ fi
+
+ if test x"$no_gtk" = x ; then
+ GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+ GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+ gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ if test "x$enable_gtktest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$GTK_LIBS $LIBS"
+dnl
+dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent)
+dnl
+ rm -f conf.gtktest
+ AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+ int major, minor, micro;
+ char *tmp_version;
+
+ system ("touch conf.gtktest");
+
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
+ tmp_version = g_strdup("$min_gtk_version");
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
+ printf("%s, bad version string\n", "$min_gtk_version");
+ exit(1);
+ }
+
+ if ((gtk_major_version != $gtk_config_major_version) ||
+ (gtk_minor_version != $gtk_config_minor_version) ||
+ (gtk_micro_version != $gtk_config_micro_version))
+ {
+ printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ \
(%d.%d.%d)\n", + $gtk_config_major_version, $gtk_config_minor_version, \
$gtk_config_micro_version, + gtk_major_version, gtk_minor_version, \
gtk_micro_version); + printf ("*** was found! If pkg-config was correct, then it \
is best\n"); + printf ("*** to remove the old version of GTK+. You may also be \
able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH \
enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure \
you have run ldconfig if that is\n"); + printf("*** required on your \
system.\n"); + printf("*** If pkg-config was wrong, set the environment variable \
PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration \
files\n"); + }
+ else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+ (gtk_minor_version != GTK_MINOR_VERSION) ||
+ (gtk_micro_version != GTK_MICRO_VERSION))
+ {
+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+ printf("*** library (version %d.%d.%d)\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ }
+ else
+ {
+ if ((gtk_major_version > major) ||
+ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+ ((gtk_major_version == major) && (gtk_minor_version == minor) && \
(gtk_micro_version >= micro))) + {
+ return 0;
+ }
+ else
+ {
+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest \
version of\n", + major, minor, micro);
+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+ printf("***\n");
+ printf("*** If you have already installed a sufficiently new version, this \
error\n"); + printf("*** probably means that the wrong copy of the pkg-config \
shell script is\n"); + printf("*** being found. The easiest way to fix this is \
to remove the old version\n"); + printf("*** of GTK+, but you can also set the \
PKG_CONFIG environment to point to the\n"); + printf("*** correct copy of \
pkg-config. (In this case, you will have to\n"); + printf("*** modify your \
LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + \
printf("*** so that the correct libraries are found at run-time))\n"); + }
+ }
+ return 1;
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ if test "x$no_gtk" = x ; then
+ AC_MSG_RESULT(yes (version \
$gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) + \
ifelse([$2], , :, [$2]) + else
+ AC_MSG_RESULT(no)
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** A new enough version of pkg-config was not found."
+ echo "*** See http://pkgconfig.sourceforge.net"
+ else
+ if test -f conf.gtktest ; then
+ :
+ else
+ echo "*** Could not run GTK+ test program, checking why..."
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$LIBS $GTK_LIBS"
+ AC_TRY_LINK([
+#include <gtk/gtk.h>
+#include <stdio.h>
+], [ return ((gtk_major_version) || (gtk_minor_version) || \
(gtk_micro_version)); ], + [ echo "*** The test program compiled, but did not \
run. This usually means" + echo "*** that the run-time linker is not finding \
GTK+ or finding the wrong" + echo "*** version of GTK+. If it is not finding \
GTK+, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment \
variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed \
location Also, make sure you have run ldconfig if that" + echo "*** is \
required on your system" + echo "***"
+ echo "*** If you have an old version installed, it is best to remove it, \
although" + echo "*** you may also be able to get things to work by \
modifying LD_LIBRARY_PATH" ], + [ echo "*** The test program failed to compile \
or link. See the file config.log for the" + echo "*** exact error that \
occured. This usually means GTK+ is incorrectly installed."]) + \
CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS"
+ fi
+ fi
+ GTK_CFLAGS=""
+ GTK_LIBS=""
+ ifelse([$3], , :, [$3])
+ fi
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+ rm -f conf.gtktest
+])
--- evms-2.5.5.orig/configure.ac
+++ evms-2.5.5/configure.ac
@@ -99,7 +99,7 @@
AC_PATH_GLIB([1.2.0], [have_glib="yes"], [have_glib="no"])
AC_PATH_GLIB2([2.0.0], [have_glib2="yes"], [have_glib2="no"])
-AC_PATH_GTK([1.2.0], [have_gtk="yes"], [have_gtk="no"], [gthread])
+AM_PATH_GTK_2_0([2.0.0], [have_gtk="yes"], [have_gtk="no"], [gthread])
AC_PATH_HA([0.4.9f], [have_ha="yes"], [have_ha="no"])
# Typedefs and structures
--- evms-2.5.5.orig/make.rules.in
+++ evms-2.5.5/make.rules.in
@@ -49,7 +49,7 @@
GLIB2_LIBS = @GLIB2_LIBS@
GLIB2_CPPFLAGS = @GLIB2_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
-GTK_CPPFLAGS = @GTK_CPPFLAGS@
+GTK_CPPFLAGS = @GTK_CFLAGS@
HA_LIBS = @HA_LIBS@
HA_CPPFLAGS = @HA_CPPFLAGS@
HA_RESOURCEDIR = @HA_RESOURCEDIR@
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Evms-devel mailing list
Evms-devel@lists.sourceforge.net
To subscribe/unsubscribe, please visit:
https://lists.sourceforge.net/lists/listinfo/evms-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic