← Back to branch summary

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

« back to all changes in this revision

Viewing changes to data/ui/assistant.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/assistant.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="GtkAssistant" id="assistant">
6
6
    <property name="border_width">6</property>
49
49
        <property name="left_padding">12</property>
50
50
        <property name="right_padding">12</property>
51
51
        <child>
52
 
          <object class="GtkVBox" id="vbox1">
 
52
          <object class="GtkBox" id="vbox1">
53
53
            <property name="visible">True</property>
54
54
            <property name="orientation">vertical</property>
55
55
            <property name="spacing">10</property>
79
79
              </packing>
80
80
            </child>
81
81
            <child>
82
 
              <object class="GtkHBox" id="hbox2">
 
82
              <object class="GtkBox" id="hbox2">
 
83
                <property name="orientation">horizontal</property>
83
84
                <property name="visible">True</property>
84
85
                <property name="spacing">4</property>
85
86
                <child>
153
154
        <property name="left_padding">12</property>
154
155
        <property name="right_padding">12</property>
155
156
        <child>
156
 
          <object class="GtkVBox" id="vbox3">
 
157
          <object class="GtkBox" id="vbox3">
157
158
            <property name="visible">True</property>
158
159
            <property name="orientation">vertical</property>
159
160
            <property name="spacing">6</property>
170
171
              </packing>
171
172
            </child>
172
173
            <child>
173
 
              <object class="GtkVBox" id="svcs">
 
174
              <object class="GtkBox" id="svcs">
 
175
                <property name="orientation">vertical</property>
174
176
                <property name="visible">True</property>
175
177
                <child>
176
178
                  <placeholder/>