diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2010-04-20 05:13:10 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2010-04-20 05:13:10 +0000 |
| commit | ca37292633e1f2e456d41f01b8fef79279c0d68d (patch) | |
| tree | 9dbe2cd84f951beacd9b8ce6661cbc2fd9639773 | |
| parent | b3e83cd70d8ac20ed0a47ff146e0324fbedbc481 (diff) | |
| download | metacity-ca37292633e1f2e456d41f01b8fef79279c0d68d.tar.gz metacity-ca37292633e1f2e456d41f01b8fef79279c0d68d.tar.xz metacity-ca37292633e1f2e456d41f01b8fef79279c0d68d.zip | |
Include the default window iconmetacity-2_30_0-3_fc14
| -rw-r--r-- | default-window-icon.patch | 45 | ||||
| -rw-r--r-- | metacity.spec | 13 | ||||
| -rw-r--r-- | mini-window.png | bin | 0 -> 345 bytes | |||
| -rw-r--r-- | window.png | bin | 0 -> 548 bytes |
4 files changed, 57 insertions, 1 deletions
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 Binary files differnew file mode 100644 index 0000000..ce66be1 --- /dev/null +++ b/mini-window.png diff --git a/window.png b/window.png Binary files differnew file mode 100644 index 0000000..cfbcf38 --- /dev/null +++ b/window.png |
