diff options
| author | Thomas White <taw27@cam.ac.uk> | 2009-03-17 17:24:35 +0000 |
|---|---|---|
| committer | Thomas White <taw27@cam.ac.uk> | 2009-03-17 17:24:35 +0000 |
| commit | ba5317b07a828733039c459bb959bd4f497b4316 (patch) | |
| tree | 22265e5b7284bc8fc44a3b71be0e80d7a2f03f63 | |
| parent | 9355acb90f232494d11788711a22a5bd1af53f04 (diff) | |
| parent | 2c359093a6497614e1ba37f1d2a1d4ac59b224b9 (diff) | |
Merge branch 'master' into simple-search
| -rw-r--r-- | src/displaywindow.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/displaywindow.c b/src/displaywindow.c index 7f33060..ca3edac 100644 --- a/src/displaywindow.c +++ b/src/displaywindow.c @@ -101,7 +101,7 @@ static gint displaywindow_gl_motion_notify(GtkWidget *widget, /* Click rotates */ trackball(d_quat, (2.0*dw->x_start - w)/w, - h-2.0*dw->y_start)/h, + (h-2.0*dw->y_start)/h, (2.0*x-w)/w, (h-2.0*y)/h); add_quats(d_quat, dw->view_quat, dw->view_quat); @@ -693,6 +693,7 @@ DisplayWindow *displaywindow_open(ControlContext *ctx) DisplayWindow *dw; GtkWidget *notebook; GtkWidget *d; + GValue trueval = {0}; dw = malloc(sizeof(DisplayWindow)); @@ -732,7 +733,9 @@ DisplayWindow *displaywindow_open(ControlContext *ctx) G_CALLBACK(displaywindow_closedown), dw); notebook = gtk_notebook_new(); - g_object_set_property(G_OBJECT(notebook), "homogeneous", "true"); + g_value_init(&trueval, G_TYPE_BOOLEAN); + g_value_set_boolean(&trueval, TRUE); + g_object_set_property(G_OBJECT(notebook), "homogeneous", &trueval); gtk_box_pack_end(GTK_BOX(dw->bigvbox), notebook, TRUE, TRUE, 0); /* Don't forget to update displaywindow_switch_page() * when adding extra tabs */ @@ -871,7 +874,8 @@ void displaywindow_error(const char *msg, DisplayWindow *dw) window = gtk_message_dialog_new(GTK_WINDOW(dw->window), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, msg); + GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + "%s", msg); gtk_window_set_title(GTK_WINDOW(window), "Error"); g_signal_connect_swapped(window, "response", G_CALLBACK(gtk_widget_destroy), window); |