Merge branch 'gfio' of ssh://brick.kernel.dk/data/git/fio into gfio

[fio.git] / gfio.c

diff --git a/gfio.c b/gfio.c
index c25a264031473412a7db298f1a29062205e42957..1251292e3a5666f3908a6ed64d5bfc5e4867635a 100644 (file)
--- a/gfio.c
+++ b/gfio.c
@@ -496,15 +496,15 @@ static void update_button_states(struct gui *ui, struct gui_entry *ge)
        if (w)
                gtk_widget_set_sensitive(w, connect_state);
 
-       w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Edit Job");
+       w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Edit job");
        if (w)
                gtk_widget_set_sensitive(w, edit_state);
 
-       w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Send Job");
+       w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Send job");
        if (w)
                gtk_widget_set_sensitive(w, send_state);
 
-       w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Start Job");
+       w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Start job");
        if (w)
                gtk_widget_set_sensitive(w, start_state);
 }
@@ -1738,8 +1738,8 @@ static void start_job_clicked(__attribute__((unused)) GtkWidget *widget,
        struct gui_entry *ge = data;
        struct gfio_client *gc = ge->client;
 
-       gtk_widget_set_sensitive(ge->button[START_JOB_BUTTON], 0);
-       fio_start_client(gc->client);
+       if (gc)
+               fio_start_client(gc->client);
 }
 
 static void file_open(GtkWidget *w, gpointer data);
@@ -1753,7 +1753,7 @@ static void connect_clicked(GtkWidget *widget, gpointer data)
                int ret;
 
                if (!ge->nr_job_files)
-                       file_open(widget, data);
+                       file_open(widget, ge->ui);
                if (!ge->nr_job_files)
                        return;
 
@@ -2065,7 +2065,7 @@ static void file_new(GtkWidget *w, gpointer data)
  * Return the 'ge' corresponding to the tab. If the active tab is the
  * main tab, open a new tab.
  */
-static struct gui_entry *get_ge_from_page(unsigned int cur_page)
+static struct gui_entry *get_ge_from_page(gint cur_page)
 {
        struct flist_head *entry;
        struct gui_entry *ge;