--- a/ChangeLog	Wed Apr 06 08:25:22 2011 +0000
+++ b/ChangeLog	Wed Apr 06 13:24:28 2011 +0000
@@ -1,3 +1,9 @@
+2011-04-06  Ghee Teo  <[email protected]>
+
+	Fixes bugster#7011893.
+	* base-specs/metacity.spec:
+	* patches/metacity-12-null-workspace-names.diff:
+
 2011-04-06  Dave Lin <[email protected]>
 
 	* specs/SUNWgnome-python26-libs.spec: Removed the dependency 

--- a/base-specs/metacity.spec	Wed Apr 06 08:25:22 2011 +0000
+++ b/base-specs/metacity.spec	Wed Apr 06 13:24:28 2011 +0000
@@ -46,6 +46,8 @@
 Patch10:      metacity-10-gconf.diff
 # date:2010-10-15 owner:erwannc type:bug doo:13711
 Patch11:      metacity-11-unknown-displays.diff
+# date:2011-04-06 owner:gheet type:bug bugster:7011893
+Patch12:      metacity-12-null-workspace-names.diff
 
 
 URL:          http://www.gnome.org
@@ -86,6 +88,7 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 %ifos linux

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/metacity-12-null-workspace-names.diff	Wed Apr 06 13:24:28 2011 +0000
@@ -0,0 +1,30 @@
+diff -urN metacity-2.30.1/src/metacity.schemas.in.in ../SUNWgnome-wm-2.30.1.hacked/metacity-2.30.1/src/metacity.schemas.in.in
+--- metacity-2.30.1/src/metacity.schemas.in.in	2011-04-06 11:29:06.577871582 +0100
++++ ../SUNWgnome-wm-2.30.1.hacked/metacity-2.30.1/src/metacity.schemas.in.in	2011-04-06 11:35:06.597083422 +0100
+@@ -391,6 +391,26 @@
+       <applyto>/apps/metacity/workspace_names/name_14</applyto>
+       <applyto>/apps/metacity/workspace_names/name_15</applyto>
+       <applyto>/apps/metacity/workspace_names/name_16</applyto>
++      <applyto>/apps/metacity/workspace_names/name_17</applyto>
++      <applyto>/apps/metacity/workspace_names/name_18</applyto>
++      <applyto>/apps/metacity/workspace_names/name_19</applyto>
++      <applyto>/apps/metacity/workspace_names/name_20</applyto>
++      <applyto>/apps/metacity/workspace_names/name_21</applyto>
++      <applyto>/apps/metacity/workspace_names/name_22</applyto>
++      <applyto>/apps/metacity/workspace_names/name_23</applyto>
++      <applyto>/apps/metacity/workspace_names/name_24</applyto>
++      <applyto>/apps/metacity/workspace_names/name_25</applyto>
++      <applyto>/apps/metacity/workspace_names/name_26</applyto>
++      <applyto>/apps/metacity/workspace_names/name_27</applyto>
++      <applyto>/apps/metacity/workspace_names/name_28</applyto>
++      <applyto>/apps/metacity/workspace_names/name_29</applyto>
++      <applyto>/apps/metacity/workspace_names/name_30</applyto>
++      <applyto>/apps/metacity/workspace_names/name_31</applyto>
++      <applyto>/apps/metacity/workspace_names/name_32</applyto>
++      <applyto>/apps/metacity/workspace_names/name_33</applyto>
++      <applyto>/apps/metacity/workspace_names/name_34</applyto>
++      <applyto>/apps/metacity/workspace_names/name_35</applyto>
++      <applyto>/apps/metacity/workspace_names/name_36</applyto>
+       <owner>metacity</owner>
+       <type>string</type>
+       <default></default>