# HG changeset patch
# User Ankit Vani <a@nevitus.org>
# Date 1393369631 -19800
# Node ID 24b06c5e7760669c287dcc50c6ca2de471c879fd
# Parent  6bcd0955c8a42f729c2559277f54150c93a48e79
Renamed PidginWindow to PidginConvWindow so that introspection associates it with pidgin_conv_window_* API

diff -r 6bcd0955c8a4 -r 24b06c5e7760 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Wed Feb 26 04:06:48 2014 +0530
+++ b/pidgin/gtkconv.c	Wed Feb 26 04:37:11 2014 +0530
@@ -175,7 +175,7 @@
 static GtkWidget *invite_dialog = NULL;
 static GtkWidget *warn_close_dialog = NULL;
 
-static PidginWindow *hidden_convwin = NULL;
+static PidginConvWindow *hidden_convwin = NULL;
 static GList *window_list = NULL;
 
 /* Lists of status icons at all available sizes for use as window icons */
@@ -189,8 +189,8 @@
 
 static PurpleTheme *default_conv_theme = NULL;
 
-static gboolean update_send_to_selection(PidginWindow *win);
-static void generate_send_to_items(PidginWindow *win);
+static gboolean update_send_to_selection(PidginConvWindow *win);
+static void generate_send_to_items(PidginConvWindow *win);
 
 /* Prototypes. <-- because Paco-Paco hates this comment. */
 static void load_conv_theme(PidginConversation *gtkconv);
@@ -209,14 +209,14 @@
 static gboolean color_is_visible(GdkColor foreground, GdkColor background, guint color_contrast, guint brightness_contrast);
 static GtkTextTag *get_buddy_tag(PurpleChatConversation *chat, const char *who, PurpleMessageFlags flag, gboolean create);
 static void pidgin_conv_update_fields(PurpleConversation *conv, PidginConvFields fields);
-static void focus_out_from_menubar(GtkWidget *wid, PidginWindow *win);
-static void pidgin_conv_tab_pack(PidginWindow *win, PidginConversation *gtkconv);
+static void focus_out_from_menubar(GtkWidget *wid, PidginConvWindow *win);
+static void pidgin_conv_tab_pack(PidginConvWindow *win, PidginConversation *gtkconv);
 static gboolean infopane_press_cb(GtkWidget *widget, GdkEventButton *e, PidginConversation *conv);
 static void hide_conv(PidginConversation *gtkconv, gboolean closetimer);
 
-static void pidgin_conv_set_position_size(PidginWindow *win, int x, int y,
+static void pidgin_conv_set_position_size(PidginConvWindow *win, int x, int y,
 		int width, int height);
-static gboolean pidgin_conv_xy_to_right_infopane(PidginWindow *win, int x, int y);
+static gboolean pidgin_conv_xy_to_right_infopane(PidginConvWindow *win, int x, int y);
 
 static const GdkColor *get_nick_color(PidginConversation *gtkconv, const char *name)
 {
@@ -923,7 +923,7 @@
 	InviteBuddyInfo *info = NULL;
 
 	if (invite_dialog == NULL) {
-		PidginWindow *gtkwin;
+		PidginConvWindow *gtkwin;
 		GtkWidget *label;
 		GtkWidget *vbox, *hbox;
 		GtkWidget *table;
@@ -1101,7 +1101,7 @@
 static void
 menu_save_as_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
 	PurpleAccount *account = purple_conversation_get_account(conv);
 	PurpleBuddy *buddy = purple_blist_find_buddy(account, purple_conversation_get_name(conv));
@@ -1130,7 +1130,7 @@
 static void
 menu_view_log_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	PurpleConversation *conv;
 	PurpleLogType type;
 	PidginBuddyList *gtkblist;
@@ -1180,7 +1180,7 @@
 static void
 menu_clear_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	PurpleConversation *conv;
 
 	conv = pidgin_conv_window_get_active_conversation(win);
@@ -1190,7 +1190,7 @@
 static void
 menu_find_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *gtkwin = data;
+	PidginConvWindow *gtkwin = data;
 	PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(gtkwin);
 	gtk_widget_show_all(gtkconv->quickfind_container);
 	gtk_widget_grab_focus(gtkconv->quickfind_entry);
@@ -1200,7 +1200,7 @@
 static void
 menu_initiate_media_call_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = (PidginWindow *)data;
+	PidginConvWindow *win = (PidginConvWindow *)data;
 	PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
 	PurpleAccount *account = purple_conversation_get_account(conv);
 
@@ -1216,7 +1216,7 @@
 static void
 menu_send_file_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
 
 	if (PURPLE_IS_IM_CONVERSATION(conv)) {
@@ -1228,7 +1228,7 @@
 static void
 menu_get_attention_cb(GObject *obj, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
 
 	if (PURPLE_IS_IM_CONVERSATION(conv)) {
@@ -1245,7 +1245,7 @@
 static void
 menu_add_pounce_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	PurpleConversation *conv;
 
 	conv = pidgin_conv_window_get_active_gtkconv(win)->active_conv;
@@ -1257,7 +1257,7 @@
 static void
 menu_insert_link_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	PidginConversation *gtkconv;
 	PidginWebView *entry;
 
@@ -1270,7 +1270,7 @@
 static void
 menu_insert_image_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	PidginConversation *gtkconv;
 	PidginWebView *entry;
 
@@ -1283,7 +1283,7 @@
 static void
 menu_alias_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	PurpleConversation *conv;
 	PurpleAccount *account;
 	const char *name;
@@ -1310,7 +1310,7 @@
 static void
 menu_get_info_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	PurpleConversation *conv;
 
 	conv = pidgin_conv_window_get_active_conversation(win);
@@ -1321,7 +1321,7 @@
 static void
 menu_invite_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	PurpleConversation *conv;
 
 	conv = pidgin_conv_window_get_active_conversation(win);
@@ -1332,7 +1332,7 @@
 static void
 menu_block_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	PurpleConversation *conv;
 
 	conv = pidgin_conv_window_get_active_conversation(win);
@@ -1343,7 +1343,7 @@
 static void
 menu_unblock_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	PurpleConversation *conv;
 
 	conv = pidgin_conv_window_get_active_conversation(win);
@@ -1354,7 +1354,7 @@
 static void
 menu_add_remove_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	PurpleConversation *conv;
 
 	conv = pidgin_conv_window_get_active_conversation(win);
@@ -1399,7 +1399,7 @@
 static void
 menu_close_conv_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 
 	close_conv_cb(NULL, PIDGIN_CONVERSATION(pidgin_conv_window_get_active_conversation(win)));
 }
@@ -1407,7 +1407,7 @@
 static void
 menu_logging_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	PurpleConversation *conv;
 	gboolean logging;
 	PurpleBlistNode *node;
@@ -1469,7 +1469,7 @@
 static void
 menu_sounds_cb(GtkAction *action, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
 	PurpleBlistNode *node;
@@ -1886,7 +1886,7 @@
 {
 	PidginConversation *next_gtkconv = NULL, *most_active = NULL;
 	PidginUnseenState unseen_state = PIDGIN_UNSEEN_NONE;
-	PidginWindow *win;
+	PidginConvWindow *win;
 	int initial, i, total, diff;
 
 	win   = gtkconv->win;
@@ -2007,7 +2007,7 @@
 static gboolean
 conv_keypress_common(PidginConversation *gtkconv, GdkEventKey *event)
 {
-	PidginWindow *win;
+	PidginConvWindow *win;
 	int curconv;
 
 	win     = gtkconv->win;
@@ -2344,7 +2344,7 @@
 }
 
 static void
-regenerate_options_items(PidginWindow *win);
+regenerate_options_items(PidginConvWindow *win);
 
 void
 pidgin_conv_switch_active_conversation(PurpleConversation *conv)
@@ -2623,7 +2623,7 @@
 update_tab_icon(PurpleConversation *conv)
 {
 	PidginConversation *gtkconv;
-	PidginWindow *win;
+	PidginConvWindow *win;
 	GList *l;
 	GdkPixbuf *emblem = NULL;
 	const char *status = NULL;
@@ -3159,7 +3159,7 @@
 	return ret;
 }
 
-PidginWindow *
+PidginConvWindow *
 pidgin_conv_get_window(PidginConversation *gtkconv)
 {
 	g_return_val_if_fail(gtkconv != NULL, NULL);
@@ -3261,7 +3261,7 @@
 sound_method_pref_changed_cb(const char *name, PurplePrefType type,
 							 gconstpointer value, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	const char *method = value;
 
 	if (!strcmp(method, "none"))
@@ -3368,7 +3368,7 @@
 }
 
 static void
-regenerate_media_items(PidginWindow *win)
+regenerate_media_items(PidginConvWindow *win)
 {
 #ifdef USE_VV
 	PurpleAccount *account;
@@ -3422,7 +3422,7 @@
 }
 
 static void
-regenerate_attention_items(PidginWindow *win)
+regenerate_attention_items(PidginConvWindow *win)
 {
 	GtkWidget *attention;
 	GtkWidget *menu;
@@ -3480,7 +3480,7 @@
 }
 
 static void
-regenerate_options_items(PidginWindow *win)
+regenerate_options_items(PidginConvWindow *win)
 {
 	GtkWidget *menu;
 	PidginConversation *gtkconv;
@@ -3512,7 +3512,7 @@
 }
 
 static void
-remove_from_list(GtkWidget *widget, PidginWindow *win)
+remove_from_list(GtkWidget *widget, PidginConvWindow *win)
 {
 	GList *list = g_object_get_data(G_OBJECT(win->window), "plugin-actions");
 	list = g_list_remove(list, widget);
@@ -3520,7 +3520,7 @@
 }
 
 static void
-regenerate_plugins_items(PidginWindow *win)
+regenerate_plugins_items(PidginConvWindow *win)
 {
 	GList *action_items;
 	GtkWidget *menu;
@@ -3568,7 +3568,7 @@
 
 static void menubar_activated(GtkWidget *item, gpointer data)
 {
-	PidginWindow *win = data;
+	PidginConvWindow *win = data;
 	regenerate_media_items(win);
 	regenerate_options_items(win);
 	regenerate_plugins_items(win);
@@ -3581,7 +3581,7 @@
 }
 
 static void
-focus_out_from_menubar(GtkWidget *wid, PidginWindow *win)
+focus_out_from_menubar(GtkWidget *wid, PidginConvWindow *win)
 {
 	/* The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 	 * the 'Conversation' menu pops up. */
@@ -3592,7 +3592,7 @@
 }
 
 static GtkWidget *
-setup_menubar(PidginWindow *win)
+setup_menubar(PidginConvWindow *win)
 {
 	GtkAccelGroup *accel_group;
 	const char *method;
@@ -3779,7 +3779,7 @@
 static gboolean
 typing_animation(gpointer data) {
 	PidginConversation *gtkconv = data;
-	PidginWindow *gtkwin = gtkconv->win;
+	PidginConvWindow *gtkwin = gtkconv->win;
 	const char *stock_id = NULL;
 
 	if(gtkconv != pidgin_conv_window_get_active_gtkconv(gtkwin)) {
@@ -3887,7 +3887,7 @@
 }
 
 static gboolean
-update_send_to_selection(PidginWindow *win)
+update_send_to_selection(PidginConvWindow *win)
 {
 	PurpleAccount *account;
 	PurpleConversation *conv;
@@ -4074,7 +4074,7 @@
 }
 
 static void
-generate_send_to_items(PidginWindow *win)
+generate_send_to_items(PidginConvWindow *win)
 {
 	GtkWidget *menu;
 	GSList *group = NULL;
@@ -4193,7 +4193,7 @@
 }
 
 static void
-generate_e2ee_controls(PidginWindow *win)
+generate_e2ee_controls(PidginConvWindow *win)
 {
 	PidginConversation *gtkconv;
 	PurpleConversation *conv;
@@ -5749,7 +5749,7 @@
               PidginConversation *gtkconv)
 {
 	PurpleConversation *conv = gtkconv->active_conv;
-	PidginWindow *win = gtkconv->win;
+	PidginConvWindow *win = gtkconv->win;
 	PurpleIMConversation *im;
 	PurpleAccount *convaccount = purple_conversation_get_account(conv);
 	PurpleConnection *gc = purple_account_get_connection(convaccount);
@@ -5792,7 +5792,7 @@
 			 */
 			im = purple_conversations_find_im_with_account(buddyname, buddyaccount);
 			if (im != NULL) {
-				PidginWindow *oldwin;
+				PidginConvWindow *oldwin;
 				gtkconv = PIDGIN_CONVERSATION(PURPLE_CONVERSATION(im));
 				oldwin = gtkconv->win;
 				if (oldwin != win) {
@@ -5904,7 +5904,7 @@
 
 	for (list = pidgin_conv_windows_get_list(); list; list = list->next)
 	{
-		PidginWindow *win = list->data;
+		PidginConvWindow *win = list->data;
 		PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
 
 		if (!PURPLE_IS_IM_CONVERSATION(conv))
@@ -7185,7 +7185,7 @@
 pidgin_conv_has_focus(PurpleConversation *conv)
 {
 	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
-	PidginWindow *win;
+	PidginConvWindow *win;
 	gboolean has_focus;
 
 	win = gtkconv->win;
@@ -7362,7 +7362,7 @@
 static void
 gray_stuff_out(PidginConversation *gtkconv)
 {
-	PidginWindow *win;
+	PidginConvWindow *win;
 	PurpleConversation *conv = gtkconv->active_conv;
 	PurpleConnection *gc;
 	PurplePluginProtocolInfo *prpl_info = NULL;
@@ -7570,7 +7570,7 @@
 pidgin_conv_update_fields(PurpleConversation *conv, PidginConvFields fields)
 {
 	PidginConversation *gtkconv;
-	PidginWindow *win;
+	PidginConvWindow *win;
 
 	gtkconv = PIDGIN_CONVERSATION(conv);
 	if (!gtkconv)
@@ -7865,7 +7865,7 @@
 {
 	PidginConversation *gtkconv;
 	PurpleConversation *conv;
-	PidginWindow *win;
+	PidginConvWindow *win;
 
 	PurpleBuddy *buddy;
 
@@ -8040,7 +8040,7 @@
 void
 pidgin_conv_update_buttons_by_protocol(PurpleConversation *conv)
 {
-	PidginWindow *win;
+	PidginConvWindow *win;
 
 	if (!PIDGIN_IS_PIDGIN_CONVERSATION(conv))
 		return;
@@ -8052,7 +8052,7 @@
 }
 
 static gboolean
-pidgin_conv_xy_to_right_infopane(PidginWindow *win, int x, int y)
+pidgin_conv_xy_to_right_infopane(PidginConvWindow *win, int x, int y)
 {
 	gint pane_x, pane_y, x_rel;
 	PidginConversation *gtkconv;
@@ -8067,7 +8067,7 @@
 }
 
 int
-pidgin_conv_get_tab_at_xy(PidginWindow *win, int x, int y, gboolean *to_right)
+pidgin_conv_get_tab_at_xy(PidginConvWindow *win, int x, int y, gboolean *to_right)
 {
 	gint nb_x, nb_y, x_rel, y_rel;
 	GtkNotebook *notebook;
@@ -8183,7 +8183,7 @@
 {
 	GList *gtkwins, *gtkconvs;
 	GtkPositionType pos;
-	PidginWindow *gtkwin;
+	PidginConvWindow *gtkwin;
 
 	pos = GPOINTER_TO_INT(value);
 
@@ -8203,7 +8203,7 @@
 	GList *l;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
-	PidginWindow *win;
+	PidginConvWindow *win;
 
 	for (l = purple_conversations_get_all(); l != NULL; l = l->next)
 	{
@@ -8235,7 +8235,7 @@
 	GList *l;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
-	PidginWindow *win;
+	PidginConvWindow *win;
 
 	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons"))
 		return;
@@ -8278,7 +8278,7 @@
 
 	/* Make the tabs show/hide correctly */
 	for (l = pidgin_conv_windows_get_list(); l != NULL; l = l->next) {
-		PidginWindow *win = l->data;
+		PidginConvWindow *win = l->data;
 		if (pidgin_conv_window_get_gtkconv_count(win) == 1)
 			gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook),
 						   GPOINTER_TO_INT(value) == 0);
@@ -8862,8 +8862,8 @@
 	 **********************************************************************/
 	purple_signal_register(handle, "conversation-dragging",
 	                     purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2,
-	                     G_TYPE_POINTER, /* pointer to a (PidginWindow *) */
-	                     G_TYPE_POINTER); /* pointer to a (PidginWindow *) */
+	                     G_TYPE_POINTER, /* pointer to a (PidginConvWindow *) */
+	                     G_TYPE_POINTER); /* pointer to a (PidginConvWindow *) */
 
 	purple_signal_register(handle, "conversation-timestamp",
 #if SIZEOF_TIME_T == 4
@@ -9148,7 +9148,7 @@
 #include "pidginstock.h"
 
 static void
-do_close(GtkWidget *w, int resp, PidginWindow *win)
+do_close(GtkWidget *w, int resp, PidginConvWindow *win)
 {
 	gtk_widget_destroy(warn_close_dialog);
 	warn_close_dialog = NULL;
@@ -9158,7 +9158,7 @@
 }
 
 static void
-build_warn_close_dialog(PidginWindow *gtkwin)
+build_warn_close_dialog(PidginConvWindow *gtkwin)
 {
 	GtkWidget *label, *vbox, *hbox, *img;
 
@@ -9213,7 +9213,7 @@
 static gboolean
 close_win_cb(GtkWidget *w, GdkEventAny *e, gpointer d)
 {
-	PidginWindow *win = d;
+	PidginConvWindow *win = d;
 	GList *l;
 
 	/* If there are unread messages then show a warning dialog */
@@ -9299,7 +9299,7 @@
 static gboolean
 focus_win_cb(GtkWidget *w, GdkEventFocus *e, gpointer d)
 {
-	PidginWindow *win = d;
+	PidginConvWindow *win = d;
 	PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(win);
 
 	if (gtkconv)
@@ -9309,7 +9309,7 @@
 }
 
 static void
-notebook_init_grab(PidginWindow *gtkwin, GtkWidget *widget, GdkEvent *event)
+notebook_init_grab(PidginConvWindow *gtkwin, GtkWidget *widget, GdkEvent *event)
 {
 	static GdkCursor *cursor = NULL;
 #if GTK_CHECK_VERSION(3,0,0)
@@ -9349,7 +9349,7 @@
 }
 
 static gboolean
-notebook_motion_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
+notebook_motion_cb(GtkWidget *widget, GdkEventButton *e, PidginConvWindow *win)
 {
 
 	/*
@@ -9367,7 +9367,7 @@
 		    }
 	}
 	else { /* Otherwise, draw the arrows. */
-		PidginWindow *dest_win;
+		PidginConvWindow *dest_win;
 		GtkNotebook *dest_notebook;
 		GtkWidget *tab;
 		gint page_num;
@@ -9429,7 +9429,7 @@
 }
 
 static gboolean
-notebook_leave_cb(GtkWidget *widget, GdkEventCrossing *e, PidginWindow *win)
+notebook_leave_cb(GtkWidget *widget, GdkEventCrossing *e, PidginConvWindow *win)
 {
 	if (win->in_drag)
 		return FALSE;
@@ -9514,7 +9514,7 @@
 }
 
 static gboolean
-notebook_press_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
+notebook_press_cb(GtkWidget *widget, GdkEventButton *e, PidginConvWindow *win)
 {
 	gint nb_x, nb_y;
 	int tab_clicked;
@@ -9602,9 +9602,9 @@
 }
 
 static gboolean
-notebook_release_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
-{
-	PidginWindow *dest_win;
+notebook_release_cb(GtkWidget *widget, GdkEventButton *e, PidginConvWindow *win)
+{
+	PidginConvWindow *dest_win;
 	GtkNotebook *dest_notebook;
 	PidginConversation *active_gtkconv;
 	PidginConversation *gtkconv;
@@ -9737,7 +9737,7 @@
 before_switch_conv_cb(GtkNotebook *notebook, GtkWidget *page, gint page_num,
                       gpointer user_data)
 {
-	PidginWindow *win;
+	PidginConvWindow *win;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
 
@@ -9760,15 +9760,15 @@
 }
 
 static void
-close_window(GtkWidget *w, PidginWindow *win)
+close_window(GtkWidget *w, PidginConvWindow *win)
 {
 	close_win_cb(w, NULL, win);
 }
 
 static void
-detach_tab_cb(GtkWidget *w, PidginWindow *win)
-{
-	PidginWindow *new_window;
+detach_tab_cb(GtkWidget *w, PidginConvWindow *win)
+{
+	PidginConvWindow *new_window;
 	PidginConversation *gtkconv;
 
 	gtkconv = win->clicked_tab;
@@ -9788,7 +9788,7 @@
 }
 
 static void
-close_others_cb(GtkWidget *w, PidginWindow *win)
+close_others_cb(GtkWidget *w, PidginConvWindow *win)
 {
 	GList *iter;
 	PidginConversation *gtkconv;
@@ -9811,7 +9811,7 @@
 }
 
 static void
-close_tab_cb(GtkWidget *w, PidginWindow *win)
+close_tab_cb(GtkWidget *w, PidginConvWindow *win)
 {
 	PidginConversation *gtkconv;
 
@@ -9856,7 +9856,7 @@
 
 static void
 notebook_add_tab_to_menu_cb(GtkNotebook *notebook, GtkWidget *child,
-                            guint page_num, PidginWindow *win)
+                            guint page_num, PidginConvWindow *win)
 {
 	GtkWidget *item;
 	GtkWidget *label;
@@ -9880,7 +9880,7 @@
 
 static void
 notebook_remove_tab_from_menu_cb(GtkNotebook *notebook, GtkWidget *child,
-                                 guint page_num, PidginWindow *win)
+                                 guint page_num, PidginConvWindow *win)
 {
 	GtkWidget *item;
 
@@ -9894,7 +9894,7 @@
 
 static void
 notebook_reorder_tab_in_menu_cb(GtkNotebook *notebook, GtkWidget *child,
-                                guint page_num, PidginWindow *win)
+                                guint page_num, PidginConvWindow *win)
 {
 	GtkWidget *item;
 
@@ -9904,7 +9904,7 @@
 
 static gboolean
 notebook_right_click_menu_cb(GtkNotebook *notebook, GdkEventButton *event,
-                             PidginWindow *win)
+                             PidginConvWindow *win)
 {
 	GtkWidget *menu;
 	PidginConversation *gtkconv;
@@ -10043,7 +10043,7 @@
 }
 
 static gboolean
-window_keypress_cb(GtkWidget *widget, GdkEventKey *event, PidginWindow *win)
+window_keypress_cb(GtkWidget *widget, GdkEventKey *event, PidginConvWindow *win)
 {
 	PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(win);
 
@@ -10054,7 +10054,7 @@
 switch_conv_cb(GtkNotebook *notebook, GtkWidget *page, gint page_num,
                gpointer user_data)
 {
-	PidginWindow *win;
+	PidginConvWindow *win;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
 	const char *sound_method;
@@ -10179,7 +10179,7 @@
 }
 
 static void
-pidgin_conv_set_position_size(PidginWindow *win, int conv_x, int conv_y,
+pidgin_conv_set_position_size(PidginConvWindow *win, int conv_x, int conv_y,
 		int conv_width, int conv_height)
 {
 	/* if the window exists, is hidden, we're saving positions, and the
@@ -10207,7 +10207,7 @@
 }
 
 static void
-pidgin_conv_restore_position(PidginWindow *win) {
+pidgin_conv_restore_position(PidginConvWindow *win) {
 	pidgin_conv_set_position_size(win,
 		purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/x"),
 		purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/y"),
@@ -10215,10 +10215,10 @@
 		purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/height"));
 }
 
-PidginWindow *
+PidginConvWindow *
 pidgin_conv_window_new()
 {
-	PidginWindow *win;
+	PidginConvWindow *win;
 	GtkPositionType pos;
 	GtkWidget *testidea;
 	GtkWidget *menubar;
@@ -10226,8 +10226,8 @@
 	GtkWidget *item;
 	GdkModifierType state;
 
-	win = g_malloc0(sizeof(PidginWindow));
-	win->menu = g_malloc0(sizeof(PidginWindowMenu));
+	win = g_malloc0(sizeof(PidginConvWindow));
+	win->menu = g_malloc0(sizeof(PidginConvWindowMenu));
 
 	window_list = g_list_append(window_list, win);
 
@@ -10359,7 +10359,7 @@
 }
 
 void
-pidgin_conv_window_destroy(PidginWindow *win)
+pidgin_conv_window_destroy(PidginConvWindow *win)
 {
 	if (win->gtkconvs) {
 		GList *iter = win->gtkconvs;
@@ -10388,25 +10388,25 @@
 }
 
 void
-pidgin_conv_window_show(PidginWindow *win)
+pidgin_conv_window_show(PidginConvWindow *win)
 {
 	gtk_widget_show(win->window);
 }
 
 void
-pidgin_conv_window_hide(PidginWindow *win)
+pidgin_conv_window_hide(PidginConvWindow *win)
 {
 	gtk_widget_hide(win->window);
 }
 
 void
-pidgin_conv_window_raise(PidginWindow *win)
+pidgin_conv_window_raise(PidginConvWindow *win)
 {
 	gdk_window_raise(GDK_WINDOW(gtk_widget_get_window(win->window)));
 }
 
 void
-pidgin_conv_window_switch_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
+pidgin_conv_window_switch_gtkconv(PidginConvWindow *win, PidginConversation *gtkconv)
 {
 	gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook),
 	                              gtk_notebook_page_num(GTK_NOTEBOOK(win->notebook),
@@ -10480,7 +10480,7 @@
 #endif
 
 void
-pidgin_conv_window_add_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
+pidgin_conv_window_add_gtkconv(PidginConvWindow *win, PidginConversation *gtkconv)
 {
 	PurpleConversation *conv = gtkconv->active_conv;
 	PidginConversation *focus_gtkconv;
@@ -10557,7 +10557,7 @@
 }
 
 static void
-pidgin_conv_tab_pack(PidginWindow *win, PidginConversation *gtkconv)
+pidgin_conv_tab_pack(PidginConvWindow *win, PidginConversation *gtkconv)
 {
 	gboolean tabs_side = FALSE;
 	gint angle = 0;
@@ -10655,7 +10655,7 @@
 }
 
 void
-pidgin_conv_window_remove_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
+pidgin_conv_window_remove_gtkconv(PidginConvWindow *win, PidginConversation *gtkconv)
 {
 	unsigned int index;
 
@@ -10678,7 +10678,7 @@
 }
 
 PidginConversation *
-pidgin_conv_window_get_gtkconv_at_index(const PidginWindow *win, int index)
+pidgin_conv_window_get_gtkconv_at_index(const PidginConvWindow *win, int index)
 {
 	GtkWidget *tab_cont;
 
@@ -10689,7 +10689,7 @@
 }
 
 PidginConversation *
-pidgin_conv_window_get_active_gtkconv(const PidginWindow *win)
+pidgin_conv_window_get_active_gtkconv(const PidginConvWindow *win)
 {
 	int index;
 	GtkWidget *tab_cont;
@@ -10705,7 +10705,7 @@
 
 
 PurpleConversation *
-pidgin_conv_window_get_active_conversation(const PidginWindow *win)
+pidgin_conv_window_get_active_conversation(const PidginConvWindow *win)
 {
 	PidginConversation *gtkconv;
 
@@ -10720,7 +10720,7 @@
 }
 
 gboolean
-pidgin_conv_window_has_focus(PidginWindow *win)
+pidgin_conv_window_has_focus(PidginConvWindow *win)
 {
 	gboolean has_focus = FALSE;
 
@@ -10729,10 +10729,10 @@
 	return has_focus;
 }
 
-PidginWindow *
+PidginConvWindow *
 pidgin_conv_window_get_at_event(GdkEvent *event)
 {
-	PidginWindow *win;
+	PidginConvWindow *win;
 	GdkWindow *gdkwin;
 	GList *l;
 	int x, y;
@@ -10758,22 +10758,22 @@
 }
 
 GList *
-pidgin_conv_window_get_gtkconvs(PidginWindow *win)
+pidgin_conv_window_get_gtkconvs(PidginConvWindow *win)
 {
 	return win->gtkconvs;
 }
 
 guint
-pidgin_conv_window_get_gtkconv_count(PidginWindow *win)
+pidgin_conv_window_get_gtkconv_count(PidginConvWindow *win)
 {
 	return g_list_length(win->gtkconvs);
 }
 
-PidginWindow *
+PidginConvWindow *
 pidgin_conv_window_first_im(void)
 {
 	GList *wins, *convs;
-	PidginWindow *win;
+	PidginConvWindow *win;
 	PidginConversation *conv;
 
 	for (wins = pidgin_conv_windows_get_list(); wins != NULL; wins = wins->next) {
@@ -10793,11 +10793,11 @@
 	return NULL;
 }
 
-PidginWindow *
+PidginConvWindow *
 pidgin_conv_window_last_im(void)
 {
 	GList *wins, *convs;
-	PidginWindow *win;
+	PidginConvWindow *win;
 	PidginConversation *conv;
 
 	for (wins = g_list_last(pidgin_conv_windows_get_list());
@@ -10820,11 +10820,11 @@
 	return NULL;
 }
 
-PidginWindow *
+PidginConvWindow *
 pidgin_conv_window_first_chat(void)
 {
 	GList *wins, *convs;
-	PidginWindow *win;
+	PidginConvWindow *win;
 	PidginConversation *conv;
 
 	for (wins = pidgin_conv_windows_get_list(); wins != NULL; wins = wins->next) {
@@ -10844,11 +10844,11 @@
 	return NULL;
 }
 
-PidginWindow *
+PidginConvWindow *
 pidgin_conv_window_last_chat(void)
 {
 	GList *wins, *convs;
-	PidginWindow *win;
+	PidginConvWindow *win;
 	PidginConversation *conv;
 
 	for (wins = g_list_last(pidgin_conv_windows_get_list());
@@ -10890,7 +10890,7 @@
 static void
 conv_placement_last_created_win(PidginConversation *conv)
 {
-	PidginWindow *win;
+	PidginConvWindow *win;
 
 	GList *l = g_list_last(pidgin_conv_windows_get_list());
 	win = l ? l->data : NULL;;
@@ -10958,7 +10958,7 @@
 static void
 conv_placement_last_created_win_type(PidginConversation *conv)
 {
-	PidginWindow *win;
+	PidginConvWindow *win;
 
 	if (PURPLE_IS_IM_CONVERSATION(conv->active_conv))
 		win = pidgin_conv_window_last_im();
@@ -10996,7 +10996,7 @@
 static void
 conv_placement_new_window(PidginConversation *conv)
 {
-	PidginWindow *win;
+	PidginConvWindow *win;
 
 	win = pidgin_conv_window_new();
 
@@ -11050,7 +11050,7 @@
 
 	/* Go through the list of IMs and find one with this group. */
 	for (wl = pidgin_conv_windows_get_list(); wl != NULL; wl = wl->next) {
-		PidginWindow *win2;
+		PidginConvWindow *win2;
 		PidginConversation *conv2;
 		PurpleGroup *group2 = NULL;
 
@@ -11086,7 +11086,7 @@
 
 	/* Go through the list of IMs and find one with this group. */
 	for (wins = pidgin_conv_windows_get_list(); wins != NULL; wins = wins->next) {
-		PidginWindow *win2;
+		PidginConvWindow *win2;
 		PidginConversation *conv2;
 
 		win2 = wins->data;
@@ -11360,10 +11360,10 @@
 }
 
 /**************************************************************************
- * PidginWindow GBoxed code
+ * PidginConvWindow GBoxed code
  **************************************************************************/
-static PidginWindow *
-pidgin_window_ref(PidginWindow *win)
+static PidginConvWindow *
+pidgin_conv_window_ref(PidginConvWindow *win)
 {
 	g_return_val_if_fail(win != NULL, NULL);
 
@@ -11373,7 +11373,7 @@
 }
 
 static void
-pidgin_window_unref(PidginWindow *win)
+pidgin_conv_window_unref(PidginConvWindow *win)
 {
 	g_return_if_fail(win != NULL);
 	g_return_if_fail(win->box_count >= 0);
@@ -11383,14 +11383,14 @@
 }
 
 GType
-pidgin_window_get_type(void)
+pidgin_conv_window_get_type(void)
 {
 	static GType type = 0;
 
 	if (type == 0) {
-		type = g_boxed_type_register_static("PidginWindow",
-				(GBoxedCopyFunc)pidgin_window_ref,
-				(GBoxedFreeFunc)pidgin_window_unref);
+		type = g_boxed_type_register_static("PidginConvWindow",
+				(GBoxedCopyFunc)pidgin_conv_window_ref,
+				(GBoxedFreeFunc)pidgin_conv_window_unref);
 	}
 
 	return type;
diff -r 6bcd0955c8a4 -r 24b06c5e7760 pidgin/gtkconv.h
--- a/pidgin/gtkconv.h	Wed Feb 26 04:06:48 2014 +0530
+++ b/pidgin/gtkconv.h	Wed Feb 26 04:37:11 2014 +0530
@@ -92,7 +92,7 @@
 	GList *convs;
 	GList *send_history;
 
-	PidginWindow *win;
+	PidginConvWindow *win;
 
 	gboolean make_sound;
 
@@ -293,10 +293,10 @@
  */
 gboolean pidgin_conv_attach_to_conversation(PurpleConversation *conv);
 
-PidginWindow *pidgin_conv_get_window(PidginConversation *gtkconv);
+PidginConvWindow *pidgin_conv_get_window(PidginConversation *gtkconv);
 GdkPixbuf *pidgin_conv_get_tab_icon(PurpleConversation *conv, gboolean small_icon);
 void pidgin_conv_new(PurpleConversation *conv);
-int pidgin_conv_get_tab_at_xy(PidginWindow *win, int x, int y, gboolean *to_right);
+int pidgin_conv_get_tab_at_xy(PidginConvWindow *win, int x, int y, gboolean *to_right);
 gboolean pidgin_conv_is_hidden(PidginConversation *gtkconv);
 
 /**************************************************************************/
diff -r 6bcd0955c8a4 -r 24b06c5e7760 pidgin/gtkconvwin.h
--- a/pidgin/gtkconvwin.h	Wed Feb 26 04:06:48 2014 +0530
+++ b/pidgin/gtkconvwin.h	Wed Feb 26 04:37:11 2014 +0530
@@ -28,17 +28,17 @@
  * @title: Conversation Window API
  */
 
-#define PIDGIN_TYPE_WINDOW (pidgin_window_get_type())
+#define PIDGIN_TYPE_CONV_WINDOW (pidgin_conv_window_get_type())
 
-typedef struct _PidginWindowMenu   PidginWindowMenu;
-typedef struct _PidginWindow       PidginWindow;
+typedef struct _PidginConvWindowMenu   PidginConvWindowMenu;
+typedef struct _PidginConvWindow       PidginConvWindow;
 
 
 /**************************************************************************
  * Structures
  **************************************************************************/
 
-struct _PidginWindowMenu
+struct _PidginConvWindowMenu
 {
 	GtkUIManager *ui;
 	GtkWidget *menubar;
@@ -77,7 +77,7 @@
 };
 
 /**
- * PidginWindow:
+ * PidginConvWindow:
  * @window:        The window.
  * @notebook:      The notebook of conversations.
  * @notebook_menu: The menu on the notebook.
@@ -86,7 +86,7 @@
  * A GTK+ representation of a graphical window containing one or more
  * conversations.
  */
-struct _PidginWindow
+struct _PidginConvWindow
 {
 	/*< private >*/
 	gint box_count;
@@ -98,7 +98,7 @@
 	PidginConversation *clicked_tab;
 	GList *gtkconvs;
 
-	PidginWindowMenu *menu;
+	PidginConvWindowMenu *menu;
 
 	/* Tab dragging stuff. */
 	gboolean in_drag;
@@ -119,29 +119,30 @@
  **************************************************************************/
 
 /**
- * pidgin_window_get_type:
+ * pidgin_conv_window_get_type:
  *
- * Returns: The #GType for the #PidginWindow boxed structure.
+ * Returns: The #GType for the #PidginConvWindow boxed structure.
  */
-GType pidgin_window_get_type(void);
+GType pidgin_conv_window_get_type(void);
 
 /**
  * pidgin_conv_window_new:
  *
- * Returns: A new #PidginWindow.
+ * Returns: A new #PidginConvWindow.
  */
-PidginWindow * pidgin_conv_window_new(void);
+PidginConvWindow * pidgin_conv_window_new(void);
 
 /**
  * pidgin_conv_window_destroy:
  * @win: The conversation window to destroy
  */
-void pidgin_conv_window_destroy(PidginWindow *win);
+void pidgin_conv_window_destroy(PidginConvWindow *win);
 
 /**
  * pidgin_conv_windows_get_list:
  *
- * Returns: (transfer none) (element-type Pidgin.Window): The list of windows.
+ * Returns: (transfer none) (element-type Pidgin.ConvWindow): The list of
+ *          windows.
  */
 GList *pidgin_conv_windows_get_list(void);
 
@@ -149,40 +150,40 @@
  * pidgin_conv_window_show:
  * @win: The conversation window to show
  */
-void pidgin_conv_window_show(PidginWindow *win);
+void pidgin_conv_window_show(PidginConvWindow *win);
 
 /**
  * pidgin_conv_window_hide:
  * @win: The conversation window to hide
  */
-void pidgin_conv_window_hide(PidginWindow *win);
+void pidgin_conv_window_hide(PidginConvWindow *win);
 
 /**
  * pidgin_conv_window_raise:
  * @win: The conversation window to raise
  */
-void pidgin_conv_window_raise(PidginWindow *win);
+void pidgin_conv_window_raise(PidginConvWindow *win);
 
 /**
  * pidgin_conv_window_switch_gtkconv:
  * @win:     The conversation window
  * @gtkconv: The pidgin conversation to switch to
  */
-void pidgin_conv_window_switch_gtkconv(PidginWindow *win, PidginConversation *gtkconv);
+void pidgin_conv_window_switch_gtkconv(PidginConvWindow *win, PidginConversation *gtkconv);
 
 /**
  * pidgin_conv_window_add_gtkconv:
  * @win:     The conversation window
  * @gtkconv: The pidgin conversation to add
  */
-void pidgin_conv_window_add_gtkconv(PidginWindow *win, PidginConversation *gtkconv);
+void pidgin_conv_window_add_gtkconv(PidginConvWindow *win, PidginConversation *gtkconv);
 
 /**
  * pidgin_conv_window_remove_gtkconv:
  * @win:     The conversation window
  * @gtkconv: The pidgin conversation to remove
  */
-void pidgin_conv_window_remove_gtkconv(PidginWindow *win, PidginConversation *gtkconv);
+void pidgin_conv_window_remove_gtkconv(PidginConvWindow *win, PidginConversation *gtkconv);
 
 /**
  * pidgin_conv_window_get_gtkconv_at_index:
@@ -191,7 +192,7 @@
  *
  * Returns: The conversation in @win at @index
  */
-PidginConversation *pidgin_conv_window_get_gtkconv_at_index(const PidginWindow *win, int index);
+PidginConversation *pidgin_conv_window_get_gtkconv_at_index(const PidginConvWindow *win, int index);
 
 /**
  * pidgin_conv_window_get_active_gtkconv:
@@ -199,7 +200,7 @@
  *
  * Returns: The active #PidginConversation in @win.
  */
-PidginConversation *pidgin_conv_window_get_active_gtkconv(const PidginWindow *win);
+PidginConversation *pidgin_conv_window_get_active_gtkconv(const PidginConvWindow *win);
 
 /**
  * pidgin_conv_window_get_active_conversation:
@@ -207,7 +208,7 @@
  *
  * Returns: The active #PurpleConversation in @win.
  */
-PurpleConversation *pidgin_conv_window_get_active_conversation(const PidginWindow *win);
+PurpleConversation *pidgin_conv_window_get_active_conversation(const PidginConvWindow *win);
 
 /**
  * pidgin_conv_window_is_active_conversation:
@@ -223,15 +224,15 @@
  *
  * Returns: %TRUE if @win has focus, %FALSE otherwise.
  */
-gboolean pidgin_conv_window_has_focus(PidginWindow *win);
+gboolean pidgin_conv_window_has_focus(PidginConvWindow *win);
 
 /**
  * pidgin_conv_window_get_at_event:
  * @event: The event
  *
- * Returns: The #PidginWindow on which @event occured.
+ * Returns: The #PidginConvWindow on which @event occured.
  */
-PidginWindow *pidgin_conv_window_get_at_event(GdkEvent *event);
+PidginConvWindow *pidgin_conv_window_get_at_event(GdkEvent *event);
 
 /**
  * pidgin_conv_window_get_gtkconvs:
@@ -240,7 +241,7 @@
  * Returns: (transfer none) (element-type Pidgin.Conversation): A list of
  *          #PidginConversation's in @win.
  */
-GList *pidgin_conv_window_get_gtkconvs(PidginWindow *win);
+GList *pidgin_conv_window_get_gtkconvs(PidginConvWindow *win);
 
 /**
  * pidgin_conv_window_get_gtkconv_count:
@@ -248,35 +249,35 @@
  *
  * Returns: The number of conversations in @win
  */
-guint pidgin_conv_window_get_gtkconv_count(PidginWindow *win);
+guint pidgin_conv_window_get_gtkconv_count(PidginConvWindow *win);
 
 /**
  * pidgin_conv_window_first_im:
  *
  * Returns: The window which has the first IM, %NULL if no IM is found.
  */
-PidginWindow *pidgin_conv_window_first_im(void);
+PidginConvWindow *pidgin_conv_window_first_im(void);
 
 /**
  * pidgin_conv_window_last_im:
  *
  * Returns: The window which has the last IM, %NULL if no IM is found.
  */
-PidginWindow *pidgin_conv_window_last_im(void);
+PidginConvWindow *pidgin_conv_window_last_im(void);
 
 /**
  * pidgin_conv_window_first_chat:
  *
  * Returns: The window which has the first chat, %NULL if no chat is found.
  */
-PidginWindow *pidgin_conv_window_first_chat(void);
+PidginConvWindow *pidgin_conv_window_first_chat(void);
 
 /**
  * pidgin_conv_window_last_chat:
  *
  * Returns: The window which has the last chat, %NULL if no chat is found.
  */
-PidginWindow *pidgin_conv_window_last_chat(void);
+PidginConvWindow *pidgin_conv_window_last_chat(void);
 
 /**************************************************************************
  * GTK+ Conversation Placement API
diff -r 6bcd0955c8a4 -r 24b06c5e7760 pidgin/plugins/extplacement.c
--- a/pidgin/plugins/extplacement.c	Wed Feb 26 04:06:48 2014 +0530
+++ b/pidgin/plugins/extplacement.c	Wed Feb 26 04:37:11 2014 +0530
@@ -31,7 +31,7 @@
 static void
 conv_placement_by_number(PidginConversation *conv)
 {
-	PidginWindow *win = NULL;
+	PidginConvWindow *win = NULL;
 	GList *wins = NULL;
 
 	if (purple_prefs_get_bool("/plugins/gtk/extplacement/placement_number_separate"))
diff -r 6bcd0955c8a4 -r 24b06c5e7760 pidgin/plugins/gestures/gestures.c
--- a/pidgin/plugins/gestures/gestures.c	Wed Feb 26 04:06:48 2014 +0530
+++ b/pidgin/plugins/gestures/gestures.c	Wed Feb 26 04:37:11 2014 +0530
@@ -54,7 +54,7 @@
 }
 
 static void
-switch_page(PidginWindow *win, GtkDirectionType dir)
+switch_page(PidginConvWindow *win, GtkDirectionType dir)
 {
 	int count, current;
 
@@ -79,7 +79,7 @@
 {
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
-	PidginWindow *win;
+	PidginConvWindow *win;
 
 	conv  = (PurpleConversation *)data;
 	gtkconv = PIDGIN_CONVERSATION(conv);
@@ -92,7 +92,7 @@
 stroke_next_tab(GtkWidget *widget, void *data)
 {
 	PurpleConversation *conv;
-	PidginWindow *win;
+	PidginConvWindow *win;
 
 	conv  = (PurpleConversation *)data;
 	win   = PIDGIN_CONVERSATION(conv)->win;
@@ -103,7 +103,7 @@
 static void
 stroke_new_win(GtkWidget *widget, void *data)
 {
-	PidginWindow *new_win, *old_win;
+	PidginConvWindow *new_win, *old_win;
 	PurpleConversation *conv;
 
 	conv    = (PurpleConversation *)data;
diff -r 6bcd0955c8a4 -r 24b06c5e7760 pidgin/plugins/gtk-signals-test.c
--- a/pidgin/plugins/gtk-signals-test.c	Wed Feb 26 04:06:48 2014 +0530
+++ b/pidgin/plugins/gtk-signals-test.c	Wed Feb 26 04:37:11 2014 +0530
@@ -57,7 +57,7 @@
  * Conversation subsystem signal callbacks
  **************************************************************************/
 static void
-conversation_dragging_cb(PidginWindow *source, PidginWindow *destination) {
+conversation_dragging_cb(PidginConvWindow *source, PidginConvWindow *destination) {
 	purple_debug_info("gtk-signal-test", "conversation dragging cb\n");
 }
 
diff -r 6bcd0955c8a4 -r 24b06c5e7760 pidgin/plugins/iconaway.c
--- a/pidgin/plugins/iconaway.c	Wed Feb 26 04:06:48 2014 +0530
+++ b/pidgin/plugins/iconaway.c	Wed Feb 26 04:37:11 2014 +0530
@@ -34,7 +34,7 @@
 iconify_windows(PurpleAccount *account, PurpleStatus *old, PurpleStatus *newstatus)
 {
 	PurplePresence *presence;
-	PidginWindow *win;
+	PidginConvWindow *win;
 	GList *windows;
 
 	presence = purple_status_get_presence(newstatus);
@@ -48,7 +48,7 @@
 		 windows != NULL;
 		 windows = windows->next) {
 
-		win = (PidginWindow *)windows->data;
+		win = (PidginConvWindow *)windows->data;
 
 		gtk_window_iconify(GTK_WINDOW(win->window));
 	}
diff -r 6bcd0955c8a4 -r 24b06c5e7760 pidgin/plugins/markerline.c
--- a/pidgin/plugins/markerline.c	Wed Feb 26 04:06:48 2014 +0530
+++ b/pidgin/plugins/markerline.c	Wed Feb 26 04:37:11 2014 +0530
@@ -66,7 +66,7 @@
 }
 
 static gboolean
-focus_removed(GtkWidget *widget, GdkEventVisibility *event, PidginWindow *win)
+focus_removed(GtkWidget *widget, GdkEventVisibility *event, PidginConvWindow *win)
 {
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
@@ -81,7 +81,7 @@
 }
 
 static void
-page_switched(GtkWidget *widget, GtkWidget *page, gint num, PidginWindow *win)
+page_switched(GtkWidget *widget, GtkWidget *page, gint num, PidginConvWindow *win)
 {
 	focus_removed(NULL, NULL, win);
 }
@@ -95,7 +95,7 @@
 }
 
 static void
-detach_from_pidgin_window(PidginWindow *win, gpointer null)
+detach_from_pidgin_window(PidginConvWindow *win, gpointer null)
 {
 	g_list_foreach(pidgin_conv_window_get_gtkconvs(win), (GFunc)detach_from_gtkconv, NULL);
 	g_signal_handlers_disconnect_by_func(G_OBJECT(win->notebook), page_switched, win);
@@ -110,7 +110,7 @@
 }
 
 static void
-attach_to_pidgin_window(PidginWindow *win, gpointer null)
+attach_to_pidgin_window(PidginConvWindow *win, gpointer null)
 {
 	g_list_foreach(pidgin_conv_window_get_gtkconvs(win), (GFunc)attach_to_gtkconv, NULL);
 
@@ -136,7 +136,7 @@
 static void
 conv_created(PidginConversation *gtkconv, gpointer null)
 {
-	PidginWindow *win;
+	PidginConvWindow *win;
 
 	win = pidgin_conv_get_window(gtkconv);
 	if (!win)
diff -r 6bcd0955c8a4 -r 24b06c5e7760 pidgin/plugins/notify.c
--- a/pidgin/plugins/notify.c	Wed Feb 26 04:06:48 2014 +0530
+++ b/pidgin/plugins/notify.c	Wed Feb 26 04:37:11 2014 +0530
@@ -107,7 +107,7 @@
 
 /* notification set/unset */
 static int notify(PurpleConversation *conv, gboolean increment);
-static void notify_win(PidginWindow *purplewin, PurpleConversation *conv);
+static void notify_win(PidginConvWindow *purplewin, PurpleConversation *conv);
 static void unnotify(PurpleConversation *conv, gboolean reset);
 static int unnotify_cb(GtkWidget *widget, gpointer data,
                        PurpleConversation *conv);
@@ -122,19 +122,19 @@
 static void apply_notify(void);
 
 /* string function */
-static void handle_string(PidginWindow *purplewin);
+static void handle_string(PidginConvWindow *purplewin);
 
 /* count_title function */
-static void handle_count_title(PidginWindow *purplewin);
+static void handle_count_title(PidginConvWindow *purplewin);
 
 /* count_xprop function */
-static void handle_count_xprop(PidginWindow *purplewin);
+static void handle_count_xprop(PidginConvWindow *purplewin);
 
 /* urgent function */
-static void handle_urgent(PidginWindow *purplewin, gboolean set);
+static void handle_urgent(PidginConvWindow *purplewin, gboolean set);
 
 /* raise function */
-static void handle_raise(PidginWindow *purplewin);
+static void handle_raise(PidginConvWindow *purplewin);
 
 /* present function */
 static void handle_present(PurpleConversation *conv);
@@ -143,7 +143,7 @@
 /* Begin doing stuff below this line... */
 /****************************************/
 static guint
-count_messages(PidginWindow *purplewin)
+count_messages(PidginConvWindow *purplewin)
 {
 	guint count = 0;
 	GList *convs = NULL, *l;
@@ -163,7 +163,7 @@
 {
 	gint count;
 	gboolean has_focus;
-	PidginWindow *purplewin = NULL;
+	PidginConvWindow *purplewin = NULL;
 
 	if (conv == NULL || PIDGIN_CONVERSATION(conv) == NULL)
 		return 0;
@@ -198,7 +198,7 @@
 }
 
 static void
-notify_win(PidginWindow *purplewin, PurpleConversation *conv)
+notify_win(PidginConvWindow *purplewin, PurpleConversation *conv)
 {
 	if (count_messages(purplewin) <= 0)
 		return;
@@ -221,7 +221,7 @@
 unnotify(PurpleConversation *conv, gboolean reset)
 {
 	PurpleConversation *active_conv = NULL;
-	PidginWindow *purplewin = NULL;
+	PidginConvWindow *purplewin = NULL;
 
 	g_return_if_fail(conv != NULL);
 	if (PIDGIN_CONVERSATION(conv) == NULL)
@@ -387,7 +387,7 @@
 conv_switched(PurpleConversation *conv)
 {
 #if 0
-	PidginWindow *purplewin = purple_conversation_get_window(new_conv);
+	PidginConvWindow *purplewin = purple_conversation_get_window(new_conv);
 #endif
 
 	/*
@@ -413,7 +413,7 @@
 static void
 deleting_conv(PurpleConversation *conv)
 {
-	PidginWindow *purplewin = NULL;
+	PidginConvWindow *purplewin = NULL;
 	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 
 	if (gtkconv == NULL)
@@ -438,8 +438,8 @@
 #if 0
 static void
 conversation_dragging(PurpleConversation *active_conv,
-                        PidginWindow *old_purplewin,
-                        PidginWindow *new_purplewin)
+                        PidginConvWindow *old_purplewin,
+                        PidginConvWindow *new_purplewin)
 {
 	if (old_purplewin != new_purplewin) {
 		if (old_purplewin == NULL) {
@@ -485,7 +485,7 @@
 #endif
 
 static void
-handle_string(PidginWindow *purplewin)
+handle_string(PidginConvWindow *purplewin)
 {
 	GtkWindow *window = NULL;
 	gchar newtitle[256];
@@ -502,7 +502,7 @@
 }
 
 static void
-handle_count_title(PidginWindow *purplewin)
+handle_count_title(PidginConvWindow *purplewin)
 {
 	GtkWindow *window;
 	char newtitle[256];
@@ -518,7 +518,7 @@
 }
 
 static void
-handle_count_xprop(PidginWindow *purplewin)
+handle_count_xprop(PidginConvWindow *purplewin)
 {
 #ifdef HAVE_X11
 	guint count;
@@ -545,7 +545,7 @@
 }
 
 static void
-handle_urgent(PidginWindow *purplewin, gboolean set)
+handle_urgent(PidginConvWindow *purplewin, gboolean set)
 {
 	g_return_if_fail(purplewin != NULL);
 	g_return_if_fail(purplewin->window != NULL);
@@ -554,7 +554,7 @@
 }
 
 static void
-handle_raise(PidginWindow *purplewin)
+handle_raise(PidginConvWindow *purplewin)
 {
 	pidgin_conv_window_raise(purplewin);
 }
diff -r 6bcd0955c8a4 -r 24b06c5e7760 pidgin/plugins/perl/common/gtkmodule.h
--- a/pidgin/plugins/perl/common/gtkmodule.h	Wed Feb 26 04:06:48 2014 +0530
+++ b/pidgin/plugins/perl/common/gtkmodule.h	Wed Feb 26 04:37:11 2014 +0530
@@ -58,7 +58,7 @@
 typedef PidginUnseenState		Pidgin__UnseenState;
 
 /* gtkconvwin.h */
-typedef PidginWindow *			Pidgin__Conversation__Window;
+typedef PidginConvWindow *			Pidgin__Conversation__Window;
 typedef PidginConvPlacementFunc		Pidgin__Conversation__PlacementFunc;
 
 /* gtkxfer.h */
diff -r 6bcd0955c8a4 -r 24b06c5e7760 pidgin/plugins/unity.c
--- a/pidgin/plugins/unity.c	Wed Feb 26 04:06:48 2014 +0530
+++ b/pidgin/plugins/unity.c	Wed Feb 26 04:37:11 2014 +0530
@@ -140,7 +140,7 @@
 alert(PurpleConversation *conv)
 {
 	gint count;
-	PidginWindow *purplewin = NULL;
+	PidginConvWindow *purplewin = NULL;
 	if (conv == NULL || PIDGIN_CONVERSATION(conv) == NULL)
 		return 0;
 
@@ -234,7 +234,7 @@
 	gchar **sections = g_strsplit(id, ":", 0);
 	PurpleConversation *conv = NULL;
 	PurpleAccount *account;
-	PidginWindow *purplewin = NULL;
+	PidginConvWindow *purplewin = NULL;
 
 	char *type     = sections[0];
 	char *cname    = sections[1];
diff -r 6bcd0955c8a4 -r 24b06c5e7760 pidgin/plugins/win32/transparency/win2ktrans.c
--- a/pidgin/plugins/win32/transparency/win2ktrans.c	Wed Feb 26 04:06:48 2014 +0530
+++ b/pidgin/plugins/win32/transparency/win2ktrans.c	Wed Feb 26 04:37:11 2014 +0530
@@ -205,7 +205,7 @@
 }
 
 /* Clean up transparency stuff for the conv window */
-static void cleanup_conv_window(PidginWindow *win) {
+static void cleanup_conv_window(PidginConvWindow *win) {
 	GtkWidget *window = win->window;
 	slider_win *slidwin = NULL;
 
@@ -225,7 +225,7 @@
 
 static void
 conversation_delete_cb(PurpleConversation *conv) {
-	PidginWindow *win = pidgin_conv_get_window(PIDGIN_CONVERSATION(conv));
+	PidginConvWindow *win = pidgin_conv_get_window(PIDGIN_CONVERSATION(conv));
 	/* If it is the last conversation in the window, cleanup */
 	if (win != NULL && pidgin_conv_window_get_gtkconv_count(win) == 1)
 		cleanup_conv_window(win);
@@ -323,7 +323,7 @@
 	GList *wins;
 
 	for (wins = pidgin_conv_windows_get_list(); wins; wins = wins->next) {
-		PidginWindow *win = wins->data;
+		PidginConvWindow *win = wins->data;
 		GtkWidget *window = win->window;
 
 		if (purple_prefs_get_bool(OPT_WINTRANS_IM_ENABLED))
@@ -338,7 +338,7 @@
 	remove_sliders();
 }
 
-static void set_conv_window_trans(PidginWindow *oldwin, PidginWindow *newwin) {
+static void set_conv_window_trans(PidginConvWindow *oldwin, PidginConvWindow *newwin) {
 	GtkWidget *win = newwin->window;
 
 	/* check prefs to see if we want trans */
@@ -375,7 +375,7 @@
 		GList *wins;
 
 		for (wins = pidgin_conv_windows_get_list(); wins; wins = wins->next) {
-			PidginWindow *win = wins->data;
+			PidginConvWindow *win = wins->data;
 			set_conv_window_trans(NULL, win);
 		}
 
@@ -389,7 +389,7 @@
 static void
 conv_updated_cb(PurpleConversation *conv, PurpleConversationUpdateType type) {
 	PidginConversation *pconv = PIDGIN_CONVERSATION(conv);
-	PidginWindow *win = pidgin_conv_get_window(pconv);
+	PidginConvWindow *win = pidgin_conv_get_window(pconv);
 
 	if (type == PURPLE_CONVERSATION_UPDATE_UNSEEN && !pidgin_conv_is_hidden(pconv)
 			&& pconv->unseen_state == PIDGIN_UNSEEN_NONE
@@ -414,7 +414,7 @@
 
 static void
 new_conversation_cb(PurpleConversation *conv) {
-	PidginWindow *win = pidgin_conv_get_window(PIDGIN_CONVERSATION(conv));
+	PidginConvWindow *win = pidgin_conv_get_window(PIDGIN_CONVERSATION(conv));
 
 	/* If it is the first conversation in the window,
 	 * add the sliders, and set transparency */
@@ -452,7 +452,7 @@
 	int imalpha = gtk_range_get_value(GTK_RANGE(w));
 
 	for (wins = pidgin_conv_windows_get_list(); wins; wins = wins->next) {
-		PidginWindow *win = wins->data;
+		PidginConvWindow *win = wins->data;
 		set_wintrans(win->window, imalpha, TRUE,
 			purple_prefs_get_bool(OPT_WINTRANS_IM_ONTOP));
 	}
@@ -473,7 +473,7 @@
 	GList *wins;
 
 	for (wins = pidgin_conv_windows_get_list(); wins; wins = wins->next) {
-		PidginWindow *win = wins->data;
+		PidginConvWindow *win = wins->data;
 		GtkWidget *window = win->window;
 
 		set_conv_window_trans(NULL, win);
diff -r 6bcd0955c8a4 -r 24b06c5e7760 pidgin/win32/gtkwin32dep.c
--- a/pidgin/win32/gtkwin32dep.c	Wed Feb 26 04:06:48 2014 +0530
+++ b/pidgin/win32/gtkwin32dep.c	Wed Feb 26 04:37:11 2014 +0530
@@ -349,7 +349,7 @@
 
 void
 winpidgin_conv_blink(PurpleConversation *conv, PurpleMessageFlags flags) {
-	PidginWindow *win;
+	PidginConvWindow *win;
 	GtkWindow *window;
 
 	/* Don't flash for our own messages or system messages */