From 7b120afd5a3c4c1343e98669e502f1bf1c0fa888 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 6 Jan 2008 21:07:50 +0000
Subject: [PATCH] Added patches to fix the Docker size problem. Tuomo confirmed
that the change to using the icon window's class name was a bug.
---
debian/changelog | 5 ++++-
.../105_dockapp-class-from-hint-window.diff | 19 +++++++++++++++++++
debian/patches/213_unkludge-docker.diff | 16 ++++++++++++++++
debian/patches/series | 2 ++
4 files changed, 41 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/105_dockapp-class-from-hint-window.diff
create mode 100644 debian/patches/213_unkludge-docker.diff
diff --git a/debian/changelog b/debian/changelog
index fe60902..869af83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
ion3 (20080103-1) unstable; urgency=low
* New upstream version
+ * Fixed upstream regression which lost dockapp class names
+ (105_dockapp-class-from-hint-window.diff)
+ * Disabled dockapp size kludge for Docker (213_unkludge-docker.diff)
- -- Ben Hutchings <ben@decadent.org.uk> Sun, 06 Jan 2008 01:43:32 +0000
+ --
ion3 (20071109-1) unstable; urgency=low
diff --git a/debian/patches/105_dockapp-class-from-hint-window.diff b/debian/patches/105_dockapp-class-from-hint-window.diff
new file mode 100644
index 0000000..eac4f2d
--- /dev/null
+++ b/debian/patches/105_dockapp-class-from-hint-window.diff
@@ -0,0 +1,19 @@
+--- ion3.orig/ioncore/clientwin.c
++++ ion3/ioncore/clientwin.c
+@@ -509,13 +509,13 @@
+ xwindow_unmanaged_selectinput(win, 0);
+ xwindow_unmanaged_selectinput(icon_win, StructureNotifyMask);
+
+- win=icon_win;
+- attr=icon_attr;
+-
+ /* Copy WM_CLASS as _ION_DOCKAPP_HACK */
+
+ p=xwindow_get_text_property(win, XA_WM_CLASS, &n);
+
++ win=icon_win;
++ attr=icon_attr;
++
+ if(p!=NULL){
+ xwindow_set_text_property(icon_win, ioncore_g.atom_dockapp_hack,
+ (const char **)p, n);
diff --git a/debian/patches/213_unkludge-docker.diff b/debian/patches/213_unkludge-docker.diff
new file mode 100644
index 0000000..cc38dcb
--- /dev/null
+++ b/debian/patches/213_unkludge-docker.diff
@@ -0,0 +1,16 @@
+--- ion3.orig/etc/cfg_kludges.lua
++++ ion3/etc/cfg_kludges.lua
+@@ -26,6 +26,13 @@
+ min_size = { w = 64, h = 64},
+ }
+
++-- Make an exception for Docker, which sets correct size hints.
++defwinprop{
++ is_dockapp = true,
++ class = "Docker",
++ statusbar = "systray",
++}
++
+
+ -- You might want to enable these if you really must use XMMS.
+ --[[
diff --git a/debian/patches/series b/debian/patches/series
index 40d9a1d..9eef447 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+105_dockapp-class-from-hint-window.diff
201_build-config.diff
205_ion-lock.diff
206_use-x-terminal-emulator.diff
@@ -5,3 +6,4 @@
210_use-cfg_debian_ext.diff
211_add-debian-menu.diff
212_suggest-ion3-doc.diff
+213_unkludge-docker.diff
--
2.39.5