← Back to branch summary

~ubuntu-branches/ubuntu/vivid/blueman/vivid-proposed

« back to all changes in this revision

Viewing changes to data/ui/services-audio.ui

  • Committer: Package Import Robot
  • Author(s): Artur Rona
  • Date: 2014-12-24 18:33:36 UTC
  • mfrom: (2.3.8 sid)
  • Revision ID: package-import@ubuntu.com-20141224183336-cyb82ot0y8tz8flq
Tags: 1.99~alpha1-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/patches/01_dont_autostart_lxde.patch:
    + Don't autostart the applet in LXDE.
  - debian/patches/03_filemanager_fix.patch:
    + Add support for more filemanagers.
* debian/patches/02_dont_crash_on_non-bluetooth_card.patch:
  - Dropped, no longer applicable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/ui/services-audio.ui
1
1
<?xml version="1.0"?>
2
2
<interface>
3
 
  <requires lib="gtk+" version="2.14"/>
 
3
  <requires lib="gtk+" version="3.0"/>
4
4
  <!-- interface-naming-policy project-wide -->
5
5
  <object class="GtkFrame" id="audio">
6
6
    <property name="border_width">6</property>
12
12
        <property name="top_padding">10</property>
13
13
        <property name="left_padding">12</property>
14
14
        <child>
15
 
          <object class="GtkVBox" id="vbox1">
 
15
          <object class="GtkBox" id="vbox1">
16
16
            <property name="visible">True</property>
17
17
            <property name="orientation">vertical</property>
18
18
            <property name="spacing">4</property>
27
27
                    <property name="top_padding">2</property>
28
28
                    <property name="left_padding">12</property>
29
29
                    <child>
30
 
                      <object class="GtkVBox" id="vbox11">
 
30
                      <object class="GtkBox" id="vbox11">
31
31
                        <property name="visible">True</property>
32
32
                        <property name="orientation">vertical</property>
33
33
                        <child>
92
92
                <property name="yalign">1</property>
93
93
                <property name="yscale">0.10000000149011612</property>
94
94
                <child>
95
 
                  <object class="GtkHBox" id="hbox1">
 
95
                  <object class="GtkBox" id="hbox1">
 
96
                    <property name="orientation">horizontal</property>
96
97
                    <property name="visible">True</property>
97
98
                    <property name="spacing">4</property>
98
99
                    <child>
130
131
      </object>
131
132
    </child>
132
133
    <child type="label">
133
 
      <object class="GtkHBox" id="hbox4">
 
134
      <object class="GtkBox" id="hbox4">
 
135
        <property name="orientation">horizontal</property>
134
136
        <property name="visible">True</property>
135
137
        <property name="spacing">6</property>
136
138
        <child>