aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2016-05-02 23:13:28 +0200
committerThomas White <taw@bitwiz.org.uk>2016-05-02 23:13:28 +0200
commitdbd5d93daad41fffd7a81bbe79712024f46f5257 (patch)
treee07ec5fc4da9910f6985572f1af761d98064b203
parentad4109c48275b9e9e011a8b54125e6c93c1de133 (diff)
Fix some deprecated things
-rw-r--r--src/pr_clock.c4
-rw-r--r--src/slideshow.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/pr_clock.c b/src/pr_clock.c
index 79b9d15..f48478d 100644
--- a/src/pr_clock.c
+++ b/src/pr_clock.c
@@ -1,7 +1,7 @@
/*
* pr_clock.c
*
- * Copyright © 2013-2014 Thomas White <taw@bitwiz.org.uk>
+ * Copyright © 2013-2016 Thomas White <taw@bitwiz.org.uk>
*
* This file is part of Colloquium.
*
@@ -380,7 +380,7 @@ void open_clock(struct presentation *p)
label = gtk_label_new("Length (mins):");
gtk_label_set_markup(GTK_LABEL(label), "<b>Length (mins):</b>");
- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
+ g_object_set(G_OBJECT(label), "halign", GTK_ALIGN_END, NULL);
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 10);
n->entry = gtk_entry_new();
diff --git a/src/slideshow.c b/src/slideshow.c
index b1287e1..8bcb2f7 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -1,7 +1,7 @@
/*
* slideshow.c
*
- * Copyright © 2013-2015 Thomas White <taw@bitwiz.org.uk>
+ * Copyright © 2013-2016 Thomas White <taw@bitwiz.org.uk>
*
* This file is part of Colloquium.
*
@@ -231,7 +231,8 @@ static gboolean ss_realize_sig(GtkWidget *w, SlideShow *ss)
win = gtk_widget_get_window(w);
- ss->blank_cursor = gdk_cursor_new(GDK_BLANK_CURSOR);
+ ss->blank_cursor = gdk_cursor_new_for_display(gdk_display_get_default(),
+ GDK_BLANK_CURSOR);
gdk_window_set_cursor(GDK_WINDOW(win), ss->blank_cursor);
gtk_window_parse_geometry(GTK_WINDOW(w), ss->geom);