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

[Olivier Tilloy]

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

[lp:~osomon/libindicator/bionic-ftbfs-fix]

539. By Olivier Tilloy on 2018-03-21

Add a changelog entry.

[Marco Trevisan (Treviño) (3v1n0)]

Thanks

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-12-05 06:34:40 +0000
+++ debian/changelog	2018-03-21 15:12:06 +0000
@@ -1,3 +1,10 @@
+libindicator (16.10.0+18.04.20180321-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Cast GtkWidget to the expected widget type to fix build failures on bionic
+    [-Werror=incompatible-pointer-types] (LP: #1757261)
+
+ -- Olivier Tilloy <[e-mail]>  Wed, 21 Mar 2018 16:05:52 +0100
+
 libindicator (16.10.0+18.04.20171205.1-0ubuntu1) bionic; urgency=medium
 
   * Drop unnecessary dependency of libindicator3-dev on libindicator-dev
 
=== modified file 'libindicator/indicator-ng.c'
--- libindicator/indicator-ng.c	2014-07-16 13:41:25 +0000
+++ libindicator/indicator-ng.c	2018-03-21 15:12:06 +0000
@@ -687,10 +687,10 @@
 static void
 indicator_ng_init (IndicatorNg *self)
 {
-  self->entry.label = g_object_ref_sink (gtk_label_new (NULL));
-  self->entry.image = g_object_ref_sink (gtk_image_new ());
+  self->entry.label = g_object_ref_sink (GTK_LABEL (gtk_label_new (NULL)));
+  self->entry.image = g_object_ref_sink (GTK_IMAGE (gtk_image_new ()));
 
-  self->entry.menu = g_object_ref_sink (gtk_menu_new ());
+  self->entry.menu = g_object_ref_sink (GTK_MENU (gtk_menu_new ()));
 
   g_signal_connect (self->entry.menu, "show", G_CALLBACK (indicator_ng_menu_shown), self);
   g_signal_connect (self->entry.menu, "hide", G_CALLBACK (indicator_ng_menu_hidden), self);