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

[Khurshid Alam]

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

Yes. That should be reverted.

Diff comments:

> 
> === modified file 'src/indicator-appmenu.c'
> --- src/indicator-appmenu.c	2015-10-28 15:34:43 +0000
> +++ src/indicator-appmenu.c	2020-02-24 10:44:20 +0000
> @@ -484,14 +484,14 @@
>  	xev.xclient.data.l[3] = 0;
>  	xev.xclient.data.l[4] = 0;
>  
> -	gdk_error_trap_push ();
> +	gdk_x11_display_error_trap_push (gdk_display_get_default ());

Ok.Done

>  	XSendEvent (gdk_x11_get_default_xdisplay (),
>  	            gdk_x11_get_default_root_xwindow (),
>  	            False,
>  	            SubstructureRedirectMask | SubstructureNotifyMask,
>  	            &xev);
> -	gdk_flush ();
> -	gdk_error_trap_pop_ignored ();
> +	gdk_display_flush (gdk_display_get_default ());
> +	gdk_x11_display_error_trap_pop_ignored (gdk_display_get_default ());
>  
>  	return;
>  }
> 
> === 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
> @@ -57,7 +57,7 @@
>  };
>  
>  #define WINDOW_MENU_DBUSMENU_GET_PRIVATE(o) \
> -(G_TYPE_INSTANCE_GET_PRIVATE ((o), WINDOW_MENU_DBUSMENU_TYPE, WindowMenuDbusmenuPrivate))
> +(window_menu_dbusmenu_get_instance_private (WINDOW_MENU_DBUSMENU(o)))

I initially did that way.. but seb128 suggested modifying the macro definaton instead since it involves less code modification perhaps (can't remeber the exact reason). So keeping it as it is.

>  
>  /* Prototypes */
>  
> @@ -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);;

Done.

>  
>  			/* 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.