Merge lp:~ubuntu-mate-dev/unity-gtk-module/lp1710999 into lp:unity-gtk-module

[Martin Wimpress]

This merge proposal fixes icons that, when dragged, do not have transparent backgrounds. The fix removes DnD windows from the hijack and always uses RGBA visual in realize.

As of 17.10 Ubuntu MATE is the only flavour seeding packages from unity-gtk-module. Even so unity-gtk3-module has been installed and loaded on Ubuntu 17.10 daily (Unity and GNOME3) and Xubuntu 17.10 daily and tested. No regression have been observed.

[Didier Roche (didrocks)]

That makes sense to me, I think the Unity session is still using unity-gtk-module, do you mind giving it a try here?

[Martin Wimpress (flexiondotorg)]

I've updated my Description to make it clear that I have tested Unity and GNOME3 on 17.10.

[Didier Roche (didrocks)]

All good to me, thanks, and sorry for reading wrongly the diff :)

review: Approve

[lp:~ubuntu-mate-dev/unity-gtk-module/lp1710999]

346. By Martin Wimpress on 2017-08-16

Add changelog.

=== modified file 'debian/changelog'
--- debian/changelog	2017-06-20 05:49:45 +0000
+++ debian/changelog	2017-08-16 08:36:51 +0000
@@ -1,3 +1,10 @@
+unity-gtk-module (0.0.0+17.10.20170815-0ubuntu1) artful; urgency=medium
+
+  * Remove DnD windows from the hijack and always use RGBA visual in
+  realize. (LP: #1710999)
+
+ -- Martin Wimpress <[e-mail]>  Tue, 15 Aug 2017 22:14:40 +0100
+
 unity-gtk-module (0.0.0+17.04.20170918-0ubuntu1) artful; urgency=medium
 
   * Rename ubuntu-session systemd target to unity-session to inline with

=== modified file 'src/main.c'
--- src/main.c	2017-03-10 15:12:56 +0000
+++ src/main.c	2017-08-16 08:36:51 +0000
@@ -551,13 +551,22 @@
 {
   g_return_if_fail (GTK_IS_WINDOW (widget));
 
+  GdkScreen *screen = gtk_widget_get_screen(widget);
+  GdkVisual *visual = gdk_screen_get_rgba_visual(screen);
+  if (visual)
+    gtk_widget_set_visual(widget, visual);
+
   if (pre_hijacked_window_realize != NULL)
     (* pre_hijacked_window_realize) (widget);
 
 #if GTK_MAJOR_VERSION == 3
-  if (!GTK_IS_APPLICATION_WINDOW (widget))
+  if ((!GTK_IS_APPLICATION_WINDOW (widget))
+#else
+  if (1
 #endif
-    gtk_window_get_window_data (GTK_WINDOW (widget));
+     &&
+       !(gtk_window_get_type_hint (GTK_WINDOW (widget)) == GDK_WINDOW_TYPE_HINT_DND))
+         gtk_window_get_window_data (GTK_WINDOW (widget));
 }
 
 static void