Fix duplicate prefixes

24 files changed, 56 insertions, 56 deletions

diff --git a/libpurple/plugins/perl/common/Server.xs b/libpurple/plugins/perl/common/Server.xs
index ebebafe019..ddb3833179 100644
--- 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, chatflags, message, mtime)
 	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, state)
 	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/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
index 50b3254573..c47f98c28f 100644
--- a/libpurple/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
@@ -228,7 +228,7 @@ static void ggp_typing_notification_handler(PurpleConnection *gc, uin_t uin, int
 	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
index 6bcfeff5e7..ad6d32e394 100644
--- a/libpurple/protocols/irc/msgs.c
+++ b/libpurple/protocols/irc/msgs.c
@@ -875,7 +875,7 @@ void irc_msg_invite(struct irc_conn *irc, const char *name, const char *from, ch
 
 	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
index 986ade8aed..e3b47d99b7 100644
--- a/libpurple/protocols/jabber/message.c
+++ b/libpurple/protocols/jabber/message.c
@@ -109,10 +109,10 @@ static void handle_chat(JabberMessage *jm)
 					                        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(JabberMessage *jm)
 	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
index 030c4c6bc3..a90c0e5ac4 100644
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -1630,7 +1630,7 @@ msn_send_im(PurpleConnection *gc, const char *who, const char *message,
 		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/multimx.c b/libpurple/protocols/mxit/multimx.c
index c499d45994..c94815ab9f 100644
--- a/libpurple/protocols/mxit/multimx.c
+++ b/libpurple/protocols/mxit/multimx.c
@@ -288,7 +288,7 @@ void multimx_invite(struct MXitSession* session, struct contact* contact, const
 	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/mxit/protocol.c b/libpurple/protocols/mxit/protocol.c
index 19ab24640e..9c914c6ae7 100644
--- a/libpurple/protocols/mxit/protocol.c
+++ b/libpurple/protocols/mxit/protocol.c
@@ -2072,7 +2072,7 @@ static void mxit_parse_cmd_msgevent( struct MXitSession* session, struct record*
 			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/myspace/myspace.c b/libpurple/protocols/myspace/myspace.c
index c5a93aea9b..05d039d15d 100644
--- a/libpurple/protocols/myspace/myspace.c
+++ b/libpurple/protocols/myspace/myspace.c
@@ -1558,7 +1558,7 @@ msim_incoming_action_or_im(MsimSession *session, MsimMessage *msg)
 		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);
@@ -1614,7 +1614,7 @@ msim_incoming_media(MsimSession *session, MsimMessage *msg)
 	 * 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
index f7e60167c8..d91e0e21e8 100644
--- a/libpurple/protocols/novell/novell.c
+++ b/libpurple/protocols/novell/novell.c
@@ -1953,7 +1953,7 @@ _evt_conference_invite(NMUser * user, NMEvent * event)
 	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,
@@ -2088,7 +2088,7 @@ _evt_user_not_typing(NMUser * user, NMEvent * event)
 	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
index b4ad3a1a84..336e80701c 100644
--- a/libpurple/protocols/null/nullprpl.c
+++ b/libpurple/protocols/null/nullprpl.c
@@ -750,7 +750,7 @@ static void nullprpl_chat_invite(PurpleConnection *gc, int id,
       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
index 8d947fdfbd..078b9450ca 100644
--- a/libpurple/protocols/oscar/odc.c
+++ b/libpurple/protocols/oscar/odc.c
@@ -595,7 +595,7 @@ peer_odc_recv_frame(PeerConnection *conn, ByteStream *bs)
 	}
 	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
index 9d9e2a9081..a4bb40108a 100644
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -1533,7 +1533,7 @@ incomingim_chan2(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo,
 		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,
@@ -2194,7 +2194,7 @@ static int purple_parse_mtn(OscarData *od, FlapConnection *conn, FlapFrame *fr,
 
 	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 */
@@ -2206,7 +2206,7 @@ static int purple_parse_mtn(OscarData *od, FlapConnection *conn, FlapFrame *fr,
 		} 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
index 88af90163e..3c2a0876e1 100644
--- a/libpurple/protocols/sametime/sametime.c
+++ b/libpurple/protocols/sametime/sametime.c
@@ -1935,7 +1935,7 @@ static void mw_conf_invited(struct mwConference *conf,
 
   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);
 }
 
 
@@ -2909,7 +2909,7 @@ static void mw_place_invite(struct mwConversation *conv,
 
   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
index 363023decb..4e5f20db0c 100644
--- a/libpurple/protocols/silc/ops.c
+++ b/libpurple/protocols/silc/ops.c
@@ -474,7 +474,7 @@ silc_notify(SilcClient client, SilcClientConnection conn,
 
 			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
index ee399f7063..0e1c0d7445 100644
--- a/libpurple/protocols/simple/simple.c
+++ b/libpurple/protocols/simple/simple.c
@@ -1080,7 +1080,7 @@ static void process_incoming_message(struct simple_account_data *sip, struct sip
 			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/libymsg.c b/libpurple/protocols/yahoo/libymsg.c
index ebd1135964..dc04adeb81 100644
--- a/libpurple/protocols/yahoo/libymsg.c
+++ b/libpurple/protocols/yahoo/libymsg.c
@@ -900,7 +900,7 @@ static void yahoo_process_notify(PurpleConnection *gc, struct yahoo_packet *pkt,
 		if (stat && *stat == '1')
 			purple_serv_got_typing(gc, fed_from, 0, PURPLE_IM_TYPING);
 		else
-			purple_purple_serv_got_typing_stopped(gc, fed_from);
+			purple_serv_got_typing_stopped(gc, fed_from);
 
 		if (fed_from != from)
 			g_free(fed_from);
diff --git a/libpurple/protocols/yahoo/yahoochat.c b/libpurple/protocols/yahoo/yahoochat.c
index 25bc5ec98a..f5989fe0bb 100644
--- a/libpurple/protocols/yahoo/yahoochat.c
+++ b/libpurple/protocols/yahoo/yahoochat.c
@@ -208,7 +208,7 @@ void yahoo_process_conference_invite(PurpleConnection *gc, struct yahoo_packet *
 		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(PurpleConnection *gc, struct yahoo_packet *pkt
 
 		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));
-		purple_purple_serv_got_chat_invite(gc, room, who, msg, components);
+		purple_serv_got_chat_invite(gc, room, who, msg, components);
 	}
 
 	g_free(room);
diff --git a/libpurple/prpl.c b/libpurple/prpl.c
index 0154398755..6a18835dfc 100644
--- a/libpurple/prpl.c
+++ b/libpurple/prpl.c
@@ -300,7 +300,7 @@ purple_prpl_got_user_status(PurpleAccount *account, const char *name,
 	/* 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_prpl_got_media_caps(account, name);
 	}
 }
diff --git a/libpurple/prpl.h b/libpurple/prpl.h
index e6cca3404b..c88bbb2d8e 100644
--- a/libpurple/prpl.h
+++ b/libpurple/prpl.h
@@ -374,7 +374,7 @@ struct _PurplePluginProtocolInfo
 	 *              join the chat as described by the entries returned
 	 *              by #chat_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.
+	 *              data parameter passed to #purple_serv_got_chat_invite.
 	 */
 	void (*join_chat)(PurpleConnection *, GHashTable *components);
 
@@ -382,7 +382,7 @@ struct _PurplePluginProtocolInfo
 	 * Called when the user refuses a chat invitation.
 	 *
 	 * @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.
 	 */
 	void (*reject_chat)(PurpleConnection *, GHashTable *components);
 
diff --git a/libpurple/server.c b/libpurple/server.c
index feebf49a1b..93dd5055e3 100644
--- a/libpurple/server.c
+++ b/libpurple/server.c
@@ -718,7 +718,7 @@ void purple_serv_got_typing(PurpleConnection *gc, const char *name, int timeout,
 		purple_im_conversation_start_typing_timeout(im, timeout);
 }
 
-void purple_purple_serv_got_typing_stopped(PurpleConnection *gc, const char *name) {
+void purple_serv_got_typing_stopped(PurpleConnection *gc, const char *name) {
 
 	PurpleIMConversation *im;
 
@@ -766,7 +766,7 @@ static void chat_invite_accept(struct chat_invite_data *cid)
 
 
 
-void purple_purple_serv_got_chat_invite(PurpleConnection *gc, const char *name,
+void purple_serv_got_chat_invite(PurpleConnection *gc, const char *name,
 						  const char *who, const char *message, GHashTable *data)
 {
 	PurpleAccount *account;
diff --git a/libpurple/server.h b/libpurple/server.h
index a41de04837..6645a4a9ac 100644
--- a/libpurple/server.h
+++ b/libpurple/server.h
@@ -106,7 +106,7 @@ void purple_serv_got_private_alias(PurpleConnection *gc, const char *who, const
  *
  * Receive a typing message from a remote user.  Either PURPLE_IM_TYPING
  * or PURPLE_IM_TYPED.  If the user has stopped typing then use
- * purple_purple_serv_got_typing_stopped instead.
+ * purple_serv_got_typing_stopped instead.
  *
  * @todo Could probably move this into the conversation API.
  */
@@ -114,11 +114,11 @@ void purple_serv_got_typing(PurpleConnection *gc, const char *name, int timeout,
 					 PurpleIMTypingState state);
 
 /**
- * purple_purple_serv_got_typing_stopped:
+ * purple_serv_got_typing_stopped:
  *
  * @todo Could probably move this into the conversation API.
  */
-void purple_purple_serv_got_typing_stopped(PurpleConnection *gc, const char *name);
+void purple_serv_got_typing_stopped(PurpleConnection *gc, const char *name);
 
 void purple_serv_got_im(PurpleConnection *gc, const char *who, const char *msg,
 				 PurpleMessageFlags flags, time_t mtime);
@@ -138,7 +138,7 @@ void purple_serv_join_chat(PurpleConnection *, GHashTable *data);
 void purple_serv_reject_chat(PurpleConnection *, GHashTable *data);
 
 /**
- * purple_purple_serv_got_chat_invite:
+ * purple_serv_got_chat_invite:
  * @gc:      The connection on which the invite arrived.
  * @name:    The name of the chat you're being invited to.
  * @who:     The username of the person inviting the account.
@@ -149,7 +149,7 @@ void purple_serv_reject_chat(PurpleConnection *, GHashTable *data);
  *
  * Called by a protocol when an account is invited into a chat.
  */
-void purple_purple_serv_got_chat_invite(PurpleConnection *gc, const char *name,
+void purple_serv_got_chat_invite(PurpleConnection *gc, const char *name,
 						  const char *who, const char *message,
 						  GHashTable *data);
 
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index c295adec03..e7d4fa7635 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -9331,7 +9331,7 @@ notebook_motion_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
 		dest_win = pidgin_conv_window_get_at_event((GdkEvent *)e);
 
 		if (dest_win == NULL) {
-			pidgin_pidgin_dnd_hints_hide_all();
+			pidgin_dnd_hints_hide_all();
 
 			return TRUE;
 		}
@@ -9357,23 +9357,23 @@ notebook_motion_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
 		if (gtk_notebook_get_show_tabs(dest_notebook) == FALSE && win == dest_win)
 		{
 			/* dragging a tab from a single-tabbed window over its own window */
-			pidgin_pidgin_dnd_hints_hide_all();
+			pidgin_dnd_hints_hide_all();
 			return TRUE;
 		} else if (horiz_tabs) {
 			if (((gpointer)win == (gpointer)dest_win && win->drag_tab < page_num) || to_right) {
-				pidgin_pidgin_dnd_hints_show_relative(HINT_ARROW_DOWN, tab, HINT_POSITION_RIGHT, HINT_POSITION_TOP);
-				pidgin_pidgin_dnd_hints_show_relative(HINT_ARROW_UP, tab, HINT_POSITION_RIGHT, HINT_POSITION_BOTTOM);
+				pidgin_dnd_hints_show_relative(HINT_ARROW_DOWN, tab, HINT_POSITION_RIGHT, HINT_POSITION_TOP);
+				pidgin_dnd_hints_show_relative(HINT_ARROW_UP, tab, HINT_POSITION_RIGHT, HINT_POSITION_BOTTOM);
 			} else {
-				pidgin_pidgin_dnd_hints_show_relative(HINT_ARROW_DOWN, tab, HINT_POSITION_LEFT, HINT_POSITION_TOP);
-				pidgin_pidgin_dnd_hints_show_relative(HINT_ARROW_UP, tab, HINT_POSITION_LEFT, HINT_POSITION_BOTTOM);
+				pidgin_dnd_hints_show_relative(HINT_ARROW_DOWN, tab, HINT_POSITION_LEFT, HINT_POSITION_TOP);
+				pidgin_dnd_hints_show_relative(HINT_ARROW_UP, tab, HINT_POSITION_LEFT, HINT_POSITION_BOTTOM);
 			}
 		} else {
 			if (((gpointer)win == (gpointer)dest_win && win->drag_tab < page_num) || to_right) {
-				pidgin_pidgin_dnd_hints_show_relative(HINT_ARROW_RIGHT, tab, HINT_POSITION_LEFT, HINT_POSITION_BOTTOM);
-				pidgin_pidgin_dnd_hints_show_relative(HINT_ARROW_LEFT, tab, HINT_POSITION_RIGHT, HINT_POSITION_BOTTOM);
+				pidgin_dnd_hints_show_relative(HINT_ARROW_RIGHT, tab, HINT_POSITION_LEFT, HINT_POSITION_BOTTOM);
+				pidgin_dnd_hints_show_relative(HINT_ARROW_LEFT, tab, HINT_POSITION_RIGHT, HINT_POSITION_BOTTOM);
 			} else {
-				pidgin_pidgin_dnd_hints_show_relative(HINT_ARROW_RIGHT, tab, HINT_POSITION_LEFT, HINT_POSITION_TOP);
-				pidgin_pidgin_dnd_hints_show_relative(HINT_ARROW_LEFT, tab, HINT_POSITION_RIGHT, HINT_POSITION_TOP);
+				pidgin_dnd_hints_show_relative(HINT_ARROW_RIGHT, tab, HINT_POSITION_LEFT, HINT_POSITION_TOP);
+				pidgin_dnd_hints_show_relative(HINT_ARROW_LEFT, tab, HINT_POSITION_RIGHT, HINT_POSITION_TOP);
 			}
 		}
 	}
@@ -9622,7 +9622,7 @@ notebook_release_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
 
 	win->in_drag = FALSE;
 
-	pidgin_pidgin_dnd_hints_hide_all();
+	pidgin_dnd_hints_hide_all();
 
 	dest_win = pidgin_conv_window_get_at_event((GdkEvent *)e);
 
diff --git a/pidgin/gtkdnd-hints.c b/pidgin/gtkdnd-hints.c
index f9f724fead..293929f4e4 100644
--- a/pidgin/gtkdnd-hints.c
+++ b/pidgin/gtkdnd-hints.c
@@ -189,7 +189,7 @@ dnd_hints_init(void)
 }
 
 void
-pidgin_pidgin_dnd_hints_hide_all(void)
+pidgin_dnd_hints_hide_all(void)
 {
 	gint i;
 
@@ -224,7 +224,7 @@ pidgin_dnd_hints_show(PidginDndHintWindowId id, gint x, gint y)
 }
 
 void
-pidgin_pidgin_dnd_hints_show_relative(PidginDndHintWindowId id, GtkWidget *widget,
+pidgin_dnd_hints_show_relative(PidginDndHintWindowId id, GtkWidget *widget,
 						PidginDndHintPosition horiz, PidginDndHintPosition vert)
 {
 	gint x1, x2, y1, y2;
@@ -244,7 +244,7 @@ pidgin_pidgin_dnd_hints_show_relative(PidginDndHintWindowId id, GtkWidget *widge
 		case HINT_POSITION_CENTER: x = (x1 + x2) / 2; break;
 		default:
 			/* should not happen */
-			g_warning("Invalid parameter to pidgin_pidgin_dnd_hints_show_relative");
+			g_warning("Invalid parameter to pidgin_dnd_hints_show_relative");
 			break;
 	}
 
@@ -255,7 +255,7 @@ pidgin_pidgin_dnd_hints_show_relative(PidginDndHintWindowId id, GtkWidget *widge
 		case HINT_POSITION_CENTER: y = (y1 + y2) / 2; break;
 		default:
 			/* should not happen */
-			g_warning("Invalid parameter to pidgin_pidgin_dnd_hints_show_relative");
+			g_warning("Invalid parameter to pidgin_dnd_hints_show_relative");
 			break;
 	}
 
diff --git a/pidgin/gtkdnd-hints.h b/pidgin/gtkdnd-hints.h
index 41094897a1..78856c0ad1 100644
--- a/pidgin/gtkdnd-hints.h
+++ b/pidgin/gtkdnd-hints.h
@@ -88,14 +88,14 @@ void pidgin_dnd_hints_show(PidginDndHintWindowId id, gint x, gint y);
 void pidgin_dnd_hints_hide(PidginDndHintWindowId id);
 
 /**
- * pidgin_pidgin_dnd_hints_hide_all:
+ * pidgin_dnd_hints_hide_all:
  *
  * Hides all drag-and-drop hints.
  */
-void pidgin_pidgin_dnd_hints_hide_all(void);
+void pidgin_dnd_hints_hide_all(void);
 
 /**
- * pidgin_pidgin_dnd_hints_show_relative:
+ * pidgin_dnd_hints_show_relative:
  * @id:     The ID of the hint.
  * @widget: The widget that the hint is relative to.
  * @horiz:  The horizontal relative position.
@@ -103,7 +103,7 @@ void pidgin_pidgin_dnd_hints_hide_all(void);
  *
  * Shows a drag-and-drop hint relative to a widget.
  */
-void pidgin_pidgin_dnd_hints_show_relative(PidginDndHintWindowId id, GtkWidget *widget,
+void pidgin_dnd_hints_show_relative(PidginDndHintWindowId id, GtkWidget *widget,
 							 PidginDndHintPosition horiz, PidginDndHintPosition vert);
 
 G_END_DECLS