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

Proposed by Martin Wimpress 
Status: Merged
Approved by: Didier Roche
Approved revision: 345
Merged at revision: 345
Proposed branch: lp:~ubuntu-mate-dev/unity-gtk-module/lp1710999
Merge into: lp:unity-gtk-module
Diff against target: 43 lines (+18/-2)
2 files modified
debian/changelog (+7/-0)
src/main.c (+11/-2)
To merge this branch: bzr merge lp:~ubuntu-mate-dev/unity-gtk-module/lp1710999
Reviewer Review Type Date Requested Status
Didier Roche Approve
Review via email: mp+329080@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Didier Roche (didrocks) wrote :

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

Revision history for this message
Martin Wimpress  (flexiondotorg) wrote :

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

Revision history for this message
Didier Roche (didrocks) wrote :

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

review: Approve
346. By Martin Wimpress 

Add changelog.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-06-20 05:49:45 +0000
3+++ debian/changelog 2017-08-16 08:36:51 +0000
4@@ -1,3 +1,10 @@
5+unity-gtk-module (0.0.0+17.10.20170815-0ubuntu1) artful; urgency=medium
6+
7+ * Remove DnD windows from the hijack and always use RGBA visual in
8+ realize. (LP: #1710999)
9+
10+ -- Martin Wimpress <martin.wimpress@ubuntu.com> Tue, 15 Aug 2017 22:14:40 +0100
11+
12 unity-gtk-module (0.0.0+17.04.20170918-0ubuntu1) artful; urgency=medium
13
14 * Rename ubuntu-session systemd target to unity-session to inline with
15
16=== modified file 'src/main.c'
17--- src/main.c 2017-03-10 15:12:56 +0000
18+++ src/main.c 2017-08-16 08:36:51 +0000
19@@ -551,13 +551,22 @@
20 {
21 g_return_if_fail (GTK_IS_WINDOW (widget));
22
23+ GdkScreen *screen = gtk_widget_get_screen(widget);
24+ GdkVisual *visual = gdk_screen_get_rgba_visual(screen);
25+ if (visual)
26+ gtk_widget_set_visual(widget, visual);
27+
28 if (pre_hijacked_window_realize != NULL)
29 (* pre_hijacked_window_realize) (widget);
30
31 #if GTK_MAJOR_VERSION == 3
32- if (!GTK_IS_APPLICATION_WINDOW (widget))
33+ if ((!GTK_IS_APPLICATION_WINDOW (widget))
34+#else
35+ if (1
36 #endif
37- gtk_window_get_window_data (GTK_WINDOW (widget));
38+ &&
39+ !(gtk_window_get_type_hint (GTK_WINDOW (widget)) == GDK_WINDOW_TYPE_HINT_DND))
40+ gtk_window_get_window_data (GTK_WINDOW (widget));
41 }
42
43 static void

Subscribers

People subscribed via source and target branches