This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2006-02-08 16:07:42 UTC freetz <freetz@pld-linux.org> '- 2.12.3'
Delete:
    metacity-am15.patch
    metacity-disable-prevention-focus-stealing-logic.patch
    metacity-xsession.desktop

diff --git a/metacity-am15.patch b/metacity-am15.patch
deleted file mode 100644 (file)
index 9bd6a4e..0000000
--- a/metacity-am15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- metacity-2.3.233/src/Makefile.am~  Fri May  3 18:44:39 2002
-+++ metacity-2.3.233/src/Makefile.am   Fri May  3 18:44:39 2002
-@@ -106,7 +106,7 @@
- VARIABLES=default_icon_data $(srcdir)/default_icon.png
- 
- BUILT_SOURCES = inlinepixbufs.h
--CLEANFILES += inlinepixbufs.h
-+CLEANFILES = inlinepixbufs.h
- 
- inlinepixbufs.h: $(IMAGES)
-          $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h

diff --git a/metacity-disable-prevention-focus-stealing-logic.patch b/metacity-disable-prevention-focus-stealing-logic.patch
deleted file mode 100644 (file)
index fbdeb89..0000000
--- a/metacity-disable-prevention-focus-stealing-logic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -p -u -r1.333 window.c
---- src/window.c       31 Jul 2004 21:26:05 -0000      1.333
-+++ src/window.c       4 Aug 2004 15:55:42 -0000
-@@ -1619,6 +1619,11 @@ window_takes_focus_on_map (MetaWindow *w
-     case META_WINDOW_NORMAL:
-     case META_WINDOW_DIALOG:
-     case META_WINDOW_MODAL_DIALOG:
-+      /* Don't do focus stealing stuff; lame cop-out while we work on
-+       * fixing http://bugzilla.gnome.org/show_bug.cgi?id=149028
-+       */
-+      return TRUE;
-+
-       if (window->focus_despite_user_time)
-       return TRUE;

diff --git a/metacity-xsession.desktop b/metacity-xsession.desktop
deleted file mode 100644 (file)
index f6da0ea..0000000
--- a/metacity-xsession.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=XSession
-Exec=metacity
-TryExec=metacity
-Name=Metacity
-Comment=A lightweight GTK+2 based window manager
-Comment[nl]=Een lichtgewicht op GTK+2 gebaseerde window manager
-Comment[pl]=Lekki zarządca okien oparty na GTK+2
-Comment[sr]=Лагани менаџер прозора заснован на GTK2
-Comment[sv]=En lättviktig GTK+2-baserad fönsterhanterare
-# vi: encoding=utf-8