Mercurial > pidgin.yaz

changeset 22434:48d09d62912e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid a compile warning when building with NetworkManager support because NetworkManager defines DBUS_API_SUBJECT_TO_CHANGE in it's pkg-config files
author Stu Tomlinson <stu@nosnilmot.com>
date Sun, 09 Mar 2008 13:53:47 +0000
parents 616a76954a97
children 5c72a6c071db
files libpurple/core.c libpurple/dbus-server.c libpurple/purple-client-example.c libpurple/purple-client.c
diffstat 4 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/core.c	Sun Mar 09 13:42:54 2008 +0000
+++ b/libpurple/core.c	Sun Mar 09 13:53:47 2008 +0000
@@ -50,7 +50,9 @@
 #include "util.h"
 
 #ifdef HAVE_DBUS
-#  define DBUS_API_SUBJECT_TO_CHANGE
+#  ifndef DBUS_API_SUBJECT_TO_CHANGE
+#    define DBUS_API_SUBJECT_TO_CHANGE
+#  endif
 #  include <dbus/dbus.h>
 #  include "dbus-purple.h"
 #  include "dbus-server.h"
--- a/libpurple/dbus-server.c	Sun Mar 09 13:42:54 2008 +0000
+++ b/libpurple/dbus-server.c	Sun Mar 09 13:53:47 2008 +0000
@@ -21,7 +21,9 @@
  *
  */
 
+#ifndef DBUS_API_SUBJECT_TO_CHANGE
 #define DBUS_API_SUBJECT_TO_CHANGE
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
--- a/libpurple/purple-client-example.c	Sun Mar 09 13:42:54 2008 +0000
+++ b/libpurple/purple-client-example.c	Sun Mar 09 13:53:47 2008 +0000
@@ -1,4 +1,6 @@
+#ifndef DBUS_API_SUBJECT_TO_CHANGE
 #define DBUS_API_SUBJECT_TO_CHANGE
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
--- a/libpurple/purple-client.c	Sun Mar 09 13:42:54 2008 +0000
+++ b/libpurple/purple-client.c	Sun Mar 09 13:53:47 2008 +0000
@@ -1,4 +1,6 @@
+#ifndef DBUS_API_SUBJECT_TO_CHANGE
 #define DBUS_API_SUBJECT_TO_CHANGE
+#endif
 
 #include <dbus/dbus-glib.h>
 #include <stdio.h>