Menu
▾
▴
[Gaim-commits] CVS: gaim/src account.h,1.16,1.17 accountopt.h,1.3,1.4 blist.h,1.12,1.13 connection.h,1.6,1.7 conversation.h,1.17,1.18 debug.h,1.1,1.2 event.h,1.2,1.3 ft.h,1.15,1.16 gtkblist.c,1.61,1.62 log.h,1.2,1.3 notify.h,1.4,1.5 plugin.h,1.7,1.8 pounce.h,1.8,1.9 prefs.h,1.7,1.8 privacy.h,1.3,1.4 proxy.h,1.20,1.21 prpl.h,1.117,1.118 request.h,1.7,1.8 server.h,1.1,1.2 sound.h,1.6,1.7 util.h,1.13,1.14
|
From: Christian H. <ch...@us...> - 2003-06-23 06:40:17
|
Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4037
Modified Files:
account.h accountopt.h blist.h connection.h conversation.h
debug.h event.h ft.h gtkblist.c log.h notify.h plugin.h
pounce.h prefs.h privacy.h proxy.h prpl.h request.h server.h
sound.h util.h
Log Message:
Added #ifdef __cplusplus lines so that things will link right with C++.
Also added some doxygen comment blocks that didn't previously exist.
Index: account.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/account.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- account.h 23 Jun 2003 02:00:14 -0000 1.16
+++ account.h 23 Jun 2003 06:40:13 -0000 1.17
@@ -63,6 +63,15 @@
int perm_deny; /**< The permit/deny setting. */
};
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**************************************************************************/
+/** @name Account API */
+/**************************************************************************/
+/*@{*/
+
/**
* Creates a new account.
*
@@ -462,6 +471,13 @@
gboolean gaim_account_get_ui_bool(const GaimAccount *account, const char *ui,
const char *name, gboolean default_value);
+/*@}*/
+
+/**************************************************************************/
+/** @name Accounts API */
+/**************************************************************************/
+/*@{*/
+
/**
* Loads the accounts.
*/
@@ -528,5 +544,11 @@
*/
GaimAccount *gaim_accounts_find_with_prpl_id(const char *name,
const char *protocol_id);
+
+/*@}*/
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _GAIM_ACCOUNTS_H_ */
Index: accountopt.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/accountopt.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- accountopt.h 2 Jun 2003 09:44:42 -0000 1.3
+++ accountopt.h 23 Jun 2003 06:40:13 -0000 1.4
@@ -62,6 +62,10 @@
} GaimAccountUserSplit;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**************************************************************************/
/** @name Account Option API */
/**************************************************************************/
@@ -264,5 +268,9 @@
char gaim_account_user_split_get_separator(const GaimAccountUserSplit *split);
/*@}*/
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _GAIM_ACCOUNT_OPT_H_ */
Index: blist.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/blist.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- blist.h 16 Jun 2003 05:14:05 -0000 1.12
+++ blist.h 23 Jun 2003 06:40:13 -0000 1.13
@@ -154,6 +154,10 @@
};
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**************************************************************************/
/** @name Buddy List API */
/**************************************************************************/
@@ -563,5 +567,9 @@
struct gaim_blist_ui_ops *gaim_get_blist_ui_ops(void);
/*@}*/
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _LIST_H_ */
Index: connection.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/connection.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- connection.h 14 Jun 2003 23:21:00 -0000 1.6
+++ connection.h 23 Jun 2003 06:40:13 -0000 1.7
@@ -28,9 +28,6 @@
typedef struct _GaimConnection GaimConnection;
-#include "account.h"
-#include "plugin.h"
-
#define OPT_CONN_HTML 0x00000001
/* set this flag on a gc if you want serv_got_im to autoreply when away */
#define OPT_CONN_AUTO_RESP 0x00000002
@@ -43,6 +40,9 @@
} GaimConnectionState;
+#include "account.h"
+#include "plugin.h"
+
typedef struct
{
void (*connect_progress)(GaimConnection *gc, const char *text,
@@ -86,6 +86,14 @@
gboolean wants_to_die; /**< Wants to Die state. */
};
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**************************************************************************/
+/** @name Connection API */
+/**************************************************************************/
+
/**
* Creates a connection to the specified account.
*
@@ -198,6 +206,13 @@
*/
void gaim_connection_error(GaimConnection *gc, const char *reason);
+/*@}*/
+
+/**************************************************************************/
+/** @name Connections API */
+/**************************************************************************/
+/*@{*/
+
/**
* Disconnects from all connections.
*/
@@ -217,6 +232,8 @@
*/
GList *gaim_connections_get_connecting(void);
+/*@}*/
+
/**************************************************************************/
/** @name UI Operations API */
/**************************************************************************/
@@ -237,5 +254,9 @@
GaimConnectionUiOps *gaim_get_connection_ui_ops(void);
/*@}*/
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _GAIM_CONNECTION_H_ */
Index: conversation.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- conversation.h 14 Jun 2003 23:21:00 -0000 1.17
+++ conversation.h 23 Jun 2003 06:40:13 -0000 1.18
@@ -28,10 +28,6 @@
/** Data Structures */
/**************************************************************************/
-typedef enum _GaimConversationType GaimConversationType;
-typedef enum _GaimUnseenState GaimUnseenState;
-typedef enum _GaimConvUpdateType GaimConvUpdateType;
-typedef enum _GaimTypingState GaimTypingState;
typedef struct _GaimWindowUiOps GaimWindowUiOps;
typedef struct _GaimWindow GaimWindow;
typedef struct _GaimConversationUiOps GaimConversationUiOps;
@@ -42,28 +38,30 @@
/**
* A type of conversation.
*/
-enum _GaimConversationType
+typedef enum
{
GAIM_CONV_UNKNOWN = 0, /**< Unknown conversation type. */
GAIM_CONV_IM, /**< Instant Message. */
GAIM_CONV_CHAT, /**< Chat room. */
GAIM_CONV_MISC /**< A misc. conversation. */
-};
+
+} GaimConversationType;
/**
* Unseen text states.
*/
-enum _GaimUnseenState
+typedef enum
{
GAIM_UNSEEN_NONE = 0, /**< No unseen text in the conversation. */
GAIM_UNSEEN_TEXT, /**< Unseen text in the conversation. */
GAIM_UNSEEN_NICK, /**< Unseen text and the nick was said. */
-};
+
+} GaimUnseenState;
/**
* Conversation update type.
*/
-enum _GaimConvUpdateType
+typedef enum
{
GAIM_CONV_UPDATE_ADD = 0, /**< The buddy associated with the conversation
was added. */
@@ -83,23 +81,23 @@
GAIM_CONV_ACCOUNT_ONLINE, /**< One of the user's accounts went online. */
GAIM_CONV_ACCOUNT_OFFLINE, /**< One of the user's accounts went offline. */
GAIM_CONV_UPDATE_AWAY /**< The other user went away. */
-};
+
+} GaimConvUpdateType;
/**
* The typing state of a user.
*/
-enum _GaimTypingState
+typedef enum
{
GAIM_NOT_TYPING = 0, /**< Not typing. */
GAIM_TYPING, /**< Currently typing. */
GAIM_TYPED /**< Stopped typing momentarily. */
-};
+} GaimTypingState;
#include "account.h"
#include "server.h"
-
/**
* Conversation window operations.
*
@@ -238,6 +236,10 @@
typedef void (*GaimConvPlacementFunc)(GaimConversation *);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**************************************************************************/
/** @name Conversation Window API */
/**************************************************************************/
@@ -1177,5 +1179,9 @@
void gaim_conversation_init(void);
/*@}*/
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _GAIM_CONVERSATION_H_ */
Index: debug.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/debug.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debug.h 26 Apr 2003 06:46:59 -0000 1.1
+++ debug.h 23 Jun 2003 06:40:13 -0000 1.2
@@ -49,6 +49,13 @@
} GaimDebugUiOps;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**************************************************************************/
+/** @name Debug API */
+/**************************************************************************/
/**
* Outputs debug information.
*
@@ -86,6 +93,13 @@
*/
void debug_printf(const char *fmt, ...);
+/*@}*/
+
+/**************************************************************************/
+/** @name UI Registration Functions */
+/**************************************************************************/
+/*@{*/
+
/**
* Sets the UI operations structure to be used when outputting debug
* information.
@@ -101,5 +115,11 @@
* @return The UI operations structure in use.
*/
GaimDebugUiOps *gaim_get_debug_ui_ops(void);
+
+/*@}*/
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _GAIM_DEBUG_H_ */
Index: event.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/event.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- event.h 26 Apr 2003 18:09:45 -0000 1.2
+++ event.h 23 Jun 2003 06:40:13 -0000 1.3
@@ -69,6 +69,14 @@
typedef int (*GaimSignalBroadcastFunc)(GaimEvent event, void *data,
va_list args);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**************************************************************************/
+/** @name Signal API */
+/**************************************************************************/
/**
* Connects a signal handler to a gaim event.
*
@@ -142,5 +150,11 @@
* @return A human-readable string of the name.
*/
const char *gaim_event_get_name(GaimEvent event);
+
+/*@}*/
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _GAIM_EVENT_H_ */
Index: ft.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ft.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ft.h 14 Jun 2003 23:21:00 -0000 1.15
+++ ft.h 23 Jun 2003 06:40:13 -0000 1.16
@@ -112,6 +112,10 @@
void *data; /**< prpl-specific data. */
};
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**************************************************************************/
/** @name File Transfer API */
/**************************************************************************/
@@ -487,5 +491,9 @@
struct gaim_xfer_ui_ops *gaim_get_xfer_ui_ops(void);
/*@}*/
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _GAIM_FT_H_ */
Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- gtkblist.c 23 Jun 2003 02:00:15 -0000 1.61
+++ gtkblist.c 23 Jun 2003 06:40:13 -0000 1.62
@@ -924,7 +924,7 @@
statustext ? "\n" : "", statustext ? statustext : "",
!g_ascii_strcasecmp(b->name, "robflynn") ? _("\n<b>Description:</b> Spooky") :
!g_ascii_strcasecmp(b->name, "seanegn") ? _("\n<b>Status</b>: Awesome") :
- !g_ascii_strcasecmp(b->name, "seanegn") ? _("\n<b>Status</b>: Rockin'") : "");
+ !g_ascii_strcasecmp(b->name, "chipx86") ? _("\n<b>Status</b>: Rockin'") : "");
if(warning)
g_free(warning);
Index: log.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/log.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- log.h 21 Jun 2003 07:35:19 -0000 1.2
+++ log.h 23 Jun 2003 06:40:13 -0000 1.3
@@ -50,6 +50,10 @@
struct log_conversation *next;
};
+#ifdef __cplusplus
+extern "C" {
+#endif
+
extern GList *log_conversations;
FILE *open_log_file (const char *, int);
@@ -58,5 +62,9 @@
struct log_conversation *find_log_info(const char *);
void update_log_convs();
char *html_logize(const char *p);
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _GAIM_LOG_H_ */
Index: notify.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/notify.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- notify.h 26 May 2003 01:48:31 -0000 1.4
+++ notify.h 23 Jun 2003 06:40:13 -0000 1.5
@@ -69,6 +69,11 @@
} GaimNotifyUiOps;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**************************************************************************/
/** @name Notification API */
/**************************************************************************/
@@ -195,6 +200,11 @@
* @param ops The UI operations structure.
*/
GaimNotifyUiOps *gaim_get_notify_ui_ops(void);
+
/*@}*/
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _GAIM_NOTIFY_H_ */
Index: plugin.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/plugin.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- plugin.h 12 Jun 2003 12:29:24 -0000 1.7
+++ plugin.h 23 Jun 2003 06:40:13 -0000 1.8
@@ -22,29 +22,28 @@
*/
#ifndef _GAIM_PLUGIN_H_
#define _GAIM_PLUGIN_H_
+
#include <gmodule.h>
-typedef enum _GaimPluginType GaimPluginType; /**< GaimPluginType */
typedef struct _GaimPlugin GaimPlugin; /**< GaimPlugin */
typedef struct _GaimPluginInfo GaimPluginInfo; /**< GaimPluginInfo */
typedef struct _GaimPluginLoaderInfo GaimPluginLoaderInfo;
typedef int GaimPluginPriority; /**< Plugin priority. */
-/* XXX */
-#include "config.h"
#include "event.h"
/**
* Plugin types.
*/
-enum _GaimPluginType
+typedef enum
{
GAIM_PLUGIN_UNKNOWN = -1, /**< Unknown type. */
GAIM_PLUGIN_STANDARD = 0, /**< Standard plugin. */
GAIM_PLUGIN_LOADER, /**< Loader plugin. */
GAIM_PLUGIN_PROTOCOL /**< Protocol plugin. */
-};
+
+} GaimPluginType;
#define GAIM_PRIORITY_DEFAULT 0
#define GAIM_PRIORITY_HIGHEST 9999
@@ -134,8 +133,12 @@
}
#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**************************************************************************/
-/** @name Plugin namespace */
+/** @name Plugin API */
/**************************************************************************/
/*@{*/
@@ -226,7 +229,7 @@
/*@}*/
/**************************************************************************/
-/** @name Plugins namespace */
+/** @name Plugins API */
/**************************************************************************/
/*@{*/
@@ -367,5 +370,9 @@
GList *gaim_plugins_get_all(void);
/*@}*/
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _GAIM_PLUGIN_H_ */
Index: pounce.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/pounce.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pounce.h 15 Jun 2003 02:03:23 -0000 1.8
+++ pounce.h 23 Jun 2003 06:40:13 -0000 1.9
@@ -72,6 +72,15 @@
void *data; /**< Pounce-specific data. */
};
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**************************************************************************/
+/** @name Buddy Pounce API */
+/**************************************************************************/
+/*@{*/
+
/**
* Creates a new buddy pounce.
*
@@ -243,6 +252,13 @@
void gaim_pounce_execute(const GaimAccount *pouncer, const char *pouncee,
GaimPounceEvent events);
+/*@}*/
+
+/**************************************************************************/
+/** @name Buddy Pounces API */
+/**************************************************************************/
+/*@{*/
+
/**
* Finds a pounce with the specified event(s) and buddy.
*
@@ -263,6 +279,8 @@
/**
* Loads the pounces.
+ *
+ * @return @c TRUE if the pounces could be loaded.
*/
gboolean gaim_pounces_load(void);
@@ -296,5 +314,11 @@
* @return The list of buddy pounces.
*/
GList *gaim_pounces_get_all(void);
+
+/*@}*/
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _GAIM_POUNCE_H_ */
Index: prefs.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- prefs.h 3 Jun 2003 03:33:20 -0000 1.7
+++ prefs.h 23 Jun 2003 06:40:13 -0000 1.8
@@ -36,6 +36,7 @@
GAIM_PREF_INT,
GAIM_PREF_STRING,
GAIM_PREF_STRING_LIST
+
} GaimPrefType;
/**
@@ -45,6 +46,10 @@
typedef void (*GaimPrefCallback) (const char *name, GaimPrefType type,
gpointer val, gpointer data);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**************************************************************************/
/** @name Prefs API */
/**************************************************************************/
@@ -205,5 +210,9 @@
void gaim_prefs_sync();
/*@}*/
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _PREFS_H_ */
Index: privacy.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/privacy.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- privacy.h 14 Jun 2003 23:21:00 -0000 1.3
+++ privacy.h 23 Jun 2003 06:40:13 -0000 1.4
@@ -18,8 +18,20 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
+#ifndef _GAIM_PRIVACY_H_
+#define _GAIM_PRIVACY_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
gboolean gaim_privacy_permit_add(GaimAccount *account, const char *name);
gboolean gaim_privacy_deny_add(GaimAccount *account, const char *name);
gboolean gaim_privacy_deny_remove(GaimAccount *account, const char *name);
gboolean gaim_privacy_permit_remove(GaimAccount *account, const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _GAIM_PRIVACY_H_ */
Index: proxy.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/proxy.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- proxy.h 14 Jun 2003 23:21:00 -0000 1.20
+++ proxy.h 23 Jun 2003 06:40:13 -0000 1.21
@@ -68,6 +68,10 @@
#include "account.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**************************************************************************/
/** @name Proxy structure API */
/**************************************************************************/
@@ -248,5 +252,9 @@
GaimInputFunction func, gpointer data);
/*@}*/
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _GAIM_PROXY_H_ */
Index: prpl.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.h,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- prpl.h 23 Jun 2003 02:00:15 -0000 1.117
+++ prpl.h 23 Jun 2003 06:40:13 -0000 1.118
@@ -304,6 +304,11 @@
#define GAIM_PLUGIN_PROTOCOL_INFO(plugin) \
((GaimPluginProtocolInfo *)(plugin)->info->extra_info)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**
* Returns the plugin ID for a protocol number.
*
@@ -362,5 +367,9 @@
* @return The buddy icon data.
*/
void *get_icon_data(GaimConnection *gc, const char *who, int *len);
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _PRPL_H_ */
Index: request.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/request.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- request.h 8 Jun 2003 07:24:17 -0000 1.7
+++ request.h 23 Jun 2003 06:40:13 -0000 1.8
@@ -160,6 +160,10 @@
typedef void (*GaimRequestActionCb)(void *, int);
typedef void (*GaimRequestFieldsCb)(void *, GaimRequestFields *fields);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**************************************************************************/
/** @name Field List API */
/**************************************************************************/
@@ -840,5 +844,9 @@
GaimRequestUiOps *gaim_get_request_ui_ops(void);
/*@}*/
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _GAIM_REQUEST_H_ */
Index: server.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- server.h 14 Jun 2003 23:21:01 -0000 1.1
+++ server.h 23 Jun 2003 06:40:13 -0000 1.2
@@ -46,6 +46,10 @@
#include "account.h"
#include "conversation.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
void serv_login(GaimAccount *);
void serv_close(GaimConnection *);
void serv_touch_idle(GaimConnection *);
@@ -103,5 +107,9 @@
void serv_got_chat_left(GaimConnection *g, int id);
void serv_got_chat_in(GaimConnection *g, int id, char *who,
int whisper, char *message, time_t mtime);
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _GAIM_SERVER_H_ */
Index: sound.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sound.h 3 Jun 2003 03:33:20 -0000 1.6
+++ sound.h 23 Jun 2003 06:40:13 -0000 1.7
@@ -46,6 +46,7 @@
GAIM_SOUND_POUNCE_DEFAULT, /**< Default sound for a buddy pounce. */
GAIM_SOUND_CHAT_NICK, /**< Someone says your name in a chat. */
GAIM_NUM_SOUNDS /**< Total number of sounds. */
+
} GaimSoundEventID;
typedef struct _GaimSoundUiOps
@@ -57,6 +58,10 @@
} GaimSoundUiOps;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**************************************************************************/
/** @name Sound API */
/**************************************************************************/
@@ -101,5 +106,9 @@
void gaim_sound_play_event(GaimSoundEventID event);
/*@}*/
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _GAIM_SOUND_H_ */
Index: util.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- util.h 23 Jun 2003 02:00:15 -0000 1.13
+++ util.h 23 Jun 2003 06:40:13 -0000 1.14
@@ -28,6 +28,10 @@
#include "account.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**
* Normalizes a string, so that it is suitable for comparison.
*
@@ -299,10 +303,15 @@
const gchar *replacement);
/**
- * Returns a string representing a filesize in the appropriate units (MB, KB, GB, etc.)
+ * Returns a string representing a filesize in the appropriate
+ * units (MB, KB, GB, etc.)
*
* @param size The size
*/
char *gaim_get_size_string(size_t size);
+
+#ifdef __cplusplus
+}
+#endif
#endif /* _GAIM_UTIL_H_ */
|