1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
|
From ed98714cb111d2befbeebbfceeeb60fcf8dcdc1d Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@gentoo.org>
Date: Sun, 15 Jan 2012 16:13:38 +0530
Subject: [PATCH 1/2] Port im-status python plugin to Gio/GDBus
Also drop Gossip support since it's a dead project with no way to test for it.
---
plugins/im-status/im-status.py | 157 ++++++++++++++--------------------------
1 files changed, 53 insertions(+), 104 deletions(-)
diff --git a/plugins/im-status/im-status.py b/plugins/im-status/im-status.py
index 17bcb2d..6bb5b89 100644
--- a/plugins/im-status/im-status.py
+++ b/plugins/im-status/im-status.py
@@ -2,6 +2,7 @@
# vim: set et sw=2:
#
# Copyright (C) 2007-2008 - Vincent Untz
+# Copyright (C) 2012 - Nirbheek Chauhan <nirbheek@gentoo.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,19 +27,10 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
import rb
-from gi.repository import GObject, Peas
+import gi
+from gi.repository import Gio, GLib, GObject, Peas
from gi.repository import RB
-try:
- import dbus
- use_gossip = True
- use_mc5 = True
- use_purple = True
-except ImportError:
- use_gossip = False
- use_mc5 = False
- use_purple = False
-
import gettext
gettext.install('rhythmbox', RB.locale_dir(), unicode=True)
@@ -49,10 +41,6 @@ STREAM_SONG_ARTIST = 'rb:stream-song-artist'
STREAM_SONG_TITLE = 'rb:stream-song-title'
STREAM_SONG_ALBUM = 'rb:stream-song-album'
-GOSSIP_BUS_NAME = 'org.gnome.Gossip'
-GOSSIP_OBJ_PATH = '/org/gnome/Gossip'
-GOSSIP_IFACE_NAME = 'org.gnome.Gossip'
-
PROPERTIES_IFACE_NAME = 'org.freedesktop.DBus.Properties'
MC5_BUS_NAME = 'org.freedesktop.Telepathy.MissionControl5'
MC5_AM_OBJ_PATH = '/org/freedesktop/Telepathy/AccountManager'
@@ -70,6 +58,17 @@ class IMStatusPlugin (GObject.Object, Peas.Activatable):
def __init__ (self):
GObject.Object.__init__ (self)
+ def _init_dbus_proxies(self):
+ self.proxies = {}
+ bus_type = Gio.BusType.SESSION
+ flags = 0
+ iface_info = None
+ # Creating proxies doesn't do any blocking I/O, and never fails
+ self.proxies["purple"] = Gio.DBusProxy.new_for_bus_sync(bus_type, flags, iface_info,
+ PURPLE_BUS_NAME, PURPLE_OBJ_PATH, PURPLE_IFACE_NAME, None)
+ self.proxies["mc5_props"] = Gio.DBusProxy.new_for_bus_sync(bus_type, flags, iface_info,
+ MC5_BUS_NAME, MC5_AM_OBJ_PATH, PROPERTIES_IFACE_NAME, None)
+
def do_activate (self):
shell = self.object
sp = shell.props.shell_player
@@ -85,6 +84,7 @@ class IMStatusPlugin (GObject.Object, Peas.Activatable):
self.current_title = None
self.current_album = None
+ self._init_dbus_proxies ()
self.save_status ()
if sp.get_playing ():
@@ -185,124 +185,73 @@ class IMStatusPlugin (GObject.Object, Peas.Activatable):
else:
new_status = _(u"♫ Listening to music... ♫")
- self.set_gossip_status (new_status)
self.set_mc5_status (new_status)
self.set_purple_status (new_status)
def save_status (self):
- self.saved_gossip = self.get_gossip_status ()
self.saved_mc5 = self.get_mc5_status ()
self.saved_purple = self.get_purple_status ()
def restore_status (self):
- if self.saved_gossip != None:
- self.set_gossip_status (self.saved_gossip)
if self.saved_mc5 != None:
self.set_mc5_status (self.saved_mc5)
if self.saved_purple != None:
self.set_purple_status (self.saved_purple)
- def set_gossip_status (self, new_status):
- if not use_gossip:
- return
-
- try:
- bus = dbus.SessionBus ()
- gossip_obj = bus.get_object (GOSSIP_BUS_NAME, GOSSIP_OBJ_PATH)
- gossip = dbus.Interface (gossip_obj, GOSSIP_IFACE_NAME)
-
- state, status = gossip.GetPresence ("")
- gossip.SetPresence (state, new_status)
- except dbus.DBusException:
- pass
-
- def get_gossip_status (self):
- if not use_gossip:
- return
-
- try:
- bus = dbus.SessionBus ()
- gossip_obj = bus.get_object (GOSSIP_BUS_NAME, GOSSIP_OBJ_PATH)
- gossip = dbus.Interface (gossip_obj, GOSSIP_IFACE_NAME)
-
- state, status = gossip.GetPresence ("")
- return status
- except dbus.DBusException:
- return None
-
def set_mc5_status (self, new_status):
- if not use_mc5:
- return
-
try:
- bus = dbus.SessionBus ()
- am_obj = bus.get_object (MC5_BUS_NAME, MC5_AM_OBJ_PATH)
- am = dbus.Interface (am_obj, PROPERTIES_IFACE_NAME)
-
- for acct in am.Get (MC5_AM_IFACE_NAME, "ValidAccounts"):
- acct_obj = bus.get_object (MC5_BUS_NAME, acct)
- acct_iface = dbus.Interface (acct_obj, PROPERTIES_IFACE_NAME)
- status = acct_iface.Get (MC5_ACCT_IFACE_NAME, "RequestedPresence")
- acct_iface.Set (MC5_ACCT_IFACE_NAME, "RequestedPresence", (status[0], status[1], new_status))
-
- except dbus.DBusException, e:
- print "dbus exception while setting status: " + str(e)
-
+ proxy = self.proxies["mc5_props"]
+ for acct_obj_path in proxy.Get("(ss)", MC5_AM_IFACE_NAME, "ValidAccounts"):
+ # Create a new proxy connected to acct_obj_path
+ acct_proxy = Gio.DBusProxy.new_for_bus_sync(Gio.BusType.SESSION, 0, None,
+ MC5_BUS_NAME, acct_obj_path,
+ PROPERTIES_IFACE_NAME, None)
+ # status = (state, status, status_message)
+ status = acct_proxy.Get("(ss)", MC5_ACCT_IFACE_NAME, "RequestedPresence")
+ # Create the (uss) GVariant to set the new status message
+ vstatus = GLib.Variant("(uss)", (status[0], status[1], new_status))
+ # Set the status!
+ acct_proxy.Set("(ssv)", MC5_ACCT_IFACE_NAME, "RequestedPresence", vstatus)
+ except gi._glib.GError as e:
+ print ("GError while setting status: " + str(e))
def get_mc5_status (self):
- if not use_mc5:
- return
-
try:
- bus = dbus.SessionBus ()
- am_obj = bus.get_object (MC5_BUS_NAME, MC5_AM_OBJ_PATH)
- am = dbus.Interface (am_obj, PROPERTIES_IFACE_NAME)
+ proxy = self.proxies["mc5_props"]
got_status = False
-
# a bit awful: this just returns the status text from the first account
# that has one.
- for acct in am.Get (MC5_AM_IFACE_NAME, "ValidAccounts"):
- acct_obj = bus.get_object (MC5_BUS_NAME, acct)
- acct_iface = dbus.Interface (acct_obj, PROPERTIES_IFACE_NAME)
- status = acct_iface.Get (MC5_ACCT_IFACE_NAME, "RequestedPresence")
+ for acct_obj_path in proxy.Get("(ss)", MC5_AM_IFACE_NAME, "ValidAccounts"):
+ # Create a new proxy connected to acct_obj_path
+ acct_proxy = Gio.DBusProxy.new_for_bus_sync (Gio.BusType.SESSION, 0, None,
+ MC5_BUS_NAME, acct_obj_path,
+ PROPERTIES_IFACE_NAME, None)
+ # Get (state, status, status_message)
+ ret = acct_proxy.Get("(ss)", MC5_ACCT_IFACE_NAME, "RequestedPresence")
got_status = True
- if status[2] != "":
- return status[2]
-
+ if ret[2] != "":
+ return ret[2]
# if all accounts have empty status, return that
if got_status:
return ""
- except dbus.DBusException, e:
- print "dbus exception while getting status: " + str(e)
-
+ except gi._glib.GError as e:
+ print ("GError while setting status: " + str(e))
return None
def set_purple_status (self, new_status):
- if not use_purple:
- return
-
try:
- bus = dbus.SessionBus ()
- purple_obj = bus.get_object (PURPLE_BUS_NAME, PURPLE_OBJ_PATH)
- purple = dbus.Interface (purple_obj, PURPLE_IFACE_NAME)
-
- status = purple.PurpleSavedstatusGetCurrent ()
- purple.PurpleSavedstatusSetMessage (status, new_status)
- purple.PurpleSavedstatusActivate (status)
- except dbus.DBusException:
- pass
+ proxy = self.proxies["purple"]
+ status = proxy.PurpleSavedstatusGetCurrent()
+ proxy.PurpleSavedstatusSetMessage("(is)", status, new_status)
+ proxy.PurpleSavedstatusActivate("(i)", status)
+ except gi._glib.GError as e:
+ print ("GError while setting status: " + str(e))
def get_purple_status (self):
- if not use_purple:
- return
-
try:
- bus = dbus.SessionBus ()
- purple_obj = bus.get_object (PURPLE_BUS_NAME, PURPLE_OBJ_PATH)
- purple = dbus.Interface (purple_obj, PURPLE_IFACE_NAME)
-
- current = purple.PurpleSavedstatusGetCurrent ()
- status = purple.PurpleSavedstatusGetMessage (current)
- return status
- except dbus.DBusException:
- return None
+ proxy = self.proxies["purple"]
+ status = proxy.PurpleSavedstatusGetCurrent()
+ return proxy.PurpleSavedstatusGetMessage("(i)", status)
+ except gi._glib.GError as e:
+ print ("GError while setting status: " + str(e))
+ return None
--
1.7.3.4
|
GitWeb