|
0 |
Index: cairo-dock-plug-ins-3.4.0/CMakeLists.txt
|
|
1 |
===================================================================
|
|
2 |
--- cairo-dock-plug-ins-3.4.0.orig/CMakeLists.txt
|
|
3 |
+++ cairo-dock-plug-ins-3.4.0/CMakeLists.txt
|
|
4 |
@@ -569,11 +569,11 @@ if (enable-mono-interface)
|
|
5 |
if (NOT GMCS_EXECUTABLE OR NOT EXISTS ${GMCS_EXECUTABLE})
|
|
6 |
message (STATUS "Could not find Mono compiler gmcs, won't build Mono interface.")
|
|
7 |
else()
|
|
8 |
- pkg_check_modules (MONO_PACKAGE glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0)
|
|
9 |
+ pkg_check_modules (MONO_PACKAGE glib-sharp-2.0 dbus-sharp-2.0 dbus-sharp-glib-2.0)
|
|
10 |
if (NOT MONO_PACKAGE_FOUND)
|
|
11 |
- message (STATUS "Could not find glib-sharp-2.0, ndesk-dbus-1.0 or ndesk-dbus-glib-1.0; won't be built Mono interface.")
|
|
12 |
- message (WARNING "These modules are required to compile DBus applet with Mono interface: glib-sharp-2.0, ndesk-dbus-1.0 and ndesk-dbus-glib-1.0")
|
|
13 |
- set (MODULES_MISSING "${MODULES_MISSING} glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0")
|
|
14 |
+ message (STATUS "Could not find glib-sharp-2.0, dbus-sharp-2.0 or dbus-sharp-glib-2.0; won't be built Mono interface.")
|
|
15 |
+ message (WARNING "These modules are required to compile DBus applet with Mono interface: glib-sharp-2.0, dbus-sharp-2.0 and dbus-sharp-glib-2.0")
|
|
16 |
+ set (MODULES_MISSING "${MODULES_MISSING} glib-sharp-2.0 dbus-sharp-2.0 dbus-sharp-glib-2.0")
|
|
17 |
else()
|
|
18 |
set (MONO_FOUND TRUE)
|
|
19 |
set (with_mono yes)
|
|
20 |
Index: cairo-dock-plug-ins-3.4.0/Dbus/interfaces/mono/CDApplet.cs
|
|
21 |
===================================================================
|
|
22 |
--- cairo-dock-plug-ins-3.4.0.orig/Dbus/interfaces/mono/CDApplet.cs
|
|
23 |
+++ cairo-dock-plug-ins-3.4.0/Dbus/interfaces/mono/CDApplet.cs
|
|
24 |
@@ -29,7 +29,7 @@ using System; // Environment
|
|
25 |
using System.IO; // Path, Directory
|
|
26 |
using System.Reflection;
|
|
27 |
using GLib;
|
|
28 |
-using NDesk.DBus;
|
|
29 |
+using DBus;
|
|
30 |
using CairoDock.Applet;
|
|
31 |
|
|
32 |
//namespace CairoDock.Applet
|
|
33 |
@@ -258,8 +258,8 @@ public class CDApplet
|
|
34 |
|
|
35 |
private void _connect_to_dock ()
|
|
36 |
{
|
|
37 |
- NDesk.DBus.BusG.Init();
|
|
38 |
- NDesk.DBus.Bus bus = NDesk.DBus.Bus.Session;
|
|
39 |
+ DBus.BusG.Init();
|
|
40 |
+ DBus.Bus bus = DBus.Bus.Session;
|
|
41 |
this.icon = bus.GetObject<IApplet> ("org.cairodock.CairoDock", new ObjectPath (this.cBusPath));
|
|
42 |
this.icon.on_click += new OnClickEvent (on_click);
|
|
43 |
this.icon.on_middle_click += new OnMiddleClickEvent (on_middle_click);
|
|
44 |
Index: cairo-dock-plug-ins-3.4.0/Dbus/interfaces/mono/IApplet.cs
|
|
45 |
===================================================================
|
|
46 |
--- cairo-dock-plug-ins-3.4.0.orig/Dbus/interfaces/mono/IApplet.cs
|
|
47 |
+++ cairo-dock-plug-ins-3.4.0/Dbus/interfaces/mono/IApplet.cs
|
|
48 |
@@ -1,6 +1,6 @@
|
|
49 |
using System;
|
|
50 |
using System.Collections.Generic; // Dictionnary
|
|
51 |
-using NDesk.DBus;
|
|
52 |
+using DBus;
|
|
53 |
|
|
54 |
namespace CairoDock.Applet
|
|
55 |
{
|
|
56 |
@@ -27,7 +27,7 @@ namespace CairoDock.Applet
|
|
57 |
Left
|
|
58 |
}
|
|
59 |
|
|
60 |
- [NDesk.DBus.Interface("org.cairodock.CairoDock.applet")]
|
|
61 |
+ [DBus.Interface("org.cairodock.CairoDock.applet")]
|
|
62 |
public interface IApplet
|
|
63 |
{
|
|
64 |
object Get(string cProperty);
|
|
65 |
Index: cairo-dock-plug-ins-3.4.0/Dbus/interfaces/mono/ISubApplet.cs
|
|
66 |
===================================================================
|
|
67 |
--- cairo-dock-plug-ins-3.4.0.orig/Dbus/interfaces/mono/ISubApplet.cs
|
|
68 |
+++ cairo-dock-plug-ins-3.4.0/Dbus/interfaces/mono/ISubApplet.cs
|
|
69 |
@@ -1,6 +1,6 @@
|
|
70 |
using System;
|
|
71 |
using System.Collections.Generic; // Dictionnary
|
|
72 |
-using NDesk.DBus;
|
|
73 |
+using DBus;
|
|
74 |
|
|
75 |
namespace CairoDock.Applet
|
|
76 |
{
|
|
77 |
Index: cairo-dock-plug-ins-3.4.0/Dbus/interfaces/mono/CMakeLists.txt
|
|
78 |
===================================================================
|
|
79 |
--- cairo-dock-plug-ins-3.4.0.orig/Dbus/interfaces/mono/CMakeLists.txt
|
|
80 |
+++ cairo-dock-plug-ins-3.4.0/Dbus/interfaces/mono/CMakeLists.txt
|
|
81 |
@@ -3,7 +3,7 @@
|
|
82 |
|
|
83 |
execute_process(COMMAND ${GMCS_EXECUTABLE}
|
|
84 |
-target:library
|
|
85 |
- -pkg:glib-sharp-2.0 -pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0
|
|
86 |
+ -pkg:glib-sharp-2.0 -pkg:dbus-sharp-2.0 -pkg:dbus-sharp-glib-2.0
|
|
87 |
-out:${CMAKE_CURRENT_BINARY_DIR}/CDApplet.dll
|
|
88 |
${CMAKE_CURRENT_SOURCE_DIR}/CDApplet.cs ${CMAKE_CURRENT_SOURCE_DIR}/ISubApplet.cs ${CMAKE_CURRENT_SOURCE_DIR}/IApplet.cs)
|
|
89 |
### find how to register to GAC ...
|