Merge lp:~osomon/libindicator/bionic-ftbfs-fix into lp:libindicator

Proposed by Olivier Tilloy on 2018-03-20
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2018-03-21
Approved revision: 539
Merged at revision: 538
Proposed branch: lp:~osomon/libindicator/bionic-ftbfs-fix
Merge into: lp:libindicator
Diff against target: 32 lines (+10/-3)
2 files modified
debian/changelog (+7/-0)
libindicator/indicator-ng.c (+3/-3)
To merge this branch: bzr merge lp:~osomon/libindicator/bionic-ftbfs-fix
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2018-03-20 Approve on 2018-03-21
Review via email: mp+341772@code.launchpad.net

Commit message

Fix build failures on bionic [-Werror=incompatible-pointer-types].

To post a comment you must log in.
539. By Olivier Tilloy on 2018-03-21

Add a changelog entry.

Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-12-05 06:34:40 +0000
3+++ debian/changelog 2018-03-21 15:12:06 +0000
4@@ -1,3 +1,10 @@
5+libindicator (16.10.0+18.04.20180321-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Cast GtkWidget to the expected widget type to fix build failures on bionic
8+ [-Werror=incompatible-pointer-types] (LP: #1757261)
9+
10+ -- Olivier Tilloy <olivier.tilloy@canonical.com> Wed, 21 Mar 2018 16:05:52 +0100
11+
12 libindicator (16.10.0+18.04.20171205.1-0ubuntu1) bionic; urgency=medium
13
14 * Drop unnecessary dependency of libindicator3-dev on libindicator-dev
15
16=== modified file 'libindicator/indicator-ng.c'
17--- libindicator/indicator-ng.c 2014-07-16 13:41:25 +0000
18+++ libindicator/indicator-ng.c 2018-03-21 15:12:06 +0000
19@@ -687,10 +687,10 @@
20 static void
21 indicator_ng_init (IndicatorNg *self)
22 {
23- self->entry.label = g_object_ref_sink (gtk_label_new (NULL));
24- self->entry.image = g_object_ref_sink (gtk_image_new ());
25+ self->entry.label = g_object_ref_sink (GTK_LABEL (gtk_label_new (NULL)));
26+ self->entry.image = g_object_ref_sink (GTK_IMAGE (gtk_image_new ()));
27
28- self->entry.menu = g_object_ref_sink (gtk_menu_new ());
29+ self->entry.menu = g_object_ref_sink (GTK_MENU (gtk_menu_new ()));
30
31 g_signal_connect (self->entry.menu, "show", G_CALLBACK (indicator_ng_menu_shown), self);
32 g_signal_connect (self->entry.menu, "hide", G_CALLBACK (indicator_ng_menu_hidden), self);

Subscribers

People subscribed via source and target branches