/soc/2013/ankitkv/gobjectification: fc17a4351e63: Replaced struc...
Ankit Vani
a at nevitus.org
Sun Aug 18 18:32:33 EDT 2013
Changeset: fc17a4351e63852774c67f7f428a77f75e5223b8
Author: Ankit Vani <a at nevitus.org>
Date: 2013-08-19 04:02 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/fc17a4351e63
Description:
Replaced struct proto_chat_entry with PurpleProtocolChatEntry
diffstat:
finch/gntblist.c | 2 +-
libpurple/blistnodetypes.c | 2 +-
libpurple/buddylist.c | 2 +-
libpurple/protocol.h | 2 +-
libpurple/protocols/gg/gg.c | 4 ++--
libpurple/protocols/irc/irc.c | 6 +++---
libpurple/protocols/jabber/chat.c | 12 ++++++------
libpurple/protocols/mxit/multimx.c | 4 ++--
libpurple/protocols/null/nullprpl.c | 4 ++--
libpurple/protocols/oscar/oscar.c | 8 ++++----
libpurple/protocols/sametime/sametime.c | 6 +++---
libpurple/protocols/silc/chat.c | 6 +++---
libpurple/protocols/yahoo/yahoochat.c | 4 ++--
libpurple/protocols/zephyr/zephyr.c | 10 +++++-----
pidgin/gtkblist.c | 6 +++---
15 files changed, 39 insertions(+), 39 deletions(-)
diffs (299 lines):
diff --git a/finch/gntblist.c b/finch/gntblist.c
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -1120,7 +1120,7 @@ chat_components_edit(PurpleBlistNode *se
PurpleRequestFieldGroup *group = purple_request_field_group_new(NULL);
PurpleRequestField *field;
GList *parts, *iter;
- struct proto_chat_entry *pce;
+ PurpleProtocolChatEntry *pce;
PurpleConnection *gc;
purple_request_fields_add_group(fields, group);
diff --git a/libpurple/blistnodetypes.c b/libpurple/blistnodetypes.c
--- a/libpurple/blistnodetypes.c
+++ b/libpurple/blistnodetypes.c
@@ -1123,7 +1123,7 @@ const char *purple_chat_get_name_only(Pu
protocol = purple_find_protocol_info(purple_account_get_protocol_id(priv->account));
if (protocol->chat_info) {
- struct proto_chat_entry *pce;
+ PurpleProtocolChatEntry *pce;
GList *parts = protocol->chat_info(purple_account_get_connection(priv->account));
pce = parts->data;
ret = g_hash_table_lookup(priv->components, pce->identifier);
diff --git a/libpurple/buddylist.c b/libpurple/buddylist.c
--- a/libpurple/buddylist.c
+++ b/libpurple/buddylist.c
@@ -1623,7 +1623,7 @@ purple_blist_find_chat(PurpleAccount *ac
char *chat_name;
PurpleChat *chat;
PurpleProtocol *protocol = NULL;
- struct proto_chat_entry *pce;
+ PurpleProtocolChatEntry *pce;
PurpleBlistNode *node, *group;
GList *parts;
char *normname;
diff --git a/libpurple/protocol.h b/libpurple/protocol.h
--- a/libpurple/protocol.h
+++ b/libpurple/protocol.h
@@ -124,7 +124,7 @@ struct _PurpleBuddyIconSpec {
#define PURPLE_TYPE_PROTOCOL_CHAT_ENTRY (purple_protocol_chat_entry_get_type())
-/** TODO replace proto_chat_entry
+/**
* Represents an entry containing information that must be supplied by the
* user when joining a chat.
*/
diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
--- a/libpurple/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
@@ -855,9 +855,9 @@ static GList *ggp_blist_node_menu(Purple
static GList *ggp_chat_info(PurpleConnection *gc)
{
GList *m = NULL;
- struct proto_chat_entry *pce;
+ PurpleProtocolChatEntry *pce;
- pce = g_new0(struct proto_chat_entry, 1);
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("Chat _name:");
pce->identifier = "name";
pce->required = TRUE;
diff --git a/libpurple/protocols/irc/irc.c b/libpurple/protocols/irc/irc.c
--- a/libpurple/protocols/irc/irc.c
+++ b/libpurple/protocols/irc/irc.c
@@ -298,15 +298,15 @@ static GList *irc_get_actions(PurpleConn
static GList *irc_chat_join_info(PurpleConnection *gc)
{
GList *m = NULL;
- struct proto_chat_entry *pce;
+ PurpleProtocolChatEntry *pce;
- pce = g_new0(struct proto_chat_entry, 1);
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("_Channel:");
pce->identifier = "channel";
pce->required = TRUE;
m = g_list_append(m, pce);
- pce = g_new0(struct proto_chat_entry, 1);
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("_Password:");
pce->identifier = "password";
pce->secret = TRUE;
diff --git a/libpurple/protocols/jabber/chat.c b/libpurple/protocols/jabber/chat.c
--- a/libpurple/protocols/jabber/chat.c
+++ b/libpurple/protocols/jabber/chat.c
@@ -22,7 +22,7 @@
*/
#include "internal.h"
#include "debug.h"
-#include "protocol.h" /* for proto_chat_entry */
+#include "protocol.h" /* for PurpleProtocolChatEntry */
#include "notify.h"
#include "request.h"
#include "roomlist.h"
@@ -38,27 +38,27 @@
GList *jabber_chat_info(PurpleConnection *gc)
{
GList *m = NULL;
- struct proto_chat_entry *pce;
+ PurpleProtocolChatEntry *pce;
- pce = g_new0(struct proto_chat_entry, 1);
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("_Room:");
pce->identifier = "room";
pce->required = TRUE;
m = g_list_append(m, pce);
- pce = g_new0(struct proto_chat_entry, 1);
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("_Server:");
pce->identifier = "server";
pce->required = TRUE;
m = g_list_append(m, pce);
- pce = g_new0(struct proto_chat_entry, 1);
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("_Handle:");
pce->identifier = "handle";
pce->required = TRUE;
m = g_list_append(m, pce);
- pce = g_new0(struct proto_chat_entry, 1);
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("_Password:");
pce->identifier = "password";
pce->secret = TRUE;
diff --git a/libpurple/protocols/mxit/multimx.c b/libpurple/protocols/mxit/multimx.c
--- a/libpurple/protocols/mxit/multimx.c
+++ b/libpurple/protocols/mxit/multimx.c
@@ -434,10 +434,10 @@ void multimx_message_received(struct RXM
GList* mxit_chat_info(PurpleConnection *gc)
{
GList *m = NULL;
- struct proto_chat_entry *pce;
+ PurpleProtocolChatEntry *pce;
/* Configuration option: Room Name */
- pce = g_new0(struct proto_chat_entry, 1);
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _( "_Room Name:" );
pce->identifier = "room";
pce->required = TRUE;
diff --git a/libpurple/protocols/null/nullprpl.c b/libpurple/protocols/null/nullprpl.c
--- a/libpurple/protocols/null/nullprpl.c
+++ b/libpurple/protocols/null/nullprpl.c
@@ -333,11 +333,11 @@ static GList *nullprpl_blist_node_menu(P
}
static GList *nullprpl_chat_info(PurpleConnection *gc) {
- struct proto_chat_entry *pce; /* defined in protocol.h */
+ PurpleProtocolChatEntry *pce; /* defined in protocol.h */
purple_debug_info("nullprpl", "returning chat setting 'room'\n");
- pce = g_new0(struct proto_chat_entry, 1);
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("Chat _room");
pce->identifier = "room";
pce->required = TRUE;
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -4199,15 +4199,15 @@ static int purple_ssi_gotadded(OscarData
GList *oscar_chat_info(PurpleConnection *gc) {
GList *m = NULL;
- struct proto_chat_entry *pce;
-
- pce = g_new0(struct proto_chat_entry, 1);
+ PurpleProtocolChatEntry *pce;
+
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("_Room:");
pce->identifier = "room";
pce->required = TRUE;
m = g_list_append(m, pce);
- pce = g_new0(struct proto_chat_entry, 1);
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("_Exchange:");
pce->identifier = "exchange";
pce->required = TRUE;
diff --git a/libpurple/protocols/sametime/sametime.c b/libpurple/protocols/sametime/sametime.c
--- a/libpurple/protocols/sametime/sametime.c
+++ b/libpurple/protocols/sametime/sametime.c
@@ -3639,9 +3639,9 @@ static GList *mw_protocol_blist_node_men
static GList *mw_protocol_chat_info(PurpleConnection *gc) {
GList *l = NULL;
- struct proto_chat_entry *pce;
-
- pce = g_new0(struct proto_chat_entry, 1);
+ PurpleProtocolChatEntry *pce;
+
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("Topic:");
pce->identifier = CHAT_KEY_TOPIC;
l = g_list_append(l, pce);
diff --git a/libpurple/protocols/silc/chat.c b/libpurple/protocols/silc/chat.c
--- a/libpurple/protocols/silc/chat.c
+++ b/libpurple/protocols/silc/chat.c
@@ -28,15 +28,15 @@
GList *silcpurple_chat_info(PurpleConnection *gc)
{
GList *ci = NULL;
- struct proto_chat_entry *pce;
+ PurpleProtocolChatEntry *pce;
- pce = g_new0(struct proto_chat_entry, 1);
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("_Channel:");
pce->identifier = "channel";
pce->required = TRUE;
ci = g_list_append(ci, pce);
- pce = g_new0(struct proto_chat_entry, 1);
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("_Passphrase:");
pce->identifier = "passphrase";
pce->secret = TRUE;
diff --git a/libpurple/protocols/yahoo/yahoochat.c b/libpurple/protocols/yahoo/yahoochat.c
--- a/libpurple/protocols/yahoo/yahoochat.c
+++ b/libpurple/protocols/yahoo/yahoochat.c
@@ -1079,9 +1079,9 @@ int yahoo_c_send(PurpleConnection *gc, i
GList *yahoo_c_info(PurpleConnection *gc)
{
GList *m = NULL;
- struct proto_chat_entry *pce;
+ PurpleProtocolChatEntry *pce;
- pce = g_new0(struct proto_chat_entry, 1);
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("_Room:");
pce->identifier = "room";
pce->required = TRUE;
diff --git a/libpurple/protocols/zephyr/zephyr.c b/libpurple/protocols/zephyr/zephyr.c
--- a/libpurple/protocols/zephyr/zephyr.c
+++ b/libpurple/protocols/zephyr/zephyr.c
@@ -2368,21 +2368,21 @@ static GList *zephyr_status_types(Purple
static GList *zephyr_chat_info(PurpleConnection * gc)
{
GList *m = NULL;
- struct proto_chat_entry *pce;
-
- pce = g_new0(struct proto_chat_entry, 1);
+ PurpleProtocolChatEntry *pce;
+
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("_Class:");
pce->identifier = "class";
m = g_list_append(m, pce);
- pce = g_new0(struct proto_chat_entry, 1);
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("_Instance:");
pce->identifier = "instance";
m = g_list_append(m, pce);
- pce = g_new0(struct proto_chat_entry, 1);
+ pce = g_new0(PurpleProtocolChatEntry, 1);
pce->label = _("_Recipient:");
pce->identifier = "recipient";
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -664,7 +664,7 @@ static void chat_components_edit(GtkWidg
PurpleRequestFieldGroup *group = purple_request_field_group_new(NULL);
PurpleRequestField *field;
GList *parts, *iter;
- struct proto_chat_entry *pce;
+ PurpleProtocolChatEntry *pce;
PurpleConnection *gc;
PurpleChat *chat = (PurpleChat*)node;
@@ -1045,7 +1045,7 @@ rebuild_chat_entries(PidginChatData *dat
PurpleProtocol *protocol;
GList *list = NULL, *tmp;
GHashTable *defaults = NULL;
- struct proto_chat_entry *pce;
+ PurpleProtocolChatEntry *pce;
gboolean focus = TRUE;
g_return_if_fail(data->rq_data.account != NULL);
@@ -3808,7 +3808,7 @@ static char *pidgin_get_tooltip_text(Pur
PurpleChat *chat;
GList *connections;
GList *cur;
- struct proto_chat_entry *pce;
+ PurpleProtocolChatEntry *pce;
char *name, *value;
PurpleChatConversation *conv;
PidginBlistNode *bnode = purple_blist_node_get_ui_data(node);
More information about the Commits
mailing list