From 2b18a4fbebe53fb8ecf77770a99b7cb12a8582a1 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 17 Mar 2009 17:23:48 +0000 Subject: Merge fallout --- src/displaywindow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/displaywindow.c b/src/displaywindow.c index 9d475fb..5e441af 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); -- cgit v1.2.3 From 9e0e17f62728d003f5a1f5a52d602baf5011f69f Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 17 Mar 2009 17:24:00 +0000 Subject: Set notebook homogeneous --- src/displaywindow.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/displaywindow.c b/src/displaywindow.c index 5e441af..c44e63a 100644 --- a/src/displaywindow.c +++ b/src/displaywindow.c @@ -684,6 +684,7 @@ DisplayWindow *displaywindow_open(ControlContext *ctx) DisplayWindow *dw; GtkWidget *notebook; GtkWidget *d; + GValue trueval = {0}; dw = malloc(sizeof(DisplayWindow)); @@ -723,7 +724,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 */ -- cgit v1.2.3 From 2c359093a6497614e1ba37f1d2a1d4ac59b224b9 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 17 Mar 2009 17:24:10 +0000 Subject: Fix message warning --- src/displaywindow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/displaywindow.c b/src/displaywindow.c index c44e63a..6488b34 100644 --- a/src/displaywindow.c +++ b/src/displaywindow.c @@ -865,7 +865,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); -- cgit v1.2.3