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

[Alberts Muktupāvels]

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 ());

Could you use variable here? To not call gdk_display_get_default() 3 times...

>  	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 would remove WINDOW_MENU_DBUSMENU_GET_PRIVATE, and just use window_menu_dbusmenu_get_instance_private where it is needed. Also using WINDOW_MENU_DBUSMENU(o) might not be needed.

>  
>  /* Prototypes */
>  
> 
> === modified file 'src/window-menu-model.c'
> --- src/window-menu-model.c	2015-06-01 17:44:45 +0000
> +++ src/window-menu-model.c	2020-02-24 10:44:20 +0000
> @@ -48,7 +48,7 @@
>  };
>  
>  #define WINDOW_MENU_MODEL_GET_PRIVATE(o) \
> -(G_TYPE_INSTANCE_GET_PRIVATE ((o), WINDOW_MENU_MODEL_TYPE, WindowMenuModelPrivate))
> +(window_menu_model_get_instance_private (WINDOW_MENU_MODEL(o)))

Same thing, remove WINDOW_MENU_MODEL_GET_PRIVATE and use window_menu_model_get_instance_private.

>  
>  /* Base class stuff */
>  static void                window_menu_model_class_init (WindowMenuModelClass *klass);


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