[Merge] lp:~khurshid-alam/indicator-appmenu/ignore-desktop-focal into lp:indicator-appmenu

[Dmitry Shachnev]

Review: Approve

Thanks! It mostly looks good to me, and I can include it in my indicator-appmenu upload. I have left one inline comment — if you fix it, it will be even better.

Also do you know if we can revert https://bazaar.launchpad.net/~indicator-applet-developers/indicator-appmenu/trunk.16.10/revision/282 now?

Diff comments:

> 
> === modified file 'src/window-menu-dbusmenu.c'
> --- src/window-menu-dbusmenu.c	2015-06-01 17:44:45 +0000
> +++ src/window-menu-dbusmenu.c	2020-02-24 10:44:20 +0000
> @@ -617,14 +615,14 @@
>  		if (children != NULL) {
>  			gpointer * data = g_new(gpointer, 2);
>  			data[0] = user_data;
> -			data[1] = g_object_ref(newentry);
> +			data[1] = (DbusmenuMenuitem*)g_object_ref(newentry);
>  
>  			g_signal_connect_data(G_OBJECT(children->data), DBUSMENU_MENUITEM_SIGNAL_REALIZED, G_CALLBACK(menu_child_realized), data, child_realized_data_cleanup, 0);
>  		} else {
>  			/* Menu entry has no children */
>  			gpointer * data = g_new(gpointer, 2);
>  			data[0] = user_data;
> -			data[1] = g_object_ref(newentry);
> +			data[1] = (DbusmenuMenuitem*)g_object_ref(newentry);;

Extra second semicolon.

>  
>  			/* Make sure the menu item gets displayed on the menu bar */
>  			menu_child_realized(NULL, data);


-- 
https://code.launchpad.net/~khurshid-alam/indicator-appmenu/ignore-desktop-focal/+merge/379727
Your team Indicator Applet Developers is subscribed to branch lp:indicator-appmenu.