Commit b2a6fb31 authored by Maxime Doyen's avatar Maxime Doyen

5.0.6 (14.04 build failure)

parent 2d1421f2
......@@ -22,7 +22,7 @@ AC_PROG_INSTALL
AC_PROG_INTLTOOL
# Checks for libraries.
PKG_CHECK_MODULES(DEPS, gtk+-3.0 >= 3.6 glib-2.0 >= 2.34)
PKG_CHECK_MODULES(DEPS, gtk+-3.0 >= 3.10 glib-2.0 >= 2.37)
AC_SUBST(DEPS_CFLAGS)
AC_SUBST(DEPS_LIBS)
AC_CHECK_LIB(m, pow)
......
......@@ -1192,7 +1192,7 @@ gint w, h, row;
/* left area */
vbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, SPACING_SMALL);
//gtk_box_pack_start (GTK_BOX (mainbox), vbox, FALSE, FALSE, 0);
gtk_widget_set_margin_end(vbox, SPACING_TINY);
gtk_widget_set_margin_right(vbox, SPACING_TINY);
gtk_paned_pack1 (GTK_PANED(hpaned), vbox, FALSE, FALSE);
table = gtk_grid_new ();
......@@ -1226,7 +1226,7 @@ gint w, h, row;
notebook = gtk_notebook_new();
data.notebook = notebook;
//gtk_box_pack_start (GTK_BOX (mainbox), notebook, TRUE, TRUE, 0);
gtk_widget_set_margin_start(notebook, SPACING_TINY);
gtk_widget_set_margin_left(notebook, SPACING_TINY);
gtk_paned_pack2 (GTK_PANED(hpaned), notebook, FALSE, FALSE);
/* page :: General */
......
......@@ -985,7 +985,7 @@ gint w, h;
hgrid = gtk_grid_new ();
gtk_grid_set_row_spacing (GTK_GRID (hgrid), SPACING_SMALL);
gtk_grid_set_column_spacing (GTK_GRID (hgrid), SPACING_MEDIUM);
gtk_widget_set_margin_end(hgrid, SPACING_SMALL);
gtk_widget_set_margin_right(hgrid, SPACING_SMALL);
gtk_paned_pack1 (GTK_PANED(hpaned), hgrid, FALSE, FALSE);
// listview
......@@ -1014,7 +1014,7 @@ gint w, h;
gtk_grid_set_row_spacing (GTK_GRID (content_grid), SPACING_LARGE);
gtk_orientable_set_orientation(GTK_ORIENTABLE(content_grid), GTK_ORIENTATION_VERTICAL);
//gtk_container_set_border_width (GTK_CONTAINER(content_grid), SPACING_MEDIUM);
gtk_widget_set_margin_start(content_grid, SPACING_SMALL);
gtk_widget_set_margin_left(content_grid, SPACING_SMALL);
gtk_paned_pack2 (GTK_PANED(hpaned), content_grid, FALSE, FALSE);
hgrid = gtk_grid_new ();
......
......@@ -704,7 +704,7 @@ gint w, h, row;
gtk_grid_set_row_spacing (GTK_GRID (table), SPACING_SMALL);
gtk_grid_set_column_spacing (GTK_GRID (table), SPACING_MEDIUM);
//gtk_box_pack_start (GTK_BOX (mainbox), table, FALSE, FALSE, 0);
gtk_widget_set_margin_end(table, SPACING_SMALL);
gtk_widget_set_margin_right(table, SPACING_SMALL);
gtk_paned_pack1 (GTK_PANED(hpaned), table, FALSE, FALSE);
row = 0;
......@@ -733,7 +733,7 @@ gint w, h, row;
gtk_grid_set_row_spacing (GTK_GRID (content_grid), SPACING_LARGE);
gtk_orientable_set_orientation(GTK_ORIENTABLE(content_grid), GTK_ORIENTATION_VERTICAL);
//gtk_container_set_border_width (GTK_CONTAINER(content_grid), SPACING_MEDIUM);
gtk_widget_set_margin_start(content_grid, SPACING_SMALL);
gtk_widget_set_margin_left(content_grid, SPACING_SMALL);
gtk_paned_pack2 (GTK_PANED(hpaned), content_grid, FALSE, FALSE);
// group :: Condition
......
......@@ -1011,7 +1011,7 @@ gint crow, row;
/* left area */
//list
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_set_margin_end(vbox, SPACING_SMALL);
gtk_widget_set_margin_right(vbox, SPACING_SMALL);
gtk_paned_pack1 (GTK_PANED(hpaned), vbox, TRUE, FALSE);
scrollwin = gtk_scrolled_window_new(NULL,NULL);
......@@ -1056,7 +1056,7 @@ gint crow, row;
gtk_grid_set_row_spacing (GTK_GRID (content_grid), SPACING_LARGE);
gtk_orientable_set_orientation(GTK_ORIENTABLE(content_grid), GTK_ORIENTATION_VERTICAL);
//gtk_container_set_border_width (GTK_CONTAINER(content_grid), SPACING_MEDIUM);
gtk_widget_set_margin_start(content_grid, SPACING_SMALL);
gtk_widget_set_margin_left(content_grid, SPACING_SMALL);
gtk_paned_pack2 (GTK_PANED(hpaned), content_grid, FALSE, FALSE);
crow = 0;
......
......@@ -2094,7 +2094,7 @@ GtkWidget *hbox, *vbox, *sw, *widget, *notebook, *page, *ebox, *image, *label;
gtk_widget_show (hbox);
label = gtk_label_new (NULL);
gtk_widget_set_margin_start(label, SPACING_MEDIUM);
gtk_widget_set_margin_left(label, SPACING_MEDIUM);
gimp_label_set_attributes (GTK_LABEL (label),
PANGO_ATTR_SCALE, PANGO_SCALE_XX_LARGE,
PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
......
......@@ -477,8 +477,8 @@ gint row, i;
gtk_grid_attach (GTK_GRID (table), label, 3, row, 1, 1);
widget = gtk_label_new(NULL);
gtk_widget_set_halign (widget, GTK_ALIGN_END);
gtk_widget_set_margin_start(widget, 20);
gtk_widget_set_margin_end(widget, 20);
gtk_widget_set_margin_left(widget, 20);
gtk_widget_set_margin_right(widget, 20);
data.LB_remain = widget;
gtk_grid_attach (GTK_GRID (table), widget, 4, row, 1, 1);
......@@ -492,8 +492,8 @@ gint row, i;
gtk_grid_attach (GTK_GRID (table), label, 3, row, 1, 1);
widget = gtk_label_new(NULL);
gtk_widget_set_halign (widget, GTK_ALIGN_END);
gtk_widget_set_margin_start(widget, 20);
gtk_widget_set_margin_end(widget, 20);
gtk_widget_set_margin_left(widget, 20);
gtk_widget_set_margin_right(widget, 20);
data.LB_txnamount = widget;
gtk_grid_attach (GTK_GRID (table), widget, 4, row, 1, 1);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment