← Back to branch summary

~noskcaj/ubuntu/trusty/xfwm4/4.11

« back to all changes in this revision

Viewing changes to settings-dialogs/xfwm4-workspace-dialog.glade

  • Committer: Jackson Doak
  • Date: 2014-01-19 09:03:46 UTC
  • mfrom: (3.1.12 experimental)
  • Revision ID: noskcaj@ubuntu.com-20140119090346-e7kv45dk1sa3guvq
* Merge from Debian unstable.  Remaining changes:
  - debian/control: demote xfwm4-themes from Recommends to Suggests, per
    the 'other-p-xubuntu-cleanthemes' spec.
  - Add patch from XFCE bugzilla to fix fullscreen behavior with Qt
    based apps 

Show diffs side-by-side

added added

removed removed

Lines of Context:
settings-dialogs/xfwm4-workspace-dialog.glade
265
265
                          <packing>
266
266
                            <property name="top_attach">1</property>
267
267
                            <property name="bottom_attach">2</property>
268
 
                            <property name="x_options"></property>
269
 
                            <property name="y_options"></property>
 
268
                            <property name="x_options"/>
 
269
                            <property name="y_options"/>
270
270
                          </packing>
271
271
                        </child>
272
272
                        <child>
285
285
                            <property name="right_attach">2</property>
286
286
                            <property name="top_attach">2</property>
287
287
                            <property name="bottom_attach">3</property>
288
 
                            <property name="x_options"></property>
289
 
                            <property name="y_options"></property>
 
288
                            <property name="x_options"/>
 
289
                            <property name="y_options"/>
290
290
                          </packing>
291
291
                        </child>
292
292
                        <child>
305
305
                            <property name="right_attach">3</property>
306
306
                            <property name="top_attach">1</property>
307
307
                            <property name="bottom_attach">2</property>
308
 
                            <property name="x_options"></property>
309
 
                            <property name="y_options"></property>
 
308
                            <property name="x_options"/>
 
309
                            <property name="y_options"/>
310
310
                          </packing>
311
311
                        </child>
312
312
                        <child>
341
341
                          <packing>
342
342
                            <property name="left_attach">1</property>
343
343
                            <property name="right_attach">2</property>
344
 
                            <property name="x_options"></property>
345
 
                            <property name="y_options"></property>
 
344
                            <property name="x_options"/>
 
345
                            <property name="y_options"/>
346
346
                          </packing>
347
347
                        </child>
348
348
                        <child>
351
351
                        <child>
352
352
                          <placeholder/>
353
353
                        </child>
 
354
                        <child>
 
355
                          <placeholder/>
 
356
                        </child>
 
357
                        <child>
 
358
                          <placeholder/>
 
359
                        </child>
354
360
                      </object>
355
361
                    </child>
356
362
                  </object>