diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2014-12-26 21:55:47 +0000 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2014-12-26 21:55:47 +0000 |
| commit | 6ba97ba49e60fb3c2a7586f149891bc8609abf1f (patch) | |
| tree | 598cc410e16325e47f46320f4b21d7c5a0a28540 | |
| parent | 33970b089f8c17a1fd4e505a69b84aa1796a0db8 (diff) | |
Fix some warnings
| -rw-r--r-- | src/colloquium.c | 1 | ||||
| -rw-r--r-- | src/notes.c | 2 | ||||
| -rw-r--r-- | src/render.c | 2 | ||||
| -rw-r--r-- | src/wrap.c | 10 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/colloquium.c b/src/colloquium.c index 588aea8..188b1bd 100644 --- a/src/colloquium.c +++ b/src/colloquium.c @@ -313,7 +313,6 @@ static Colloquium *colloquium_new() { Colloquium *app; - g_type_init(); g_set_application_name("Colloquium"); app = g_object_new(colloquium_get_type(), "application-id", "uk.org.bitwiz.Colloquium", diff --git a/src/notes.c b/src/notes.c index 6ec0773..6f05707 100644 --- a/src/notes.c +++ b/src/notes.c @@ -121,7 +121,7 @@ struct notes *open_notes(SlideWindow *sw, struct slide *slide) n->v = gtk_text_view_new(); desc = pango_font_description_from_string("Sans 24"); - gtk_widget_modify_font(n->v, desc); + gtk_widget_override_font(n->v, desc); pango_font_description_free(desc); gtk_text_view_set_left_margin(GTK_TEXT_VIEW(n->v), 30); gtk_text_view_set_right_margin(GTK_TEXT_VIEW(n->v), 30); diff --git a/src/render.c b/src/render.c index 3822ec7..cacbc54 100644 --- a/src/render.c +++ b/src/render.c @@ -108,7 +108,7 @@ static void render_image_box(cairo_t *cr, struct wrap_box *box, ImageStore *is, } -static void draw_outline(cairo_t *cr, struct wrap_box *box) +static void UNUSED draw_outline(cairo_t *cr, struct wrap_box *box) { double asc, desc; @@ -409,7 +409,8 @@ static enum wrap_box_space space(struct wrap_line *boxes, int i) } -static void distribute_spaces(struct wrap_line *line, double l, double rho) +static void UNUSED distribute_spaces(struct wrap_line *line, double l, + double rho) { int i; double L, Y, Z, r; @@ -506,8 +507,9 @@ static void output(int a, int i, int *p, struct frame *fr, * Practice and Experience 11 (1981) p1119-1184. Despite the name, it's * supposed to work as well as the full TeX algorithm in almost all of the cases * that we care about here. */ -static void knuth_suboptimal_fit(struct wrap_line *boxes, double line_length, - struct frame *fr, double rho) +static void UNUSED knuth_suboptimal_fit(struct wrap_line *boxes, + double line_length, struct frame *fr, + double rho) { int a = 0; int *p; @@ -841,7 +843,7 @@ int wrap_contents(struct frame *fr) { struct wrap_line *para; int i, eop = 0; - const double rho = 2.0; + //const double rho = 2.0; const double wrap_w = fr->w - fr->pad_l - fr->pad_r; /* Clear lines */ |