Lines 1-18
Link Here
|
1 |
--- src/manglerintegration.h.orig 2010-08-05 02:56:16.000000000 +0200 |
|
|
2 |
+++ src/manglerintegration.h 2010-11-22 21:53:01.000000000 +0100 |
3 |
@@ -37,6 +37,15 @@ |
4 |
# include <dbus/dbus-glib.h> |
5 |
# include <dbus/dbus-glib-lowlevel.h> |
6 |
#endif |
7 |
+/* bad I know but dbus clashes with gdbus. |
8 |
+ * These are defined in dbus and giomm with the same values. |
9 |
+ */ |
10 |
+#undef DBUS_MESSAGE_TYPE_INVALID |
11 |
+#undef DBUS_MESSAGE_TYPE_METHOD_CALL |
12 |
+#undef DBUS_MESSAGE_TYPE_METHOD_RETURN |
13 |
+#undef DBUS_MESSAGE_TYPE_ERROR |
14 |
+#undef DBUS_MESSAGE_TYPE_SIGNAL |
15 |
+ |
16 |
#include <glib.h> |
17 |
#include <gtkmm.h> |
18 |
#include <string.h> |