Docky

Merge lp:~ricotz/docky/use-new-dbus-sharp into lp:docky

  1. use-new-dbus-sharp
  2. Merge into trunk
Proposed by Rico Tzschichholz
Status: Merged
Merged at revision: 1655
Proposed branch: lp:~ricotz/docky/use-new-dbus-sharp
Merge into: lp:docky
Diff against target: 585 lines (+66/-64)
38 files modified
Docky.DBus/Docky.DBus.csproj (+6/-6)
Docky.DBus/Docky.DBus/DBusManager.cs (+2/-2)
Docky.DBus/Docky.DBus/DockManagerDBusItem.cs (+1/-1)
Docky.DBus/Docky.DBus/IDockManagerDBus.cs (+1/-1)
Docky.DBus/Docky.DBus/IDockManagerDBusItem.cs (+1/-1)
Docky.DBus/Docky.DBus/IDockyDBus.cs (+1/-1)
Docky.DBus/Makefile.am (+2/-2)
Docky.Services/Docky.Services.csproj (+6/-6)
Docky.Services/Docky.Services/SystemService.cs (+1/-1)
Docky.Services/Makefile.am (+2/-2)
StandardPlugins/BatteryMonitor/BatteryMonitor.csproj (+3/-3)
StandardPlugins/BatteryMonitor/Makefile.am (+1/-1)
StandardPlugins/BatteryMonitor/src/BatteryMonitorProcItem.cs (+1/-1)
StandardPlugins/NetworkManager/Makefile.am (+2/-2)
StandardPlugins/NetworkManager/NetworkManager.csproj (+6/-6)
StandardPlugins/NetworkManager/src/ConnectionManager.cs (+1/-1)
StandardPlugins/NetworkManager/src/DBusObject.cs (+1/-1)
StandardPlugins/NetworkManager/src/DeviceManager.cs (+1/-1)
StandardPlugins/NetworkManager/src/Interfaces/IAccessPoint.cs (+1/-1)
StandardPlugins/NetworkManager/src/Interfaces/IActiveConnection.cs (+1/-1)
StandardPlugins/NetworkManager/src/Interfaces/IConnectionManager.cs (+1/-1)
StandardPlugins/NetworkManager/src/Interfaces/IDHCP4Config.cs (+1/-1)
StandardPlugins/NetworkManager/src/Interfaces/IIP4Config.cs (+1/-1)
StandardPlugins/NetworkManager/src/Interfaces/INetManager.cs (+1/-1)
StandardPlugins/NetworkManager/src/Interfaces/INetworkConnection.cs (+1/-1)
StandardPlugins/NetworkManager/src/Interfaces/INetworkDevice.cs (+1/-1)
StandardPlugins/NetworkManager/src/Interfaces/IWiredDevice.cs (+1/-1)
StandardPlugins/NetworkManager/src/Interfaces/IWirelessDevice.cs (+1/-1)
StandardPlugins/NetworkManager/src/NetworkConnection.cs (+1/-1)
StandardPlugins/NetworkManager/src/NetworkDevice.cs (+1/-1)
StandardPlugins/NetworkManager/src/NetworkManager.cs (+1/-1)
StandardPlugins/NetworkManager/src/WiredDevice.cs (+1/-1)
StandardPlugins/NetworkManager/src/WirelessDevice.cs (+1/-1)
StandardPlugins/SessionManager/Makefile.am (+1/-1)
StandardPlugins/SessionManager/SessionManager.csproj (+3/-3)
StandardPlugins/SessionManager/src/SessionManagerItem.cs (+1/-1)
StandardPlugins/SessionManager/src/SystemManager.cs (+1/-1)
configure.ac (+6/-4)
To merge this branch: bzr merge lp:~ricotz/docky/use-new-dbus-sharp
Reviewer Review Type Date Requested Status
Rico Tzschichholz Pending
Review via email: mp+38046@code.launchpad.net

Description of the change

Switch to the new actively developed dbus-mono-bindings, dbus-sharp 0.7 and dbus-sharp-glib 0.5

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Docky.DBus/Docky.DBus.csproj'
2--- Docky.DBus/Docky.DBus.csproj 2010-08-06 08:06:53 +0000
3+++ Docky.DBus/Docky.DBus.csproj 2010-10-09 13:54:39 +0000
4@@ -38,12 +38,6 @@
5 <Reference Include="System.Core">
6 <RequiredTargetFramework>3.5</RequiredTargetFramework>
7 </Reference>
8- <Reference Include="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
9- <Package>ndesk-dbus-1.0</Package>
10- </Reference>
11- <Reference Include="NDesk.DBus.GLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
12- <Package>ndesk-dbus-glib-1.0</Package>
13- </Reference>
14 <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
15 <Package>gtk-sharp-2.0</Package>
16 </Reference>
17@@ -56,6 +50,12 @@
18 <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
19 <Package>gio-sharp-2.0</Package>
20 </Reference>
21+ <Reference Include="dbus-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5">
22+ <Package>dbus-sharp-1.0</Package>
23+ </Reference>
24+ <Reference Include="dbus-sharp-glib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5">
25+ <Package>dbus-sharp-glib-1.0</Package>
26+ </Reference>
27 </ItemGroup>
28 <ItemGroup>
29 <Folder Include="Docky.DBus\" />
30
31=== modified file 'Docky.DBus/Docky.DBus/DBusManager.cs'
32--- Docky.DBus/Docky.DBus/DBusManager.cs 2010-08-14 22:25:45 +0000
33+++ Docky.DBus/Docky.DBus/DBusManager.cs 2010-10-09 13:54:39 +0000
34@@ -23,7 +23,7 @@
35 using System.Text.RegularExpressions;
36
37 using org.freedesktop.DBus;
38-using NDesk.DBus;
39+using DBus;
40
41 using Docky.Items;
42 using Docky.Services;
43@@ -173,7 +173,7 @@
44
45 public bool Initialize ()
46 {
47- NDesk.DBus.BusG.Init ();
48+ BusG.Init ();
49
50 Bus bus = Bus.Session;
51
52
53=== modified file 'Docky.DBus/Docky.DBus/DockManagerDBusItem.cs'
54--- Docky.DBus/Docky.DBus/DockManagerDBusItem.cs 2010-08-06 22:37:42 +0000
55+++ Docky.DBus/Docky.DBus/DockManagerDBusItem.cs 2010-10-09 13:54:39 +0000
56@@ -22,7 +22,7 @@
57 using GLib;
58
59 using org.freedesktop.DBus;
60-using NDesk.DBus;
61+using DBus;
62
63 using Docky.Items;
64 using Docky.Menus;
65
66=== modified file 'Docky.DBus/Docky.DBus/IDockManagerDBus.cs'
67--- Docky.DBus/Docky.DBus/IDockManagerDBus.cs 2010-08-06 22:37:42 +0000
68+++ Docky.DBus/Docky.DBus/IDockManagerDBus.cs 2010-10-09 13:54:39 +0000
69@@ -18,7 +18,7 @@
70 using System;
71
72 using org.freedesktop.DBus;
73-using NDesk.DBus;
74+using DBus;
75
76 namespace Docky.DBus
77 {
78
79=== modified file 'Docky.DBus/Docky.DBus/IDockManagerDBusItem.cs'
80--- Docky.DBus/Docky.DBus/IDockManagerDBusItem.cs 2010-08-06 22:37:42 +0000
81+++ Docky.DBus/Docky.DBus/IDockManagerDBusItem.cs 2010-10-09 13:54:39 +0000
82@@ -19,7 +19,7 @@
83 using System.Collections.Generic;
84
85 using org.freedesktop.DBus;
86-using NDesk.DBus;
87+using DBus;
88
89 namespace Docky.DBus
90 {
91
92=== modified file 'Docky.DBus/Docky.DBus/IDockyDBus.cs'
93--- Docky.DBus/Docky.DBus/IDockyDBus.cs 2010-05-25 06:04:27 +0000
94+++ Docky.DBus/Docky.DBus/IDockyDBus.cs 2010-10-09 13:54:39 +0000
95@@ -18,7 +18,7 @@
96 using System;
97
98 using org.freedesktop.DBus;
99-using NDesk.DBus;
100+using DBus;
101
102 namespace Docky.DBus
103 {
104
105=== modified file 'Docky.DBus/Makefile.am'
106--- Docky.DBus/Makefile.am 2010-08-06 08:06:53 +0000
107+++ Docky.DBus/Makefile.am 2010-10-09 13:54:39 +0000
108@@ -26,5 +26,5 @@
109 $(GIO_SHARP_LIBS) \
110 $(GTK_SHARP_20_LIBS) \
111 $(WNCK_SHARP_10_LIBS) \
112- $(NDESK_DBUS_10_LIBS) \
113- $(NDESK_DBUS_GLIB_10_LIBS)
114+ $(DBUS_SHARP_10_LIBS) \
115+ $(DBUS_SHARP_GLIB_10_LIBS)
116
117=== modified file 'Docky.Services/Docky.Services.csproj'
118--- Docky.Services/Docky.Services.csproj 2010-08-06 07:49:04 +0000
119+++ Docky.Services/Docky.Services.csproj 2010-10-09 13:54:39 +0000
120@@ -74,12 +74,6 @@
121 <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
122 <Package>glib-sharp-2.0</Package>
123 </Reference>
124- <Reference Include="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
125- <Package>ndesk-dbus-1.0</Package>
126- </Reference>
127- <Reference Include="NDesk.DBus.GLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
128- <Package>ndesk-dbus-glib-1.0</Package>
129- </Reference>
130 <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
131 <Package>gio-sharp-2.0</Package>
132 </Reference>
133@@ -87,6 +81,12 @@
134 <Reference Include="wnck-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
135 <Package>wnck-sharp-1.0</Package>
136 </Reference>
137+ <Reference Include="dbus-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5">
138+ <Package>dbus-sharp-1.0</Package>
139+ </Reference>
140+ <Reference Include="dbus-sharp-glib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5">
141+ <Package>dbus-sharp-glib-1.0</Package>
142+ </Reference>
143 </ItemGroup>
144 <ItemGroup>
145 <Compile Include="Docky.Services\PreferencesService.cs" />
146
147=== modified file 'Docky.Services/Docky.Services/SystemService.cs'
148--- Docky.Services/Docky.Services/SystemService.cs 2010-09-23 07:52:26 +0000
149+++ Docky.Services/Docky.Services/SystemService.cs 2010-10-09 13:54:39 +0000
150@@ -29,7 +29,7 @@
151 using Docky.Services.Prefs;
152 using Docky.Services.Applications;
153
154-using NDesk.DBus;
155+using DBus;
156 using org.freedesktop.DBus;
157
158 namespace Docky.Services
159
160=== modified file 'Docky.Services/Makefile.am'
161--- Docky.Services/Makefile.am 2010-08-06 07:59:35 +0000
162+++ Docky.Services/Makefile.am 2010-10-09 13:54:39 +0000
163@@ -60,8 +60,8 @@
164 ICSharpCode.SharpZipLib \
165 $(GIO_SHARP_LIBS) \
166 $(MONO_CAIRO_LIBS) \
167- $(NDESK_DBUS_10_LIBS) \
168- $(NDESK_DBUS_GLIB_10_LIBS) \
169+ $(DBUS_SHARP_10_LIBS) \
170+ $(DBUS_SHARP_GLIB_10_LIBS) \
171 $(GCONF_SHARP_20_LIBS) \
172 $(GTK_SHARP_20_LIBS) \
173 $(GNOME_KEYRING_SHARP_LIBS) \
174
175=== modified file 'StandardPlugins/BatteryMonitor/BatteryMonitor.csproj'
176--- StandardPlugins/BatteryMonitor/BatteryMonitor.csproj 2010-04-11 00:41:58 +0000
177+++ StandardPlugins/BatteryMonitor/BatteryMonitor.csproj 2010-10-09 13:54:39 +0000
178@@ -38,14 +38,14 @@
179 <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
180 <Package>gtk-sharp-2.0</Package>
181 </Reference>
182- <Reference Include="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
183- <Package>ndesk-dbus-1.0</Package>
184- </Reference>
185 <Reference Include="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
186 <Reference Include="System.Core">
187 <RequiredTargetFramework>3.5</RequiredTargetFramework>
188 </Reference>
189 <Reference Include="Mono.Posix" />
190+ <Reference Include="dbus-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5">
191+ <Package>dbus-sharp-1.0</Package>
192+ </Reference>
193 </ItemGroup>
194 <ItemGroup>
195 <Folder Include="src\" />
196
197=== modified file 'StandardPlugins/BatteryMonitor/Makefile.am'
198--- StandardPlugins/BatteryMonitor/Makefile.am 2009-12-11 09:59:30 +0000
199+++ StandardPlugins/BatteryMonitor/Makefile.am 2010-10-09 13:54:39 +0000
200@@ -34,5 +34,5 @@
201 System.Core \
202 Mono.Posix \
203 $(MONO_CAIRO_LIBS) \
204- $(NDESK_DBUS_10_LIBS) \
205+ $(DBUS_SHARP_10_LIBS) \
206 $(GTK_SHARP_20_LIBS)
207
208=== modified file 'StandardPlugins/BatteryMonitor/src/BatteryMonitorProcItem.cs'
209--- StandardPlugins/BatteryMonitor/src/BatteryMonitorProcItem.cs 2010-02-09 08:44:40 +0000
210+++ StandardPlugins/BatteryMonitor/src/BatteryMonitorProcItem.cs 2010-10-09 13:54:39 +0000
211@@ -25,7 +25,7 @@
212 using Gdk;
213 using GLib;
214 using Mono.Unix;
215-using NDesk.DBus;
216+using DBus;
217
218 using Docky.CairoHelper;
219 using Docky.Items;
220
221=== modified file 'StandardPlugins/NetworkManager/Makefile.am'
222--- StandardPlugins/NetworkManager/Makefile.am 2009-12-11 09:59:30 +0000
223+++ StandardPlugins/NetworkManager/Makefile.am 2010-10-09 13:54:39 +0000
224@@ -43,6 +43,6 @@
225 Mono.Posix \
226 $(MONO_CAIRO_LIBS) \
227 $(GLIB_SHARP_20_LIBS) \
228- $(NDESK_DBUS_10_LIBS) \
229- $(NDESK_DBUS_GLIB_10_LIBS) \
230+ $(DBUS_SHARP_10_LIBS) \
231+ $(DBUS_SHARP_GLIB_10_LIBS) \
232 $(GTK_SHARP_20_LIBS)
233
234=== modified file 'StandardPlugins/NetworkManager/NetworkManager.csproj'
235--- StandardPlugins/NetworkManager/NetworkManager.csproj 2010-06-08 08:20:21 +0000
236+++ StandardPlugins/NetworkManager/NetworkManager.csproj 2010-10-09 13:54:39 +0000
237@@ -85,13 +85,13 @@
238 <Reference Include="System.Core">
239 <RequiredTargetFramework>3.5</RequiredTargetFramework>
240 </Reference>
241- <Reference Include="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
242- <Package>ndesk-dbus-1.0</Package>
243- </Reference>
244- <Reference Include="NDesk.DBus.GLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
245- <Package>ndesk-dbus-glib-1.0</Package>
246- </Reference>
247 <Reference Include="Mono.Posix" />
248+ <Reference Include="dbus-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5">
249+ <Package>dbus-sharp-1.0</Package>
250+ </Reference>
251+ <Reference Include="dbus-sharp-glib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5">
252+ <Package>dbus-sharp-glib-1.0</Package>
253+ </Reference>
254 </ItemGroup>
255 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
256 <ItemGroup>
257
258=== modified file 'StandardPlugins/NetworkManager/src/ConnectionManager.cs'
259--- StandardPlugins/NetworkManager/src/ConnectionManager.cs 2010-06-11 19:46:15 +0000
260+++ StandardPlugins/NetworkManager/src/ConnectionManager.cs 2010-10-09 13:54:39 +0000
261@@ -20,7 +20,7 @@
262 using System.Linq;
263 using System.Collections.Generic;
264
265-using NDesk.DBus;
266+using DBus;
267 using org.freedesktop.DBus;
268
269 using Docky.Services;
270
271=== modified file 'StandardPlugins/NetworkManager/src/DBusObject.cs'
272--- StandardPlugins/NetworkManager/src/DBusObject.cs 2009-11-28 21:52:04 +0000
273+++ StandardPlugins/NetworkManager/src/DBusObject.cs 2010-10-09 13:54:39 +0000
274@@ -18,7 +18,7 @@
275 using System;
276 using System.Collections.Generic;
277
278-using NDesk.DBus;
279+using DBus;
280 using org.freedesktop.DBus;
281
282 using Docky.Services;
283
284=== modified file 'StandardPlugins/NetworkManager/src/DeviceManager.cs'
285--- StandardPlugins/NetworkManager/src/DeviceManager.cs 2009-11-27 16:49:40 +0000
286+++ StandardPlugins/NetworkManager/src/DeviceManager.cs 2010-10-09 13:54:39 +0000
287@@ -19,7 +19,7 @@
288 using System.Linq;
289 using System.Collections.Generic;
290
291-using NDesk.DBus;
292+using DBus;
293
294 namespace NetworkManagerDocklet
295 {
296
297=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/IAccessPoint.cs'
298--- StandardPlugins/NetworkManager/src/Interfaces/IAccessPoint.cs 2009-11-25 15:37:53 +0000
299+++ StandardPlugins/NetworkManager/src/Interfaces/IAccessPoint.cs 2010-10-09 13:54:39 +0000
300@@ -17,7 +17,7 @@
301
302 using System;
303
304-using NDesk.DBus;
305+using DBus;
306 using org.freedesktop.DBus;
307
308 namespace NetworkManagerDocklet
309
310=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/IActiveConnection.cs'
311--- StandardPlugins/NetworkManager/src/Interfaces/IActiveConnection.cs 2009-11-25 15:37:53 +0000
312+++ StandardPlugins/NetworkManager/src/Interfaces/IActiveConnection.cs 2010-10-09 13:54:39 +0000
313@@ -17,7 +17,7 @@
314
315 using System;
316
317-using NDesk.DBus;
318+using DBus;
319 using org.freedesktop.DBus;
320
321 namespace NetworkManagerDocklet
322
323=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/IConnectionManager.cs'
324--- StandardPlugins/NetworkManager/src/Interfaces/IConnectionManager.cs 2009-11-25 15:37:53 +0000
325+++ StandardPlugins/NetworkManager/src/Interfaces/IConnectionManager.cs 2010-10-09 13:54:39 +0000
326@@ -17,7 +17,7 @@
327
328 using System;
329
330-using NDesk.DBus;
331+using DBus;
332 using org.freedesktop.DBus;
333
334 namespace NetworkManagerDocklet
335
336=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/IDHCP4Config.cs'
337--- StandardPlugins/NetworkManager/src/Interfaces/IDHCP4Config.cs 2009-11-25 15:37:53 +0000
338+++ StandardPlugins/NetworkManager/src/Interfaces/IDHCP4Config.cs 2010-10-09 13:54:39 +0000
339@@ -17,7 +17,7 @@
340
341 using System;
342
343-using NDesk.DBus;
344+using DBus;
345 using org.freedesktop.DBus;
346
347 namespace NetworkManagerDocklet
348
349=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/IIP4Config.cs'
350--- StandardPlugins/NetworkManager/src/Interfaces/IIP4Config.cs 2009-11-25 15:37:53 +0000
351+++ StandardPlugins/NetworkManager/src/Interfaces/IIP4Config.cs 2010-10-09 13:54:39 +0000
352@@ -17,7 +17,7 @@
353
354 using System;
355
356-using NDesk.DBus;
357+using DBus;
358 using org.freedesktop.DBus;
359
360 namespace NetworkManagerDocklet
361
362=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/INetManager.cs'
363--- StandardPlugins/NetworkManager/src/Interfaces/INetManager.cs 2009-11-25 15:37:53 +0000
364+++ StandardPlugins/NetworkManager/src/Interfaces/INetManager.cs 2010-10-09 13:54:39 +0000
365@@ -17,7 +17,7 @@
366
367 using System;
368
369-using NDesk.DBus;
370+using DBus;
371 using org.freedesktop.DBus;
372
373 namespace NetworkManagerDocklet
374
375=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/INetworkConnection.cs'
376--- StandardPlugins/NetworkManager/src/Interfaces/INetworkConnection.cs 2009-11-25 15:37:53 +0000
377+++ StandardPlugins/NetworkManager/src/Interfaces/INetworkConnection.cs 2010-10-09 13:54:39 +0000
378@@ -18,7 +18,7 @@
379 using System;
380 using System.Collections.Generic;
381
382-using NDesk.DBus;
383+using DBus;
384 using org.freedesktop.DBus;
385
386 namespace NetworkManagerDocklet
387
388=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/INetworkDevice.cs'
389--- StandardPlugins/NetworkManager/src/Interfaces/INetworkDevice.cs 2009-11-25 15:37:53 +0000
390+++ StandardPlugins/NetworkManager/src/Interfaces/INetworkDevice.cs 2010-10-09 13:54:39 +0000
391@@ -17,7 +17,7 @@
392
393 using System;
394
395-using NDesk.DBus;
396+using DBus;
397 using org.freedesktop.DBus;
398
399 namespace NetworkManagerDocklet
400
401=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/IWiredDevice.cs'
402--- StandardPlugins/NetworkManager/src/Interfaces/IWiredDevice.cs 2009-11-25 15:37:53 +0000
403+++ StandardPlugins/NetworkManager/src/Interfaces/IWiredDevice.cs 2010-10-09 13:54:39 +0000
404@@ -17,7 +17,7 @@
405
406 using System;
407
408-using NDesk.DBus;
409+using DBus;
410 using org.freedesktop.DBus;
411
412 namespace NetworkManagerDocklet
413
414=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/IWirelessDevice.cs'
415--- StandardPlugins/NetworkManager/src/Interfaces/IWirelessDevice.cs 2009-11-25 15:37:53 +0000
416+++ StandardPlugins/NetworkManager/src/Interfaces/IWirelessDevice.cs 2010-10-09 13:54:39 +0000
417@@ -17,7 +17,7 @@
418
419 using System;
420
421-using NDesk.DBus;
422+using DBus;
423 using org.freedesktop.DBus;
424
425 namespace NetworkManagerDocklet
426
427=== modified file 'StandardPlugins/NetworkManager/src/NetworkConnection.cs'
428--- StandardPlugins/NetworkManager/src/NetworkConnection.cs 2009-12-03 08:57:52 +0000
429+++ StandardPlugins/NetworkManager/src/NetworkConnection.cs 2010-10-09 13:54:39 +0000
430@@ -18,7 +18,7 @@
431 using System;
432 using System.Collections.Generic;
433
434-using NDesk.DBus;
435+using DBus;
436 using org.freedesktop.DBus;
437
438 namespace NetworkManagerDocklet
439
440=== modified file 'StandardPlugins/NetworkManager/src/NetworkDevice.cs'
441--- StandardPlugins/NetworkManager/src/NetworkDevice.cs 2009-11-27 16:49:40 +0000
442+++ StandardPlugins/NetworkManager/src/NetworkDevice.cs 2010-10-09 13:54:39 +0000
443@@ -21,7 +21,7 @@
444
445 using System.Collections.Generic;
446
447-using NDesk.DBus;
448+using DBus;
449 using org.freedesktop.DBus;
450
451 namespace NetworkManagerDocklet
452
453=== modified file 'StandardPlugins/NetworkManager/src/NetworkManager.cs'
454--- StandardPlugins/NetworkManager/src/NetworkManager.cs 2009-11-25 15:37:53 +0000
455+++ StandardPlugins/NetworkManager/src/NetworkManager.cs 2010-10-09 13:54:39 +0000
456@@ -20,7 +20,7 @@
457 using System.Diagnostics;
458 using System.Collections.Generic;
459
460-using NDesk.DBus;
461+using DBus;
462 using org.freedesktop.DBus;
463
464 namespace NetworkManagerDocklet
465
466=== modified file 'StandardPlugins/NetworkManager/src/WiredDevice.cs'
467--- StandardPlugins/NetworkManager/src/WiredDevice.cs 2009-11-27 16:49:40 +0000
468+++ StandardPlugins/NetworkManager/src/WiredDevice.cs 2010-10-09 13:54:39 +0000
469@@ -19,7 +19,7 @@
470 using System.Collections.Generic;
471 using System.Linq;
472
473-using NDesk.DBus;
474+using DBus;
475 using org.freedesktop.DBus;
476
477 namespace NetworkManagerDocklet
478
479=== modified file 'StandardPlugins/NetworkManager/src/WirelessDevice.cs'
480--- StandardPlugins/NetworkManager/src/WirelessDevice.cs 2009-11-28 21:52:04 +0000
481+++ StandardPlugins/NetworkManager/src/WirelessDevice.cs 2010-10-09 13:54:39 +0000
482@@ -20,7 +20,7 @@
483
484 using System.Collections.Generic;
485
486-using NDesk.DBus;
487+using DBus;
488 using org.freedesktop.DBus;
489
490 namespace NetworkManagerDocklet
491
492=== modified file 'StandardPlugins/SessionManager/Makefile.am'
493--- StandardPlugins/SessionManager/Makefile.am 2010-03-24 18:55:52 +0000
494+++ StandardPlugins/SessionManager/Makefile.am 2010-10-09 13:54:39 +0000
495@@ -23,5 +23,5 @@
496 System.Core \
497 Mono.Posix \
498 $(GIO_SHARP_LIBS) \
499- $(NDESK_DBUS_10_LIBS) \
500+ $(DBUS_SHARP_10_LIBS) \
501 $(GTK_SHARP_20_LIBS)
502
503=== modified file 'StandardPlugins/SessionManager/SessionManager.csproj'
504--- StandardPlugins/SessionManager/SessionManager.csproj 2010-06-01 12:53:24 +0000
505+++ StandardPlugins/SessionManager/SessionManager.csproj 2010-10-09 13:54:39 +0000
506@@ -42,9 +42,6 @@
507 </ItemGroup>
508 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
509 <ItemGroup>
510- <Reference Include="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
511- <Package>ndesk-dbus-1.0</Package>
512- </Reference>
513 <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
514 <Package>gtk-sharp-2.0</Package>
515 </Reference>
516@@ -62,6 +59,9 @@
517 <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
518 <Package>gtk-sharp-2.0</Package>
519 </Reference>
520+ <Reference Include="dbus-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5">
521+ <Package>dbus-sharp-1.0</Package>
522+ </Reference>
523 </ItemGroup>
524 <ItemGroup>
525 <ProjectReference Include="..\..\Docky.Items\Docky.Items.csproj">
526
527=== modified file 'StandardPlugins/SessionManager/src/SessionManagerItem.cs'
528--- StandardPlugins/SessionManager/src/SessionManagerItem.cs 2010-09-25 19:53:37 +0000
529+++ StandardPlugins/SessionManager/src/SessionManagerItem.cs 2010-10-09 13:54:39 +0000
530@@ -19,7 +19,7 @@
531 using System.Collections.Generic;
532 using System.Diagnostics;
533
534-using NDesk.DBus;
535+using DBus;
536 using org.freedesktop.DBus;
537
538 using Gdk;
539
540=== modified file 'StandardPlugins/SessionManager/src/SystemManager.cs'
541--- StandardPlugins/SessionManager/src/SystemManager.cs 2010-06-23 01:34:47 +0000
542+++ StandardPlugins/SessionManager/src/SystemManager.cs 2010-10-09 13:54:39 +0000
543@@ -19,7 +19,7 @@
544 using System.Collections.Generic;
545 using System.Diagnostics;
546
547-using NDesk.DBus;
548+using DBus;
549 using org.freedesktop.DBus;
550
551 using Mono.Unix;
552
553=== modified file 'configure.ac'
554--- configure.ac 2010-09-07 05:26:49 +0000
555+++ configure.ac 2010-10-09 13:54:39 +0000
556@@ -62,6 +62,8 @@
557 GTK_REQUIRED_VERSION=2.14.3
558 GLIB_REQUIRED_VERSION=2.22
559 GIO_SHARP_REQUIRED_VERSION=2.22.2
560+DBUS_SHARP_REQUIRED_VERSION=0.7
561+DBUS_SHARP_GLIB_REQUIRED_VERSION=0.5
562
563 PKG_CHECK_MODULES([GCONF_SHARP_20], [gconf-sharp-2.0])
564 PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
565@@ -86,8 +88,8 @@
566 PKG_CHECK_MODULES([MONO_ADDINS_GUI], [mono-addins-gui])
567 PKG_CHECK_MODULES([MONO_ADDINS_SETUP], [mono-addins-setup])
568 PKG_CHECK_MODULES([MONO_CAIRO], [mono-cairo])
569-PKG_CHECK_MODULES([NDESK_DBUS_10], [ndesk-dbus-1.0])
570-PKG_CHECK_MODULES([NDESK_DBUS_GLIB_10], [ndesk-dbus-glib-1.0])
571+PKG_CHECK_MODULES([DBUS_SHARP_10], [dbus-sharp-1.0 >= $DBUS_SHARP_REQUIRED_VERSION])
572+PKG_CHECK_MODULES([DBUS_SHARP_GLIB_10], [dbus-sharp-glib-1.0 >= $DBUS_SHARP_GLIB_REQUIRED_VERSION])
573 PKG_CHECK_MODULES([NOTIFY_SHARP], [notify-sharp])
574 PKG_CHECK_MODULES([WNCK_SHARP_10], [wnck-sharp-1.0])
575
576@@ -110,8 +112,8 @@
577 MONO_CAIRO_LIBS="-r:Mono.Cairo"
578 AC_SUBST([MONO_CAIRO_LIBS])
579
580-AC_SUBST([NDESK_DBUS_10_LIBS])
581-AC_SUBST([NDESK_DBUS_GLIB_10_LIBS])
582+AC_SUBST([DBUS_SHARP_10_LIBS])
583+AC_SUBST([DBUS_SHARP_GLIB_10_LIBS])
584 AC_SUBST([NOTIFY_SHARP_LIBS])
585 AC_SUBST([WNCK_SHARP_10_LIBS])
586

Subscribers

People subscribed via source and target branches

to status/vote changes: