Mercurial > pidgin3 / file diff

--- a/libpurple/dbus-bindings.h	Sun Feb 09 23:53:18 2014 +0530
+++ b/libpurple/dbus-bindings.h	Mon Feb 10 00:56:22 2014 +0530
@@ -41,7 +41,7 @@
 gpointer purple_dbus_id_to_pointer_error(gint id, PurpleDBusType *type,
 				       const char *typename, DBusError *error);
 
-#define NULLIFY(id) id = empty_to_null(id)
+#define NULLIFY(id) id = purple_emptystr_to_null(id)
 
 #define CHECK_ERROR(error) if (dbus_error_is_set(error)) return NULL;
 
@@ -89,8 +89,8 @@
 gpointer* purple_GSList_to_array(GSList *list, dbus_int32_t *len);
 GHashTable *purple_dbus_iter_hash_table(DBusMessageIter *iter, DBusError *error);
 
-const char* empty_to_null(const char *str);
-const char* null_to_empty(const char *s);
+const char* purple_emptystr_to_null(const char *str);
+const char* purple_null_to_emptystr(const char *s);
 
 typedef struct {
     const char *name;