Merge lp:~mc-return/compiz/compiz.merge-fix1075584-workspacenames-default-values-missing into lp:compiz/0.9.9

[MC Return]

Workspacenames:
Added a default of 4 desktops and default names Viewport 1-4 to
workspacenames.xml.in.
(LP: #1075584)

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'plugins/workspacenames/workspacenames.xml.in'
--- plugins/workspacenames/workspacenames.xml.in	2012-10-15 10:31:51 +0000
+++ plugins/workspacenames/workspacenames.xml.in	2012-11-06 19:36:22 +0000
@@ -25,11 +25,23 @@
 						<type>int</type>
 						<min>1</min>
 						<max>50</max>
+						<default>
+							<value>1</value>
+							<value>2</value>
+							<value>3</value>
+							<value>4</value>
+						</default>
 					</option>
 					<option name="names" type="list">
 						<_short>Name</_short>
 						<_long>Viewport name</_long>
 						<type>string</type>
+						<default>
+							<value>Viewport 1</value>
+							<value>Viewport 2</value>
+							<value>Viewport 3</value>
+							<value>Viewport 4</value>
+						</default>
 					</option>
 				</subgroup>
 			</group>