rpms/metacity/devel default-window-icon.patch, NONE, 1.1 mini-window.png, NONE, 1.1 window.png, NONE, 1.1 metacity.spec, 1.217, 1.218

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25176

Modified Files:
	metacity.spec 
Added Files:
	default-window-icon.patch mini-window.png window.png 
Log Message:
Include the default window icon


default-window-icon.patch:
 Makefile.am |    6 ++++--
 ui/ui.c     |   12 ++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

--- NEW FILE default-window-icon.patch ---
--- 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);


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -r1.217 -r1.218
--- metacity.spec	5 Apr 2010 16:46:59 -0000	1.217
+++ metacity.spec	20 Apr 2010 05:13:10 -0000	1.218
@@ -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 tech
 %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 at redhat.com> - 2.30.0-3
+- Include the default window icon
+
 * Mon Apr  5 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.0-2
 - Don't crash on titlebar right-click