From ca37292633e1f2e456d41f01b8fef79279c0d68d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 20 Apr 2010 05:13:10 +0000
Subject: [PATCH] Include the default window icon

---
 default-window-icon.patch |  45 ++++++++++++++++++++++++++++++++++++++
 metacity.spec             |  13 ++++++++++-
 mini-window.png           | Bin 0 -> 345 bytes
 window.png                | Bin 0 -> 548 bytes
 4 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 default-window-icon.patch
 create mode 100644 mini-window.png
 create mode 100644 window.png

diff --git a/default-window-icon.patch b/default-window-icon.patch
new file mode 100644
index 0000000..b09199d
--- /dev/null
+++ b/default-window-icon.patch
@@ -0,0 +1,45 @@
+--- metacity-2.30.0/src/Makefile.am	2010-04-20 00:56:08.110849725 -0400
++++ hacked2/src/Makefile.am	2010-04-20 01:03:18.002854963 -0400
+@@ -192,10 +192,12 @@
+ install-data-local:
+ endif
+ 
+-IMAGES=stock_maximize.png stock_minimize.png stock_delete.png
++IMAGES=stock_maximize.png stock_minimize.png stock_delete.png window.png mini-window.png
+ VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \
+           stock_minimize_data $(srcdir)/stock_minimize.png \
+-          stock_delete_data $(srcdir)/stock_delete.png
++          stock_delete_data $(srcdir)/stock_delete.png \
++          mini_window_data $(srcdir)/mini-window.png \
++          window_data $(srcdir)/window.png
+ 
+ BUILT_SOURCES = inlinepixbufs.h
+ CLEANFILES = inlinepixbufs.h metacity.desktop metacity-wm.desktop metacity.schemas metacity.schemas.in 50-metacity-desktop-key.xml 50-metacity-key.xml
+--- metacity-2.30.0/src/ui/ui.c	2010-04-20 00:56:08.190599271 -0400
++++ hacked2/src/ui/ui.c	2010-04-20 01:04:24.220853635 -0400
+@@ -588,10 +588,8 @@
+                                                    0,
+                                                    NULL);
+       else
+-          default_icon = gtk_icon_theme_load_icon (theme,
+-                                                   "gtk-missing-image",
+-                                                   META_ICON_WIDTH,
+-                                                   0,
++        default_icon = gdk_pixbuf_new_from_inline (-1, window_data,
++                                                   FALSE,
+                                                    NULL);
+ 
+       g_assert (default_icon);
+@@ -623,10 +621,8 @@
+                                                    0,
+                                                    NULL);
+       else
+-          default_icon = gtk_icon_theme_load_icon (theme,
+-                                                   "gtk-missing-image",
+-                                                   META_MINI_ICON_WIDTH,
+-                                                   0,
++        default_icon = gdk_pixbuf_new_from_inline (-1, mini_window_data,
++                                                   FALSE,
+                                                    NULL);
+ 
+       g_assert (default_icon);
diff --git a/metacity.spec b/metacity.spec
index 4ed457f..d851e33 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -3,7 +3,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.30.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.30/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -42,6 +42,11 @@ Patch26: libs.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=614592
 Patch27: title-click.patch
 
+# default window icon: https://bugzilla.gnome.org/show_bug.cgi?id=616246
+Patch30: default-window-icon.patch
+Source1: window.png
+Source2: mini-window.png
+
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -119,6 +124,9 @@ API. This package exists purely for technical reasons.
 %patch26 -p1 -b .libs
 %patch27 -p1 -b .title-click
 
+%patch30 -p1 -b .window-icon
+cp %{SOURCE1} %{SOURCE2} src/
+
 # force regeneration
 rm src/metacity.schemas
 
@@ -225,6 +233,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Tue Apr 20 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.0-3
+- Include the default window icon
+
 * Mon Apr  5 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.0-2
 - Don't crash on titlebar right-click
 
diff --git a/mini-window.png b/mini-window.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce66be1561fa88dcf8705e345824dd900b6b94a3
GIT binary patch
literal 345
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfv4q;(t<?H@CP635(db&7<Se(8(
z$u^J4P^4vlrBV2T?k!4-7A<rWT;wvv<E7?K#sWsABY_h%!dC_tFfW<%vbcT5p?gOa
z>dG!FEUVgff3~@?k&P772{-wF_J{3%I<2$lx!=CEZToD0hM20KTW^O;z58yJ`j%l?
zvwhlRz5DsREFOod`&A|g9GbLi>ekGE&(3@{W>sTu6gZ*WQX->QEi^|c;)cMcuP$a2
z61h$#y_?P{qRPhoQO3OOmtLc+bTXS}W~P2<ZPr19$PY1s?`}1p47jsGDMoUa>x8{~
kuKnv(J(#ukiDe<ftOYXropNQ*0zJv#>FVdQ&MBb@0JvF#9RL6T

literal 0
HcmV?d00001

diff --git a/window.png b/window.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfbcf38bc2d40ab423cd980fa9a75becc9148a69
GIT binary patch
literal 548
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UV>C6dj$D1FjT2AFf_C<F#G}vHN0S8C^cYUc$L7wU^Rn*LA+qju0R{01Y44~
zy9<y8f}hU2>wy$!fk$L90|U1(2s1Lwnj--cEGuwK2hs{)-2Q9MT%esSo-U3d5r^MS
z+sJjuK%niv%rCAyr@%Qeb6k%E%CMHZ-*>2GbgdCNxY5G;2V2wP-RBn+W?Y((z4@xy
z!F!i>d*9mqyGWet%BS~ATZGPj+jQo@`3h}@hE-}89`yZ8`gOVC`Q@XV{wgncTD4nT
zD#PZ@^Iv}zH_WPGV0itMf#HLMDdP-7L8XgJrcC4gDw3sc`DgA5c7}|-Nel<nzV$MQ
z3u&3h2CVWpeNCm}>CE>#9{uoccw=mGS0UFrRxNZR+rj(Xy$uPmIm;T>ZZ<ai_klB@
z&h?F4!NgNO{sk-@9ih{H+~0KLK3hGfg|T0?@<v|8vf@{@2ZcIr-3=1@(0}0J4sFxM
zQ=C_VPK*D$E`R>yJ`r1Bz^InEMwFx^mZVxG7o`Fz1|tJQ16>0XT_b}K14AnyGPVSA
ltqcszL*2AdH00)|WTsW(*5JnRZ#qx|gQu&X%Q~loCIGac!>9lN

literal 0
HcmV?d00001