From b1034d25895ae64755d7ad7596a8c01cd1e26e74 Mon Sep 17 00:00:00 2001 From: tchernobog Date: Sun, 17 Sep 2006 13:45:47 +0000 Subject: [PATCH] - Substitute old "inf" values in Adjustements with a maximum of ~65000. This should make .glade files compatible with glade3. git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@1228 3ecf2c5c-341e-0410-92b4-d18e462d057c --- glade/add-process-dialog.glade | 4 ++-- glade/add-request-dialog.glade | 4 ++-- glade/add-resource-dialog.glade | 2 +- glade/add-thread-dialog.glade | 6 +++--- glade/main-window.glade | 2 +- src/jump_to_dialog.cc | 2 -- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/glade/add-process-dialog.glade b/glade/add-process-dialog.glade index b80de7b..838aad1 100644 --- a/glade/add-process-dialog.glade +++ b/glade/add-process-dialog.glade @@ -192,7 +192,7 @@ GTK_UPDATE_ALWAYS False False - 0 0 inf 1 0 0 + 0 0 65536 1 0 0 1 @@ -213,7 +213,7 @@ GTK_UPDATE_ALWAYS False False - 0 0 inf 1 0 0 + 0 0 65536 1 0 0 1 diff --git a/glade/add-request-dialog.glade b/glade/add-request-dialog.glade index 9021f41..554915c 100644 --- a/glade/add-request-dialog.glade +++ b/glade/add-request-dialog.glade @@ -114,7 +114,7 @@ GTK_UPDATE_ALWAYS False False - 0 0 inf 1 0 0 + 0 0 65536 1 0 0 0 @@ -236,7 +236,7 @@ GTK_UPDATE_ALWAYS False False - 1 1 inf 1 0 0 + 1 1 65536 1 0 0 1 diff --git a/glade/add-resource-dialog.glade b/glade/add-resource-dialog.glade index 3533e55..f1b78bf 100644 --- a/glade/add-resource-dialog.glade +++ b/glade/add-resource-dialog.glade @@ -86,7 +86,7 @@ GTK_UPDATE_ALWAYS False False - 1 1 inf 1 0 0 + 1 1 65536 1 0 0 1 diff --git a/glade/add-thread-dialog.glade b/glade/add-thread-dialog.glade index 57332bb..6b53895 100644 --- a/glade/add-thread-dialog.glade +++ b/glade/add-thread-dialog.glade @@ -86,7 +86,7 @@ GTK_UPDATE_ALWAYS False False - 0 0 inf 1 0 0 + 0 0 65536 1 0 0 1 @@ -107,7 +107,7 @@ GTK_UPDATE_ALWAYS False False - 0 0 inf 1 0 0 + 0 0 65536 1 0 0 1 @@ -128,7 +128,7 @@ GTK_UPDATE_ALWAYS False False - 1 1 inf 1 0 0 + 1 1 65536 1 0 0 1 diff --git a/glade/main-window.glade b/glade/main-window.glade index 5ea3f33..af1ac93 100644 --- a/glade/main-window.glade +++ b/glade/main-window.glade @@ -442,7 +442,7 @@ True True - 0 0 inf 1 10 10 + 0 0 65536 1 10 10 1 diff --git a/src/jump_to_dialog.cc b/src/jump_to_dialog.cc index 62e7a42..afa2dff 100644 --- a/src/jump_to_dialog.cc +++ b/src/jump_to_dialog.cc @@ -76,8 +76,6 @@ JumpToDialog::start() show(); _progress->set_fraction(0.0); - assert(_target_instant >= 0); - Simulation& sim = Simulation::get_instance(); History& h = sim.get_history();