libpurple/dbus-define-api.h

Sun, 23 Nov 2014 23:20:53 -0500

author
Daniel Atallah <datallah@pidgin.im>
date
Sun, 23 Nov 2014 23:20:53 -0500
changeset 36281
017310ea69c0
parent 36068
e9b9320a985a
child 37148
50f361d39a1e
permissions
-rw-r--r--

Merge with release-2.x.y (with a number of conflicts)

* Lots of po files conflicted and I just chose the files from default.

35096
5c2d69863fa0 More descriptive error message.
Mark Doliner <mark@kingant.net>
parents: 34999
diff changeset
1 #error "This file is not a valid C code and is not intended to be compiled."
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
2
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
3 /* This file contains some of the macros from other header files as
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
4 function declarations. This does not make sense in C, but it
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
5 provides type information for the dbus-analyze-functions.py
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
6 program, which makes these macros callable by DBUS. */
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
7
34706
02cb08146888 Renamed blist.[ch] to buddylist.[ch]
Ankit Vani <a@nevitus.org>
parents: 34699
diff changeset
8 /* buddylist.h */
34760
062535fbe1e9 Renamed PURPLE_IS_BUDDY_ONLINE back to PURPLE_BUDDY_IS_ONLINE
Ankit Vani <a@nevitus.org>
parents: 34731
diff changeset
9 gboolean PURPLE_BUDDY_IS_ONLINE(PurpleBuddy *buddy);
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
10
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
11 /* connection.h */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
12 gboolean PURPLE_CONNECTION_IS_CONNECTED(PurpleConnection *connection);

mercurial