1
=== modified file 'tests/platform/linux/test_messaging.py'
2
--- tests/platform/linux/test_messaging.py	2012-01-25 22:42:17 +0000
3
+++ tests/platform/linux/test_messaging.py	2012-02-29 18:58:21 +0000
4
@@ -83,12 +83,7 @@
5
83
        if message_count is not None:
83
        if message_count is not None:
6
84
            mock_indicator.set_property("count", str(message_count))
84
            mock_indicator.set_property("count", str(message_count))
7
85
        else:
85
        else:
14
86
            if message_time is None:
86
            if message_time is not None:
9
87
                mock_time = self.mocker.replace("time.time")
10
88
                mock_time()
11
89
                self.mocker.result(FAKE_TIME2)
12
90
                mock_indicator.set_property_time("time", FAKE_TIME2)
13
91
            else:
15
92
                mock_indicator.set_property_time("time", message_time)
87
                mock_indicator.set_property_time("time", message_time)
16
93
        mock_indicator.set_property("draw-attention", "true")
88
        mock_indicator.set_property("draw-attention", "true")
17
94
        if update_count:
89
        if update_count:
18
95
90
19
=== modified file 'ubuntuone/platform/linux/messaging.py'
20
--- ubuntuone/platform/linux/messaging.py	2012-01-26 18:09:46 +0000
21
+++ ubuntuone/platform/linux/messaging.py	2012-02-29 18:58:21 +0000
22
@@ -21,20 +21,20 @@
23
21
# of them are available, we should fall back to silently discarding
21
# of them are available, we should fall back to silently discarding
24
22
# messages.
22
# messages.
25
23
23
26
24
import dbus
27
25
import subprocess
28
26
import sys
24
import sys
29
27
25
30
28
from time import time
31
29
32
30
indicate = None
26
indicate = None
33
27
glib = None
34
31
if 'gobject' in sys.modules and sys.modules['gobject'] is not None:
28
if 'gobject' in sys.modules and sys.modules['gobject'] is not None:
35
32
    import indicate as pyindicate
29
    import indicate as pyindicate
36
30
    import glib as GLib
37
33
    indicate = pyindicate
31
    indicate = pyindicate
38
32
    glib = GLib
39
34
    using_gi = False
33
    using_gi = False
40
35
else:
34
else:
42
36
    from gi.repository import Indicate
35
    from gi.repository import Indicate, GLib
43
37
    indicate = Indicate
36
    indicate = Indicate
44
37
    glib = GLib
45
38
    using_gi = True
38
    using_gi = True
46
39
39
47
40
DBUS_BUS_NAME = 'com.ubuntuone.controlpanel.gui'
40
DBUS_BUS_NAME = 'com.ubuntuone.controlpanel.gui'
48
@@ -43,34 +43,15 @@
49
43
TRANSLATION_DOMAIN = 'ubuntuone-control-panel'
43
TRANSLATION_DOMAIN = 'ubuntuone-control-panel'
50
44
44
51
45
from ubuntuone.status.messaging import AbstractMessaging
45
from ubuntuone.status.messaging import AbstractMessaging
56
46
from ubuntuone.status.logger import logger
46
57
47
47
54
48
55
49
# pylint: disable=W0613
58
50
def open_volumes():
48
def open_volumes():
59
51
    """Open the control panel to the shares tab."""
49
    """Open the control panel to the shares tab."""
78
52
    bus = dbus.SessionBus()
50
    _server_callback(None)
61
53
    obj = bus.get_object(DBUS_BUS_NAME, DBUS_PATH)
62
54
    service = dbus.Interface(obj, dbus_interface=DBUS_IFACE_GUI)
63
55
64
56
    def error_handler(*args, **kwargs):
65
57
        """Log errors when calling D-Bus methods in a async way."""
66
58
        logger.error(
67
59
            'Dbus call to com.ubuntuone.controlpanel.gui failed: %r %r', args,
68
60
            kwargs)
69
61
70
62
    def reply_handler(*args, **kwargs):
71
63
        """Exit when done."""
72
64
        pass
73
65
74
66
    service.switch_to_alert(
75
67
        'volumes', True, reply_handler=reply_handler,
76
68
        error_handler=error_handler)
77
69
79
70
51
80
71
def _server_callback(the_indicator, message_time=None):
52
def _server_callback(the_indicator, message_time=None):
81
72
    """Open the control panel to the shares tab."""
53
    """Open the control panel to the shares tab."""
83
73
    subprocess.Popen(['ubuntuone-control-panel-gtk'])
54
    glib.spawn_command_line_async('ubuntuone-installer')
84
74
# pylint: enable=W0613
55
# pylint: enable=W0613
85
75
56
86
76
57
87
@@ -78,6 +59,7 @@
88
78
    """Notification of the end user."""
59
    """Notification of the end user."""
89
79
60
90
80
    def __init__(self, server_callback=_server_callback):
61
    def __init__(self, server_callback=_server_callback):
91
62
        self.server_callback = server_callback
92
81
        self.indicators = []
63
        self.indicators = []
93
82
        if using_gi:
64
        if using_gi:
94
83
            self.server = indicate.Server.ref_default()
65
            self.server = indicate.Server.ref_default()
95
@@ -107,9 +89,8 @@
96
107
        if message_count is not None:
89
        if message_count is not None:
97
108
            indicator.set_property("count", str(message_count))
90
            indicator.set_property("count", str(message_count))
98
109
        else:
91
        else:
102
110
            if message_time is None:
92
            if message_time is not None:
103
111
                message_time = time()
93
                indicator.set_property_time("time", message_time)
101
112
            indicator.set_property_time("time", message_time)
104
113
        indicator.set_property("draw-attention", "true")
94
        indicator.set_property("draw-attention", "true")
105
114
        indicator.show()
95
        indicator.show()
106
115
        self.indicators.append(indicator)
96
        self.indicators.append(indicator)
Reviewer	Date Requested	Status
Natalia Bidart (community)	2012-02-29	Approve on 2012-03-01
Roberto Alsina (community)		Approve on 2012-03-01
Review via email: mp+95237@code.launchpad.net
1	=== modified file 'tests/platform/linux/test_messaging.py'
2	--- tests/platform/linux/test_messaging.py 2012-01-25 22:42:17 +0000
3	+++ tests/platform/linux/test_messaging.py 2012-02-29 18:58:21 +0000
4	@@ -83,12 +83,7 @@
5	83	if message_count is not None:	83	if message_count is not None:
6	84	mock_indicator.set_property("count", str(message_count))	84	mock_indicator.set_property("count", str(message_count))
7	85	else:	85	else:
14	86	if message_time is None:	86	if message_time is not None:
9	87	mock_time = self.mocker.replace("time.time")
10	88	mock_time()
11	89	self.mocker.result(FAKE_TIME2)
12	90	mock_indicator.set_property_time("time", FAKE_TIME2)
13	91	else:
15	92	mock_indicator.set_property_time("time", message_time)	87	mock_indicator.set_property_time("time", message_time)
16	93	mock_indicator.set_property("draw-attention", "true")	88	mock_indicator.set_property("draw-attention", "true")
17	94	if update_count:	89	if update_count:
18	95		90
19	=== modified file 'ubuntuone/platform/linux/messaging.py'
20	--- ubuntuone/platform/linux/messaging.py 2012-01-26 18:09:46 +0000
21	+++ ubuntuone/platform/linux/messaging.py 2012-02-29 18:58:21 +0000
22	@@ -21,20 +21,20 @@
23	21	# of them are available, we should fall back to silently discarding	21	# of them are available, we should fall back to silently discarding
24	22	# messages.	22	# messages.
25	23		23
26	24	import dbus
27	25	import subprocess
28	26	import sys	24	import sys
29	27		25
30	28	from time import time
31	29
32	30	indicate = None	26	indicate = None
33			27	glib = None
34	31	if 'gobject' in sys.modules and sys.modules['gobject'] is not None:	28	if 'gobject' in sys.modules and sys.modules['gobject'] is not None:
35	32	import indicate as pyindicate	29	import indicate as pyindicate
36			30	import glib as GLib
37	33	indicate = pyindicate	31	indicate = pyindicate
38			32	glib = GLib
39	34	using_gi = False	33	using_gi = False
40	35	else:	34	else:
42	36	from gi.repository import Indicate	35	from gi.repository import Indicate, GLib
43	37	indicate = Indicate	36	indicate = Indicate
44			37	glib = GLib
45	38	using_gi = True	38	using_gi = True
46	39		39
47	40	DBUS_BUS_NAME = 'com.ubuntuone.controlpanel.gui'	40	DBUS_BUS_NAME = 'com.ubuntuone.controlpanel.gui'
48	@@ -43,34 +43,15 @@
49	43	TRANSLATION_DOMAIN = 'ubuntuone-control-panel'	43	TRANSLATION_DOMAIN = 'ubuntuone-control-panel'
50	44		44
51	45	from ubuntuone.status.messaging import AbstractMessaging	45	from ubuntuone.status.messaging import AbstractMessaging
56	46	from ubuntuone.status.logger import logger	46
57	47		47
54	48
55	49	# pylint: disable=W0613
58	50	def open_volumes():	48	def open_volumes():
59	51	"""Open the control panel to the shares tab."""	49	"""Open the control panel to the shares tab."""
78	52	bus = dbus.SessionBus()	50	_server_callback(None)
61	53	obj = bus.get_object(DBUS_BUS_NAME, DBUS_PATH)
62	54	service = dbus.Interface(obj, dbus_interface=DBUS_IFACE_GUI)
63	55
64	56	def error_handler(args, *kwargs):
65	57	"""Log errors when calling D-Bus methods in a async way."""
66	58	logger.error(
67	59	'Dbus call to com.ubuntuone.controlpanel.gui failed: %r %r', args,
68	60	kwargs)
69	61
70	62	def reply_handler(args, *kwargs):
71	63	"""Exit when done."""
72	64	pass
73	65
74	66	service.switch_to_alert(
75	67	'volumes', True, reply_handler=reply_handler,
76	68	error_handler=error_handler)
77	69
79	70		51
80	71	def _server_callback(the_indicator, message_time=None):	52	def _server_callback(the_indicator, message_time=None):
81	72	"""Open the control panel to the shares tab."""	53	"""Open the control panel to the shares tab."""
83	73	subprocess.Popen(['ubuntuone-control-panel-gtk'])	54	glib.spawn_command_line_async('ubuntuone-installer')
84	74	# pylint: enable=W0613	55	# pylint: enable=W0613
85	75		56
86	76		57
87	@@ -78,6 +59,7 @@
88	78	"""Notification of the end user."""	59	"""Notification of the end user."""
89	79		60
90	80	def __init__(self, server_callback=_server_callback):	61	def __init__(self, server_callback=_server_callback):
91			62	self.server_callback = server_callback
92	81	self.indicators = []	63	self.indicators = []
93	82	if using_gi:	64	if using_gi:
94	83	self.server = indicate.Server.ref_default()	65	self.server = indicate.Server.ref_default()
95	@@ -107,9 +89,8 @@
96	107	if message_count is not None:	89	if message_count is not None:
97	108	indicator.set_property("count", str(message_count))	90	indicator.set_property("count", str(message_count))
98	109	else:	91	else:
102	110	if message_time is None:	92	if message_time is not None:
103	111	message_time = time()	93	indicator.set_property_time("time", message_time)
101	112	indicator.set_property_time("time", message_time)
104	113	indicator.set_property("draw-attention", "true")	94	indicator.set_property("draw-attention", "true")
105	114	indicator.show()	95	indicator.show()
106	115	self.indicators.append(indicator)	96	self.indicators.append(indicator)