← Back to branch summary

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

« back to all changes in this revision

Viewing changes to blueman/gui/manager/ManagerToolbar.py

  • 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:
blueman/gui/manager/ManagerToolbar.py
 
1
from blueman.Constants import *
1
2
from blueman.Functions import dprint
2
3
from blueman.Sdp import *
 
4
from gi.repository import Gtk
3
5
 
4
6
 
5
7
class ManagerToolbar:
26
28
        self.b_trust.set_homogeneous(False)
27
29
 
28
30
        self.b_trust.props.label = _("Untrust")
29
 
        size = self.b_trust.size_request()
 
31
        size = Gtk.Requisition()
 
32
        (size, nsize) = Gtk.Widget.get_preferred_size(self.b_trust)
30
33
        self.b_trust.props.label = _("Trust")
31
 
        size2 = self.b_trust.size_request()
 
34
        size2 = Gtk.Requisition()
 
35
        (size2, nsize2) = Gtk.Widget.get_preferred_size(self.b_trust)
32
36
 
33
 
        self.b_trust.props.width_request = max(size[0], size2[0])
 
37
        self.b_trust.props.width_request = max(size.width, size2.width)
34
38
 
35
39
        self.b_remove = blueman.Builder.get_object("b_remove")
36
40
        self.b_remove.connect("clicked", self.on_action, self.blueman.remove)