/soc/2013/ankitkv/gobjectification: cdc96a002b33: Merge gtkdoc-c...

Ankit Vani a at nevitus.org
Sun Feb 9 15:53:01 EST 2014


Changeset: cdc96a002b336ae8c2e5d55108b35ba415b081c6
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-02-10 02:22 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/cdc96a002b33

Description:

Merge gtkdoc-conversion

diffstat:

 libpurple/plugins/perl/common/Server.xs |   6 +++---
 libpurple/protocol.h                    |   4 ++--
 libpurple/protocols.c                   |   2 +-
 libpurple/protocols/gg/gg.c             |   2 +-
 libpurple/protocols/irc/msgs.c          |   2 +-
 libpurple/protocols/jabber/message.c    |   6 +++---
 libpurple/protocols/msn/msn.c           |   2 +-
 libpurple/protocols/mxit/client.c       |   2 +-
 libpurple/protocols/mxit/multimx.c      |   2 +-
 libpurple/protocols/myspace/myspace.c   |   4 ++--
 libpurple/protocols/novell/novell.c     |   4 ++--
 libpurple/protocols/null/nullprpl.c     |   2 +-
 libpurple/protocols/oscar/odc.c         |   2 +-
 libpurple/protocols/oscar/oscar.c       |   6 +++---
 libpurple/protocols/sametime/sametime.c |   4 ++--
 libpurple/protocols/silc/ops.c          |   2 +-
 libpurple/protocols/simple/simple.c     |   2 +-
 libpurple/protocols/yahoo/yahoochat.c   |   4 ++--
 libpurple/protocols/yahoo/ymsg.c        |   2 +-
 libpurple/server.c                      |   4 ++--
 libpurple/server.h                      |  10 +++++-----
 pidgin/gtkconv.c                        |  22 +++++++++++-----------
 pidgin/gtkdnd-hints.c                   |   8 ++++----
 pidgin/gtkdnd-hints.h                   |   8 ++++----
 24 files changed, 56 insertions(+), 56 deletions(-)

diffs (truncated from 505 to 300 lines):

diff --git a/libpurple/plugins/perl/common/Server.xs b/libpurple/plugins/perl/common/Server.xs
--- a/libpurple/plugins/perl/common/Server.xs
+++ b/libpurple/plugins/perl/common/Server.xs
@@ -65,7 +65,7 @@ purple_serv_got_chat_in(g, id, who, chat
 	time_t mtime
 
 void 
-purple_purple_serv_got_chat_invite(gc, name, who, message, components)
+purple_serv_got_chat_invite(gc, name, who, message, components)
 	Purple::Connection gc
 	const char *name
 	const char *who
@@ -89,7 +89,7 @@ CODE:
 
 		g_hash_table_insert(t_GHash, t_key, t_value);
 	}
-	purple_purple_serv_got_chat_invite(gc, name, who, message, t_GHash);
+	purple_serv_got_chat_invite(gc, name, who, message, t_GHash);
 
 void 
 purple_serv_got_chat_left(g, id)
@@ -118,7 +118,7 @@ purple_serv_got_typing(gc, name, timeout
 	Purple::IMTypingState state
 
 void 
-purple_purple_serv_got_typing_stopped(gc, name)
+purple_serv_got_typing_stopped(gc, name)
 	Purple::Connection gc
 	const char *name
 
diff --git a/libpurple/protocol.h b/libpurple/protocol.h
--- a/libpurple/protocol.h
+++ b/libpurple/protocol.h
@@ -446,10 +446,10 @@ typedef struct _PurpleProtocolChatIface 
  *                           the chat as described by the entries returned by
  *                           @info. It may also be called when accepting an
  *                           invitation, in which case this matches the data
- *                           parameter passed to purple_purple_serv_got_chat_invite().
+ *                           parameter passed to purple_serv_got_chat_invite().
  * @reject: Called when the user refuses a chat invitation.
  *          <sbr/>@components: A hashtable containing information required to
- *                            join the chat as passed to purple_purple_serv_got_chat_invite().
+ *                            join the chat as passed to purple_serv_got_chat_invite().
  * @get_name: Returns a chat name based on the information in components. Use
  *            @info_defaults if you instead need to generate a hashtable from a
  *            chat name.
diff --git a/libpurple/protocols.c b/libpurple/protocols.c
--- a/libpurple/protocols.c
+++ b/libpurple/protocols.c
@@ -365,7 +365,7 @@ purple_protocol_got_user_status(PurpleAc
 	/* The buddy is no longer online, they are therefore by definition not
 	 * still typing to us. */
 	if (!purple_status_is_online(status)) {
-		purple_purple_serv_got_typing_stopped(purple_account_get_connection(account), name);
+		purple_serv_got_typing_stopped(purple_account_get_connection(account), name);
 		purple_protocol_got_media_caps(account, name);
 	}
 }
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
@@ -232,7 +232,7 @@ static void ggp_typing_notification_hand
 	if (length)
 		purple_serv_got_typing(gc, from, 0, PURPLE_IM_TYPING);
 	else
-		purple_purple_serv_got_typing_stopped(gc, from);
+		purple_serv_got_typing_stopped(gc, from);
 	g_free(from);
 }
 
diff --git a/libpurple/protocols/irc/msgs.c b/libpurple/protocols/irc/msgs.c
--- a/libpurple/protocols/irc/msgs.c
+++ b/libpurple/protocols/irc/msgs.c
@@ -875,7 +875,7 @@ void irc_msg_invite(struct irc_conn *irc
 
 	g_hash_table_insert(components, g_strdup("channel"), g_strdup(args[1]));
 
-	purple_purple_serv_got_chat_invite(gc, args[1], nick, NULL, components);
+	purple_serv_got_chat_invite(gc, args[1], nick, NULL, components);
 	g_free(nick);
 }
 
diff --git a/libpurple/protocols/jabber/message.c b/libpurple/protocols/jabber/message.c
--- a/libpurple/protocols/jabber/message.c
+++ b/libpurple/protocols/jabber/message.c
@@ -109,10 +109,10 @@ static void handle_chat(JabberMessage *j
 					                        PURPLE_MESSAGE_SYSTEM, time(NULL));
 				}
 			}
-			purple_purple_serv_got_typing_stopped(gc, jm->from);
+			purple_serv_got_typing_stopped(gc, jm->from);
 
 		} else {
-			purple_purple_serv_got_typing_stopped(gc, jm->from);
+			purple_serv_got_typing_stopped(gc, jm->from);
 		}
 	} else {
 		if (jid->resource) {
@@ -277,7 +277,7 @@ static void handle_groupchat_invite(Jabb
 	g_hash_table_replace(components, "password", g_strdup(jm->password));
 
 	jabber_id_free(jid);
-	purple_purple_serv_got_chat_invite(jm->js->gc, jm->to, jm->from, jm->body, components);
+	purple_serv_got_chat_invite(jm->js->gc, jm->to, jm->from, jm->body, components);
 }
 
 static void handle_error(JabberMessage *jm)
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -1631,7 +1631,7 @@ msn_send_im(PurpleConnection *gc, const 
 		g_free(pre);
 		g_free(post);
 
-		purple_purple_serv_got_typing_stopped(gc, who);
+		purple_serv_got_typing_stopped(gc, who);
 		imdata->gc = g_object_ref(gc);
 		imdata->who = who;
 		imdata->msg = body_str;
diff --git a/libpurple/protocols/mxit/client.c b/libpurple/protocols/mxit/client.c
--- a/libpurple/protocols/mxit/client.c
+++ b/libpurple/protocols/mxit/client.c
@@ -2072,7 +2072,7 @@ static void mxit_parse_cmd_msgevent( str
 			break;
 
 		case CP_MSGEVENT_STOPPED :							/* user has stopped typing */
-			purple_purple_serv_got_typing_stopped( session->con, records[0]->fields[0]->data );
+			purple_serv_got_typing_stopped( session->con, records[0]->fields[0]->data );
 			break;
 
 		case CP_MSGEVENT_ERASING :							/* user is erasing text */
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
@@ -288,7 +288,7 @@ void multimx_invite(struct MXitSession* 
 	g_hash_table_insert(components, g_strdup("room"), g_strdup(contact->alias));
 
 	/* Call libpurple - will trigger either 'mxit_chat_join' or 'mxit_chat_reject' */
-	purple_purple_serv_got_chat_invite(session->con, contact->alias, creator, NULL, components);
+	purple_serv_got_chat_invite(session->con, contact->alias, creator, NULL, components);
 }
 
 
diff --git a/libpurple/protocols/myspace/myspace.c b/libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c
+++ b/libpurple/protocols/myspace/myspace.c
@@ -1559,7 +1559,7 @@ msim_incoming_action_or_im(MsimSession *
 		purple_serv_got_typing(session->gc, username, 0, PURPLE_IM_TYPING);
 		rc = TRUE;
 	} else if (g_str_equal(msg_text, "%stoptyping%")) {
-		purple_purple_serv_got_typing_stopped(session->gc, username);
+		purple_serv_got_typing_stopped(session->gc, username);
 		rc = TRUE;
 	} else if (strstr(msg_text, "!!!ZAP_SEND!!!=RTE_BTN_ZAPS_")) {
 		rc = msim_incoming_zap(session, msg);
@@ -1615,7 +1615,7 @@ msim_incoming_media(MsimSession *session
 	 * Tell libpurple they started typing and stopped typing, to inform the Psychic
 	 * Mode plugin so it too can open a window to the user. */
 	purple_serv_got_typing(session->gc, username, 0, PURPLE_IM_TYPING);
-	purple_purple_serv_got_typing_stopped(session->gc, username);
+	purple_serv_got_typing_stopped(session->gc, username);
 
 	g_free(username);
 
diff --git a/libpurple/protocols/novell/novell.c b/libpurple/protocols/novell/novell.c
--- a/libpurple/protocols/novell/novell.c
+++ b/libpurple/protocols/novell/novell.c
@@ -1955,7 +1955,7 @@ static void
 	parms = g_slist_append(parms, nm_event_get_conference(event));
 
 	/* Prompt the user */
-	/* TODO: Would it be better to use purple_purple_serv_got_chat_invite() here? */
+	/* TODO: Would it be better to use purple_serv_got_chat_invite() here? */
 	gc = purple_account_get_connection(user->client_data);
 	purple_request_action(gc, title, primary, secondary,
 						PURPLE_DEFAULT_ACTION_NONE,
@@ -2090,7 +2090,7 @@ static void
 	if (gc) {
 		user_record = nm_find_user_record(user, nm_event_get_source(event));
 		if (user_record) {
-			purple_purple_serv_got_typing_stopped(gc,
+			purple_serv_got_typing_stopped(gc,
 									nm_user_record_get_display_id(user_record));
 		}
 	}
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
@@ -757,7 +757,7 @@ static void null_chat_invite(PurpleConne
       components = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free);
       g_hash_table_replace(components, "room", g_strdup(room));
       g_hash_table_replace(components, "invited_by", g_strdup(username));
-      purple_purple_serv_got_chat_invite(purple_account_get_connection(to_acct), room, username, message, components);
+      purple_serv_got_chat_invite(purple_account_get_connection(to_acct), room, username, message, components);
     }
   }
 }
diff --git a/libpurple/protocols/oscar/odc.c b/libpurple/protocols/oscar/odc.c
--- a/libpurple/protocols/oscar/odc.c
+++ b/libpurple/protocols/oscar/odc.c
@@ -595,7 +595,7 @@ peer_odc_recv_frame(PeerConnection *conn
 	}
 	else
 	{
-		purple_purple_serv_got_typing_stopped(gc, conn->bn);
+		purple_serv_got_typing_stopped(gc, conn->bn);
 	}
 
 	if (frame->payload.len > 0)
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
@@ -1538,7 +1538,7 @@ incomingim_chan2(OscarData *od, FlapConn
 		g_hash_table_replace(components, g_strdup("room"), utf8name);
 		g_hash_table_replace(components, g_strdup("exchange"),
 				g_strdup_printf("%d", args->info.chat.roominfo.exchange));
-		purple_purple_serv_got_chat_invite(gc,
+		purple_serv_got_chat_invite(gc,
 				     utf8name,
 				     userinfo->bn,
 				     message,
@@ -2199,7 +2199,7 @@ static int purple_parse_mtn(OscarData *o
 
 	switch (event) {
 		case 0x0000: { /* Text has been cleared */
-			purple_purple_serv_got_typing_stopped(gc, bn);
+			purple_serv_got_typing_stopped(gc, bn);
 		} break;
 
 		case 0x0001: { /* Paused typing */
@@ -2211,7 +2211,7 @@ static int purple_parse_mtn(OscarData *o
 		} break;
 
 		case 0x000f: { /* Closed IM window */
-			purple_purple_serv_got_typing_stopped(gc, bn);
+			purple_serv_got_typing_stopped(gc, bn);
 		} break;
 
 		default: {
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
@@ -1943,7 +1943,7 @@ static void mw_conf_invited(struct mwCon
 
   if(! c_topic) c_topic = "(no title)";
   if(! c_invitation) c_invitation = "(no message)";
-  purple_purple_serv_got_chat_invite(gc, c_topic, c_inviter, c_invitation, ht);
+  purple_serv_got_chat_invite(gc, c_topic, c_inviter, c_invitation, ht);
 }
 
 
@@ -2917,7 +2917,7 @@ static void mw_place_invite(struct mwCon
 
   if(! title) title = "(no title)";
   if(! message) message = "(no message)";
-  purple_purple_serv_got_chat_invite(pd->gc, title, idb->user, message, ht);
+  purple_serv_got_chat_invite(pd->gc, title, idb->user, message, ht);
 
   mwConversation_close(conv, ERR_SUCCESS);
   mwConversation_free(conv);
diff --git a/libpurple/protocols/silc/ops.c b/libpurple/protocols/silc/ops.c
--- a/libpurple/protocols/silc/ops.c
+++ b/libpurple/protocols/silc/ops.c
@@ -474,7 +474,7 @@ silc_notify(SilcClient client, SilcClien
 
 			components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 			g_hash_table_insert(components, g_strdup("channel"), g_strdup(name));
-			purple_purple_serv_got_chat_invite(gc, name, client_entry->nickname, NULL, components);
+			purple_serv_got_chat_invite(gc, name, client_entry->nickname, NULL, components);
 		}
 		break;
 
diff --git a/libpurple/protocols/simple/simple.c b/libpurple/protocols/simple/simple.c
--- a/libpurple/protocols/simple/simple.c
+++ b/libpurple/protocols/simple/simple.c
@@ -1082,7 +1082,7 @@ static void process_incoming_message(str
 			if(strstr(statedata, "active"))
 				purple_serv_got_typing(sip->gc, from, 0, PURPLE_IM_TYPING);
 			else
-				purple_purple_serv_got_typing_stopped(sip->gc, from);
+				purple_serv_got_typing_stopped(sip->gc, from);
 
 			g_free(statedata);
 		}
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
@@ -208,7 +208,7 @@ void yahoo_process_conference_invite(Pur
 		g_hash_table_replace(components, g_strdup("topic"), msg);
 	g_hash_table_replace(components, g_strdup("type"), g_strdup("Conference"));
 	g_hash_table_replace(components, g_strdup("members"), g_string_free(members, FALSE));
-	purple_purple_serv_got_chat_invite(gc, room, who, msg, components);
+	purple_serv_got_chat_invite(gc, room, who, msg, components);
 
 }
 
@@ -805,7 +805,7 @@ void yahoo_process_chat_addinvite(Purple
 
 		components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 		g_hash_table_replace(components, g_strdup("room"), g_strdup(room));



More information about the Commits mailing list