Mercurial > pidgin
comparison libpurple/status.h @ 20515:7aaebdb013c9
explicit merge of '496506f552dcc01dcc38820f472dc9d27a82a997'
and '20899a5772594c6139b37b372cfab97e03cfa2ac'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 16 Sep 2007 18:05:12 +0000 |
parents | 481749fc0b6b |
children | 5913725cbcd6 37f3c1023a68 |
comparison
equal
deleted
inserted
replaced
20514:723b5a2f91ce | 20515:7aaebdb013c9 |
---|---|
111 #include "account.h" | 111 #include "account.h" |
112 #include "blist.h" | 112 #include "blist.h" |
113 #include "conversation.h" | 113 #include "conversation.h" |
114 #include "value.h" | 114 #include "value.h" |
115 | 115 |
116 #define PURPLE_TUNE_ARTIST "tune_artist" | |
117 #define PURPLE_TUNE_TITLE "tune_title" | |
118 #define PURPLE_TUNE_ALBUM "tune_album" | |
119 #define PURPLE_TUNE_GENRE "tune_genre" | |
120 #define PURPLE_TUNE_COMMENT "tune_comment" | |
121 #define PURPLE_TUNE_TRACK "tune_track" | |
122 #define PURPLE_TUNE_TIME "tune_time" | |
123 #define PURPLE_TUNE_YEAR "tune_year" | |
124 #define PURPLE_TUNE_URL "tune_url" | |
125 | |
116 #ifdef __cplusplus | 126 #ifdef __cplusplus |
117 extern "C" { | 127 extern "C" { |
118 #endif | 128 #endif |
119 | 129 |
120 /**************************************************************************/ | 130 /**************************************************************************/ |