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

[Khurshid Alam]

* Don't use the deprecated g_type_class_add_private

* Use X11 specific error trap functions

* Do not to track menus for desktop_windows. Fixes LP: #1827411

Bamf somehow not considering desktop window as valid bamf window (see https://paste.ubuntu.com/p/wz32KF7Kqx/). As a result when indicator-appmenu tries to track menu it fails. For now we are ignoring tracking desktop windows in indicator-appmenu.

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

285. By Khurshid Alam on 2019-05-13

Do not to track menus for desktop_windows. Fixes LP:#1827411

[Khurshid Alam (khurshid-alam)]

I figured out what is happening. Before nautilus & nautilus-desktop was the same binary (same for nemo), bamf used to track nautilus for desktop menu. But after the split, the code was never adapted in bamf. But for now, this works.

=== modified file 'src/gdk-get-func.c'
--- src/gdk-get-func.c	2010-10-06 18:43:21 +0000
+++ src/gdk-get-func.c	2019-05-13 16:49:22 +0000
@@ -93,13 +93,13 @@
   
   hints_atom = gdk_x11_get_xatom_by_name_for_display (display, _XA_MOTIF_WM_HINTS);
 
-  gdk_error_trap_push ();
+  gdk_x11_display_error_trap_push (display);
   XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), window,
 		      hints_atom, 0, sizeof (MotifWmHints)/sizeof (long),
 		      False, AnyPropertyType, &type, &format, &nitems,
 		      &bytes_after, &data);
-  gdk_flush ();
-  if ((ret = gdk_error_trap_pop ()))
+  gdk_display_flush (display);
+  if ((ret = gdk_x11_display_error_trap_pop (display)))
     {
       g_warning ("%s: Unable to get hints for %u: Error Code: %d", G_STRFUNC, (guint32)window, ret);
       return NULL;

=== modified file 'src/indicator-appmenu.c'
--- src/indicator-appmenu.c	2015-10-28 15:34:43 +0000
+++ src/indicator-appmenu.c	2019-05-13 16:49:22 +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 ());
 	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;
 }
@@ -1067,7 +1067,7 @@
 		if (menus == NULL) {
 			gchar * uniquename = bamf_window_get_utf8_prop (window, "_GTK_UNIQUE_BUS_NAME");
 
-			if (uniquename != NULL) {
+			if (uniquename != NULL && bamf_window_get_window_type (window) != BAMF_WINDOW_DESKTOP) {
 				BamfApplication * app = bamf_matcher_get_application_for_window(iapp->matcher, window);
 
 				menus = WINDOW_MENU(window_menu_model_new(app, window));

=== modified file 'src/window-menu-dbusmenu.c'
--- src/window-menu-dbusmenu.c	2019-05-13 16:49:22 +0000
+++ src/window-menu-dbusmenu.c	2019-05-13 16:49:22 +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)))
 
 /* Prototypes */
 
@@ -81,7 +81,7 @@
 static void             entry_restore    (WindowMenu * wm, IndicatorObjectEntry * entry);
 static void             entry_activate   (WindowMenu * wm, IndicatorObjectEntry * entry, guint timestamp);
 
-G_DEFINE_TYPE (WindowMenuDbusmenu, window_menu_dbusmenu, WINDOW_MENU_TYPE);
+G_DEFINE_TYPE_WITH_PRIVATE (WindowMenuDbusmenu, window_menu_dbusmenu, WINDOW_MENU_TYPE);
 
 /* Build the one-time class */
 static void
@@ -89,8 +89,6 @@
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	g_type_class_add_private (klass, sizeof (WindowMenuDbusmenuPrivate));
-
 	object_class->dispose = window_menu_dbusmenu_dispose;
 
 	WindowMenuClass * menu_class = WINDOW_MENU_CLASS(klass);

=== modified file 'src/window-menu-model.c'
--- src/window-menu-model.c	2019-05-13 16:49:22 +0000
+++ src/window-menu-model.c	2019-05-13 16:49:22 +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)))
 
 /* Base class stuff */
 static void                window_menu_model_class_init (WindowMenuModelClass *klass);
@@ -64,7 +64,7 @@
 static guint               get_xid                      (WindowMenu * wm);
 
 /* GLib boilerplate */
-G_DEFINE_TYPE (WindowMenuModel, window_menu_model, WINDOW_MENU_TYPE);
+G_DEFINE_TYPE_WITH_PRIVATE (WindowMenuModel, window_menu_model, WINDOW_MENU_TYPE);
 
 /* Prefixes to the action muxer */
 #define ACTION_MUX_PREFIX_APP   "app"
@@ -79,8 +79,6 @@
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	g_type_class_add_private (klass, sizeof (WindowMenuModelPrivate));
-
 	object_class->dispose = window_menu_model_dispose;
 
 	WindowMenuClass * wm_class = WINDOW_MENU_CLASS(klass);

=== modified file 'src/window-menu.c'
--- src/window-menu.c	2015-06-03 23:10:07 +0000
+++ src/window-menu.c	2019-05-13 16:49:22 +0000
@@ -24,8 +24,6 @@
 #include "window-menu.h"
 #include "indicator-appmenu-marshal.h"
 
-#define WINDOW_MENU_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), WINDOW_MENU_TYPE, WindowMenuPrivate))
 
 /* Signals */