Merge lp:~osomon/libappindicator/bionic-ftbfs-fix into lp:libappindicator/16.10

[Olivier Tilloy]

Fix build failures on bionic,
and update Vcs-* fields in debian/control.

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

Thanks!

review: Approve

=== modified file 'debian/control'
--- debian/control	2017-07-19 11:28:55 +0000
+++ debian/control	2018-03-20 12:43:28 +0000
@@ -36,8 +36,8 @@
 # If you aren't a member of ~indicator-applet-developers but need to upload
 # packaging changes, just go ahead.  ~indicator-applet-developers will notice
 # and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libappindicator/trunk.13.04
-Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.13.04/files
+Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libappindicator/trunk.16.10
+Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.16.10/files
 
 Package: python-appindicator
 Section: python

=== modified file 'docs/reference/Makefile.am'
--- docs/reference/Makefile.am	2013-06-08 04:26:37 +0000
+++ docs/reference/Makefile.am	2018-03-20 12:43:28 +0000
@@ -33,7 +33,7 @@
 DOC_SOURCE_DIR=$(top_srcdir)/src
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=--nogtkinit --type-init-func="g_type_init()"
+SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"

=== modified file 'src/app-indicator.c'
--- src/app-indicator.c	2017-02-15 14:10:41 +0000
+++ src/app-indicator.c	2018-03-20 12:43:28 +0000
@@ -2288,7 +2288,7 @@
 
 	g_return_if_fail (GTK_IS_WIDGET (menuitem));
 
-	priv->sec_activate_target = g_object_ref(G_OBJECT(menuitem));
+	priv->sec_activate_target = g_object_ref(menuitem);
 	priv->sec_activate_enabled = widget_is_menu_child(self, menuitem);
 	g_signal_connect(menuitem, "parent-set", G_CALLBACK(sec_activate_target_parent_changed), self);
 }