applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

power: Fix up the power glade file to minimize merge conflicts

Browse source
This commit is contained in:
Richard Hughes 2012-02-14 12:47:26 +00:00
parent ee36b0df91
commit 0ea3d7dd3c
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
panels/power/power.ui
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.20"/>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkListStore" id="liststore_critical">
<columns>
<!-- column-name name -->
@ -142,9 +142,9 @@
<property name="can_focus">False</property>
<property name="model">liststore_time</property>
<accessibility>
<relation target="label_header_battery" type="labelled-by"/>
<relation target="label7" type="labelled-by"/>
</accessibility>"
<relation type="labelled-by" target="label_header_battery"/>
<relation type="labelled-by" target="label7"/>
</accessibility>
</object>
<packing>
<property name="expand">False</property>
@ -159,9 +159,9 @@
<property name="can_focus">False</property>
<property name="model">liststore_time</property>
<accessibility>
<relation target="label_header_ac" type="labelled-by"/>
<relation target="label7" type="labelled-by"/>
</accessibility>"
<relation type="labelled-by" target="label_header_ac"/>
<relation type="labelled-by" target="label7"/>
</accessibility>
</object>
<packing>
<property name="expand">False</property>
@ -371,8 +371,6 @@
<property name="row_spacing">18</property>
<property name="column_spacing">6</property>
<property name="column_homogeneous">True</property>
<property name="n_rows">1</property>
<property name="n_columns">2</property>
<child>
<placeholder/>
</child>