--- a/libpurple/account.c Thu Feb 06 16:53:42 2014 +0530
+++ b/libpurple/account.c Thu Feb 06 20:02:57 2014 +0530
@@ -39,28 +39,28 @@
typedef struct
{
- char *username; /**< The username. */
- char *alias; /**< How you appear to yourself. */
- char *password; /**< The account password. */
- char *user_info; /**< User information. */
-
- char *buddy_icon_path; /**< The buddy icon's non-cached path. */
-
- gboolean remember_pass; /**< Remember the password. */
+ char *username; /* The username. */
+ char *alias; /* How you appear to yourself. */
+ char *password; /* The account password. */
+ char *user_info; /* User information. */
+
+ char *buddy_icon_path; /* The buddy icon's non-cached path. */
+
+ gboolean remember_pass; /* Remember the password. */
/*
* TODO: After a GObject representing a protocol is ready, use it
* here instead of the protocol ID.
*/
- char *protocol_id; /**< The ID of the protocol. */
-
- PurpleConnection *gc; /**< The connection handle. */
- gboolean disconnecting; /**< The account is currently disconnecting */
-
- GHashTable *settings; /**< Protocol-specific settings. */
- GHashTable *ui_settings; /**< UI-specific settings. */
-
- PurpleProxyInfo *proxy_info; /**< Proxy information. This will be set */
+ char *protocol_id; /* The ID of the protocol. */
+
+ PurpleConnection *gc; /* The connection handle. */
+ gboolean disconnecting; /* The account is currently disconnecting */
+
+ GHashTable *settings; /* Protocol-specific settings. */
+ GHashTable *ui_settings; /* UI-specific settings. */
+
+ PurpleProxyInfo *proxy_info; /* Proxy information. This will be set */
/* to NULL when the account inherits */
/* proxy settings from global prefs. */
@@ -72,19 +72,19 @@
* list therefore the permit list is large. Possibly GTree or
* GHashTable.
*/
- GSList *permit; /**< Permit list. */
- GSList *deny; /**< Deny list. */
- PurpleAccountPrivacyType privacy_type; /**< The permit/deny setting. */
-
- GList *status_types; /**< Status types. */
-
- PurplePresence *presence; /**< Presence. */
- PurpleLog *system_log; /**< The system log */
+ GSList *permit; /* Permit list. */
+ GSList *deny; /* Deny list. */
+ PurpleAccountPrivacyType privacy_type; /* The permit/deny setting. */
+
+ GList *status_types; /* Status types. */
+
+ PurplePresence *presence; /* Presence. */
+ PurpleLog *system_log; /* The system log */
PurpleAccountRegistrationCb registration_cb;
void *registration_cb_user_data;
- PurpleConnectionErrorInfo *current_error; /**< Errors */
+ PurpleConnectionErrorInfo *current_error; /* Errors */
} PurpleAccountPrivate;
typedef struct
@@ -2567,7 +2567,7 @@
int int_value;
char buf[21];
- proxy_type = purple_proxy_info_get_type(proxy_info);
+ proxy_type = purple_proxy_info_get_proxy_type(proxy_info);
node = purple_xmlnode_new("proxy");
