pidgin: 18604e6d: Avoid a compile warning when building wi...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 18604e6dad3cb38203b53cd872edd35abd764617
Ancestor: 9a84e0de845c1f3dd905e9cab87603a4f600a33f
Author: nosnilmot at pidgin.im
Date: 2008-03-09T13:53:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/18604e6dad3cb38203b53cd872edd35abd764617

Modified files:
        libpurple/core.c libpurple/dbus-server.c
        libpurple/purple-client-example.c libpurple/purple-client.c

ChangeLog: 

Avoid a compile warning when building with NetworkManager support because
NetworkManager defines DBUS_API_SUBJECT_TO_CHANGE in it's pkg-config files

-------------- next part --------------
============================================================
--- libpurple/core.c	be64471588034c0111105f55521e0bd7ea5c3f0a
+++ libpurple/core.c	2e17c7fa3e5713ac7b4ba4aacc7000d705b02be2
@@ -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"
============================================================
--- libpurple/dbus-server.c	503cf0022090cb9e4ed43e4c14c73a528dee1ed3
+++ libpurple/dbus-server.c	b7e888797aac27159becabf202e78dfe2f44fb38
@@ -21,7 +21,9 @@
  *
  */
 
+#ifndef DBUS_API_SUBJECT_TO_CHANGE
 #define DBUS_API_SUBJECT_TO_CHANGE
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
============================================================
--- libpurple/purple-client-example.c	b86bf12ea22dd381fd866dabbb7f9edb3fe40284
+++ libpurple/purple-client-example.c	9868f13b5b490b85d182d1b7b053e0f3ba5222a7
@@ -1,4 +1,6 @@
+#ifndef DBUS_API_SUBJECT_TO_CHANGE
 #define DBUS_API_SUBJECT_TO_CHANGE
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
============================================================
--- libpurple/purple-client.c	f0043a754976a038ab5f43771efb3b388224a4fd
+++ libpurple/purple-client.c	daebb8ea933fe819f6521ae8987b7013ad8acdf6
@@ -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>