changeset 32656:a053474df2e9

Whitespace fixes. Try and check your editor settings before writing tons of code.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 13 Feb 2011 07:38:19 +0000
parents 5e5d49f1a547
children bf292bb5657e
files pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkimhtml.c pidgin/gtkimhtmltoolbar.c pidgin/gtklog.c pidgin/gtknotify.c pidgin/gtkplugin.c pidgin/gtkpounce.c pidgin/gtkprefs.c pidgin/gtkrequest.c pidgin/gtkroomlist.c pidgin/gtkutils.c pidgin/gtkwhiteboard.c pidgin/pidginstock.c
diffstat 15 files changed, 274 insertions(+), 274 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkblist.c	Sun Feb 13 06:40:09 2011 +0000
+++ b/pidgin/gtkblist.c	Sun Feb 13 07:38:19 2011 +0000
@@ -461,9 +461,9 @@
 	GList *tmp;
 
 	/* First, we find the contact to merge the rest of the buddies into.
- 	 * This will be the contact with the most buddies in it; ties are broken
- 	 * by which contact is higher in the list
- 	 */
+	 * This will be the contact with the most buddies in it; ties are broken
+	 * by which contact is higher in the list
+	 */
 	for (tmp = merges; tmp; tmp = tmp->next) {
 		PurpleBlistNode *node = tmp->data;
 		PurpleBlistNode *b;
@@ -984,7 +984,7 @@
 	gtkblist = PIDGIN_BLIST(purple_get_blist());
 	blist_window = gtkblist ? GTK_WINDOW(gtkblist->window) : NULL;
 
-  /* TODO: set no separator in gtk+ 3... */
+	/* TODO: set no separator in gtk+ 3... */
 	data->window = gtk_dialog_new_with_buttons(title,
 		blist_window, 0, NULL);
 
@@ -993,14 +993,14 @@
 	gtk_container_set_border_width(GTK_CONTAINER(data->window), PIDGIN_HIG_BOX_SPACE);
 	gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE);
 	gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(data->window))),
-                      PIDGIN_HIG_BORDER);
+	                    PIDGIN_HIG_BORDER);
 	gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(data->window))),
-                                 PIDGIN_HIG_BOX_SPACE);
+	                               PIDGIN_HIG_BOX_SPACE);
 	gtk_window_set_role(GTK_WINDOW(data->window), window_role);
 
 	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
 	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(data->window))),
-                    hbox);
+	                  hbox);
 	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
 	gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
 
@@ -1559,7 +1559,7 @@
 		pidgin_append_blist_node_move_to_menu(menu, (PurpleBlistNode *)contact);
 
 	if (node->parent && node->parent->child->next &&
-              !sub && !contact_expanded) {
+	    !sub && !contact_expanded) {
 		pidgin_separator(menu);
 		pidgin_append_blist_node_privacy_menu(menu, node);
 		pidgin_new_item_from_stock(menu, _("_Alias..."), PIDGIN_STOCK_ALIAS,
@@ -2250,7 +2250,7 @@
 											guint time,
 											gpointer null)
 {
-  GdkAtom target = gtk_selection_data_get_target(data);
+	GdkAtom target = gtk_selection_data_get_target(data);
 
 	if (target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE)) {
 		GtkTreeRowReference *ref = g_object_get_data(G_OBJECT(dc), "gtk-tree-view-source-row");
@@ -2346,8 +2346,8 @@
 static void pidgin_blist_drag_data_rcv_cb(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
 			  GtkSelectionData *sd, guint info, guint t)
 {
-  GdkAtom target = gtk_selection_data_get_target(sd);
-  const guchar *data = gtk_selection_data_get_data(sd);
+	GdkAtom target = gtk_selection_data_get_target(sd);
+	const guchar *data = gtk_selection_data_get_data(sd);
 
 	if (gtkblist->drag_timeout) {
 		g_source_remove(gtkblist->drag_timeout);
@@ -2557,7 +2557,7 @@
 			gtk_tree_path_free(path);
 
 		gtk_drag_finish(dc, TRUE,
-                    (gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE), t);
+		                gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t);
 	}
 	else if (target == gdk_atom_intern("text/x-vcard", FALSE) && data)
 	{
@@ -2595,7 +2595,7 @@
 		result = parse_vcard((const gchar *) data, group);
 
 		gtk_drag_finish(dc, result,
-                    (gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE), t);
+		                gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t);
 	} else if (target == gdk_atom_intern("text/uri-list", FALSE) && data) {
 		GtkTreePath *path = NULL;
 		GtkTreeViewDropPosition position;
@@ -2615,7 +2615,7 @@
 					PurpleBuddy *b = PURPLE_BLIST_NODE_IS_BUDDY(node) ? PURPLE_BUDDY(node) : purple_contact_get_priority_buddy(PURPLE_CONTACT(node));
 					pidgin_dnd_file_manage(sd, b->account, b->name);
 					gtk_drag_finish(dc, TRUE,
-                          (gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE), t);
+					                gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t);
 				} else {
 					gtk_drag_finish(dc, FALSE, FALSE, t);
 				}
@@ -2979,56 +2979,57 @@
 	for(l = gtkblist->tooltipdata; l; l = l->next)
 	{
 		struct tooltip_data *td = l->data;
-    	cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(gtkblist->tipwindow));
+		cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(gtkblist->tipwindow));
 
 		if (td->avatar && pidgin_gdk_pixbuf_is_opaque(td->avatar))
 		{
 			if (dir == GTK_TEXT_DIR_RTL)
 				gtk_paint_flat_box(style, cr, GTK_STATE_NORMAL, GTK_SHADOW_OUT,
 						gtkblist->tipwindow, "tooltip",
-						TOOLTIP_BORDER -1, current_height -1, td->avatar_width +2,
-            			td->avatar_height + 2);
+						TOOLTIP_BORDER - 1, current_height - 1,
+						td->avatar_width + 2, td->avatar_height + 2);
 			else
 				gtk_paint_flat_box(style, cr, GTK_STATE_NORMAL, GTK_SHADOW_OUT,
 						gtkblist->tipwindow, "tooltip",
-						max_width - (td->avatar_width+ TOOLTIP_BORDER)-1,
-						current_height-1,td->avatar_width+2, td->avatar_height+2);
+						max_width - (td->avatar_width + TOOLTIP_BORDER) - 1,
+						current_height - 1,
+						td->avatar_width + 2, td->avatar_height + 2);
 		}
 
 		if (td->status_icon) {
 			if (dir == GTK_TEXT_DIR_RTL) {
-        		gdk_cairo_set_source_pixbuf(cr, td->status_icon,
-          			max_width - TOOLTIP_BORDER - status_size, current_height);
-        		cairo_paint(cr);
-      		} else {
-        		gdk_cairo_set_source_pixbuf(cr, td->status_icon, TOOLTIP_BORDER, current_height);
-        		cairo_paint(cr);
-      		}
-    	}
+				gdk_cairo_set_source_pixbuf(cr, td->status_icon,
+					max_width - TOOLTIP_BORDER - status_size, current_height);
+				cairo_paint(cr);
+			} else {
+				gdk_cairo_set_source_pixbuf(cr, td->status_icon, TOOLTIP_BORDER, current_height);
+				cairo_paint(cr);
+			}
+		}
 
 		if (td->avatar) {
 			if (dir == GTK_TEXT_DIR_RTL) {
-        		gdk_cairo_set_source_pixbuf(cr, td->avatar, TOOLTIP_BORDER,
-		        	current_height);
-        		cairo_paint(cr);
-      		} else {
-        		gdk_cairo_set_source_pixbuf(cr, td->avatar,
-          			max_width - (td->avatar_width + TOOLTIP_BORDER), current_height);
-        		cairo_paint(cr);
-      		}
+				gdk_cairo_set_source_pixbuf(cr, td->avatar, TOOLTIP_BORDER,
+					current_height);
+				cairo_paint(cr);
+			} else {
+				gdk_cairo_set_source_pixbuf(cr, td->avatar,
+					max_width - (td->avatar_width + TOOLTIP_BORDER), current_height);
+				cairo_paint(cr);
+			}
 		}
 
 		if (!td->avatar_is_prpl_icon && td->prpl_icon) {
-      		gdk_cairo_set_source_pixbuf(cr, td->prpl_icon, prpl_col,
-        		current_height + ((td->name_height / 2) - (PRPL_SIZE / 2)));
-      		cairo_paint(cr);
-    	}
+			gdk_cairo_set_source_pixbuf(cr, td->prpl_icon, prpl_col,
+				current_height + ((td->name_height / 2) - (PRPL_SIZE / 2)));
+			cairo_paint(cr);
+		}
 
 		if (td->name_layout) {
 			if (dir == GTK_TEXT_DIR_RTL) {
 				gtk_paint_layout(style, cr, GTK_STATE_NORMAL, FALSE,
 						gtkblist->tipwindow, "tooltip",
-						max_width  -(TOOLTIP_BORDER + status_size + SMALL_SPACE) - PANGO_PIXELS(300000),
+						max_width - (TOOLTIP_BORDER + status_size + SMALL_SPACE) - PANGO_PIXELS(300000),
 						current_height, td->name_layout);
 			} else {
 				gtk_paint_layout (style, cr, GTK_STATE_NORMAL, FALSE,
@@ -3051,7 +3052,7 @@
 			}
 		}
 
-    	cairo_destroy(cr);
+		cairo_destroy(cr);
 		current_height += MAX(td->name_height + td->height, td->avatar_height) + td->padding;
 	}
 	return FALSE;
@@ -3600,11 +3601,11 @@
 	}
 
 	purple_request_fields(gc, _("Edit User Mood"), _("Edit User Mood"),
-                              NULL, fields,
-                              _("OK"), G_CALLBACK(edit_mood_cb),
-                              _("Cancel"), NULL,
-                              gc ? purple_connection_get_account(gc) : NULL,
-                              NULL, NULL, gc);
+	                      NULL, fields,
+	                      _("OK"), G_CALLBACK(edit_mood_cb),
+	                      _("Cancel"), NULL,
+	                      gc ? purple_connection_get_account(gc) : NULL,
+	                      NULL, NULL, gc);
 
 	g_free(global_moods);
 }
@@ -5943,7 +5944,7 @@
 	g_signal_connect(G_OBJECT(gtkblist->window), "focus-out-event",
 			 G_CALLBACK(blist_focus_cb), gtkblist);
 
-  /* TODO: how is this done in gtk+ 3.0? */
+	/* TODO: how is this done in gtk+ 3.0? */
 	/*GTK_WINDOW(gtkblist->window)->allow_shrink = TRUE;*/
 
 	gtkblist->main_vbox = gtk_vbox_new(FALSE, 0);
@@ -7103,7 +7104,7 @@
 
 	if (show) {
 		if(!PIDGIN_WINDOW_ICONIFIED(gtkblist->window) &&
-        !gtk_widget_get_visible(gtkblist->window))
+		   !gtk_widget_get_visible(gtkblist->window))
 			purple_signal_emit(pidgin_blist_get_handle(), "gtkblist-unhiding", gtkblist);
 		pidgin_blist_restore_position();
 		gtk_window_present(GTK_WINDOW(gtkblist->window));
@@ -8047,7 +8048,7 @@
 
 		if(PURPLE_BLIST_NODE_IS_CONTACT(n)) {
 			for (n2 = n->child; n2; n2 = n2->next) {
-                        	buddy = (PurpleBuddy*)n2;
+				buddy = (PurpleBuddy*)n2;
 				this_log_activity_score += purple_log_get_activity_score(PURPLE_LOG_IM, buddy->name, buddy->account);
 			}
 			this_buddy_name = purple_contact_get_alias((PurpleContact*)n);
--- a/pidgin/gtkconv.c	Sun Feb 13 06:40:09 2011 +0000
+++ b/pidgin/gtkconv.c	Sun Feb 13 07:38:19 2011 +0000
@@ -778,16 +778,16 @@
 	InviteBuddyInfo *info = (InviteBuddyInfo *)data;
 	const char *convprotocol;
 	gboolean success = TRUE;
-  GdkAtom target = gtk_selection_data_get_target(sd);
-    
+	GdkAtom target = gtk_selection_data_get_target(sd);
+
 	convprotocol = purple_account_get_protocol_id(purple_conversation_get_account(info->conv));
 
 	if (target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE))
 	{
 		PurpleBlistNode *node = NULL;
 		PurpleBuddy *buddy;
-    const guchar *data = gtk_selection_data_get_data(sd);
-      
+		const guchar *data = gtk_selection_data_get_data(sd);
+
 		memcpy(&node, data, sizeof(node));
 
 		if (PURPLE_BLIST_NODE_IS_CONTACT(node))
@@ -808,7 +808,7 @@
 			gtk_entry_set_text(GTK_ENTRY(info->entry), purple_buddy_get_name(buddy));
 
 		gtk_drag_finish(dc, success,
-      gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t);
+		                gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t);
 	}
 	else if (target == gdk_atom_intern("application/x-im-contact", FALSE))
 	{
@@ -842,7 +842,7 @@
 		g_free(protocol);
 
 		gtk_drag_finish(dc, success,
-      gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t);
+		                gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t);
 	}
 }
 
@@ -884,11 +884,11 @@
 		                                GTK_RESPONSE_OK);
 		gtk_container_set_border_width(GTK_CONTAINER(invite_dialog), PIDGIN_HIG_BOX_SPACE);
 		gtk_window_set_resizable(GTK_WINDOW(invite_dialog), FALSE);
-    /* TODO: set no separator using GTK+ 3.0 */
-    /*
+		/* TODO: set no separator using GTK+ 3.0 */
+#if 0
 		gtk_dialog_set_has_separator(GTK_DIALOG(invite_dialog), FALSE);
-    */
-    
+#endif
+
 		info->window = GTK_WIDGET(invite_dialog);
 
 		/* Setup the outside spacing. */
@@ -2200,7 +2200,7 @@
 		(event->keyval == GDK_KEY_Left) ||
 		(event->keyval == GDK_KEY_Right) ||
 		(event->keyval == GDK_KEY_Page_Up) ||
- 		(event->keyval == GDK_KEY_KP_Page_Up) ||
+		(event->keyval == GDK_KEY_KP_Page_Up) ||
 		(event->keyval == GDK_KEY_Page_Down) ||
 		(event->keyval == GDK_KEY_KP_Page_Down) ||
 		(event->keyval == GDK_KEY_Home) ||
@@ -2438,8 +2438,7 @@
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
 		PurpleBuddy *b = purple_find_buddy(account, name);
 		if (b != NULL) {
-                	PurplePresence *p;
-	                p = purple_buddy_get_presence(b);
+			PurplePresence *p = purple_buddy_get_presence(b);
 			if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_AWAY))
 				return away_list;
 			if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_UNAVAILABLE))
@@ -3741,10 +3740,10 @@
 		break;
 	}
 	if (gtkwin->menu.typing_icon == NULL) {
-		 gtkwin->menu.typing_icon = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_MENU);
-		 pidgin_menu_tray_append(PIDGIN_MENU_TRAY(gtkwin->menu.tray),
-                                                                  gtkwin->menu.typing_icon,
-                                                                  _("User is typing..."));
+		gtkwin->menu.typing_icon = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_MENU);
+		pidgin_menu_tray_append(PIDGIN_MENU_TRAY(gtkwin->menu.tray),
+		                        gtkwin->menu.typing_icon,
+		                        _("User is typing..."));
 	} else {
 		gtk_image_set_from_stock(GTK_IMAGE(gtkwin->menu.typing_icon), stock_id, GTK_ICON_SIZE_MENU);
 	}
@@ -4692,13 +4691,13 @@
 	GtkAllocation imhtml_allocation;
 	GtkAllocation entry_allocation;
 	GtkAllocation lower_hbox_allocation;
-    
+
 	gtk_widget_get_allocation(gtkconv->imhtml, &imhtml_allocation);
 	gtk_widget_get_allocation(gtkconv->entry, &entry_allocation);
 	gtk_widget_get_allocation(gtkconv->lower_hbox, &lower_hbox_allocation);
 	total_height = imhtml_allocation.height + entry_allocation.height;
 	max_height = total_height / 2;
-    
+
 	pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(gtkconv->entry));
 	pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry));
 	pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(gtkconv->entry));
@@ -5226,9 +5225,9 @@
 	PurpleAccount *convaccount = purple_conversation_get_account(conv);
 	PurpleConnection *gc = purple_account_get_connection(convaccount);
 	PurplePluginProtocolInfo *prpl_info = gc ? PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl) : NULL;
-  GdkAtom target = gtk_selection_data_get_target(sd);
-  const guchar *data = gtk_selection_data_get_data(sd);
-    
+	GdkAtom target = gtk_selection_data_get_target(sd);
+	const guchar *data = gtk_selection_data_get_data(sd);
+
 	if (target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE))
 	{
 		PurpleBlistNode *n = NULL;
@@ -5286,7 +5285,7 @@
 		}
 
 		gtk_drag_finish(dc, TRUE,
-      gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t);
+		                gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t);
 	}
 	else if (target == gdk_atom_intern("application/x-im-contact", FALSE))
 	{
@@ -5327,13 +5326,13 @@
 		g_free(protocol);
 
 		gtk_drag_finish(dc, TRUE,
-      gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t);
+		                gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t);
 	}
 	else if (target == gdk_atom_intern("text/uri-list", FALSE)) {
 		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
 			pidgin_dnd_file_manage(sd, convaccount, purple_conversation_get_name(conv));
 		gtk_drag_finish(dc, TRUE,
-      gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t);
+		                gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t);
 	}
 	else
 		gtk_drag_finish(dc, FALSE, FALSE, t);
@@ -5739,31 +5738,26 @@
 		GdkEventButton *btn_event = (GdkEventButton*) event;
 		PurpleConversation *conv = data;
 		char *buddyname;
-    gchar *name;
-
-    g_object_get(G_OBJECT(tag), "name", &name, NULL);
-          
+		gchar *name;
+
+		g_object_get(G_OBJECT(tag), "name", &name, NULL);
+
 		/* strlen("BUDDY " or "HILIT ") == 6 */
 		g_return_val_if_fail((name != NULL) && (strlen(name) > 6), FALSE);
 
 		buddyname = name + 6;
 
-    
-		if (btn_event->button == 1 &&
-				event->type == GDK_2BUTTON_PRESS) {
+		if (btn_event->button == 1 && event->type == GDK_2BUTTON_PRESS) {
 			chat_do_im(PIDGIN_CONVERSATION(conv), buddyname);
-      g_free(name);
+			g_free(name);
 
 			return TRUE;
-		} else if (btn_event->button == 2
-				&& event->type == GDK_2BUTTON_PRESS) {
+		} else if (btn_event->button == 2 && event->type == GDK_2BUTTON_PRESS) {
 			chat_do_info(PIDGIN_CONVERSATION(conv), buddyname);
-
-      g_free(name);
-            
+			g_free(name);
+
 			return TRUE;
-		} else if (btn_event->button == 3
-				&& event->type == GDK_BUTTON_PRESS) {
+		} else if (btn_event->button == 3 && event->type == GDK_BUTTON_PRESS) {
 			GtkTextIter start, end;
 
 			/* we shouldn't display the popup
@@ -5782,14 +5776,14 @@
 						btn_event->button,
 						btn_event->time);
 
-        g_free(name);
- 
+				g_free(name);
+
 				/* Don't propagate the event any further */
 				return TRUE;
 			}
 		}
 
-    g_free(name);
+		g_free(name);
 	}
 
 	return FALSE;
@@ -6286,7 +6280,7 @@
 
 	/* Currently GTK+ maintains our sorted list after it's in the tree.
 	 * This may change if it turns out we can manage it faster ourselves.
- 	 */
+	 */
 	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(ls),  CHAT_USERS_ALIAS_KEY_COLUMN,
 										 GTK_SORT_ASCENDING);
 }
@@ -6638,13 +6632,13 @@
 		gtk_action_set_visible(win->menu.get_info, TRUE);
 		gtk_action_set_visible(win->menu.invite, FALSE);
 		gtk_action_set_visible(win->menu.alias, TRUE);
- 		if (purple_privacy_check(account, purple_conversation_get_name(conv))) {
- 			gtk_action_set_visible(win->menu.unblock, FALSE);
- 			gtk_action_set_visible(win->menu.block, TRUE);
- 		} else {
- 			gtk_action_set_visible(win->menu.block, FALSE);
- 			gtk_action_set_visible(win->menu.unblock, TRUE);
- 		}
+		if (purple_privacy_check(account, purple_conversation_get_name(conv))) {
+			gtk_action_set_visible(win->menu.unblock, FALSE);
+			gtk_action_set_visible(win->menu.block, TRUE);
+		} else {
+			gtk_action_set_visible(win->menu.block, FALSE);
+			gtk_action_set_visible(win->menu.unblock, TRUE);
+		}
 
 		if ((account == NULL) || purple_find_buddy(account, purple_conversation_get_name(conv)) == NULL) {
 			gtk_action_set_visible(win->menu.add, TRUE);
@@ -6865,7 +6859,7 @@
 
 	if ((fields & PIDGIN_CONV_COLORIZE_TITLE) ||
 			(fields & PIDGIN_CONV_SET_TITLE) ||
-    			(fields & PIDGIN_CONV_TOPIC))
+			(fields & PIDGIN_CONV_TOPIC))
 	{
 		char *title;
 		PurpleConvIm *im = NULL;
@@ -7249,7 +7243,7 @@
 	gtk_container_add(GTK_CONTAINER(gtkconv->u.im->icon_container), event);
 	gtk_event_box_set_visible_window(GTK_EVENT_BOX(event), FALSE);
 	gtk_widget_add_events(event,
-                              GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
+	                      GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
 	g_signal_connect(G_OBJECT(event), "button-press-event",
 					 G_CALLBACK(icon_menu), gtkconv);
 
@@ -7326,7 +7320,7 @@
 	count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook));
 
 	for (i = 0; i < count; i++) {
-    	GtkAllocation allocation;
+		GtkAllocation allocation;
 
 		page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), i);
 		tab = gtk_notebook_get_tab_label(GTK_NOTEBOOK(notebook), page);
@@ -8120,7 +8114,7 @@
 	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/blist/show_protocol_icons",
 								show_protocol_icons_pref_cb, NULL);
 	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/im/hide_new",
-                                hide_new_pref_cb, NULL);
+								hide_new_pref_cb, NULL);
 
 
 
@@ -8257,7 +8251,7 @@
 	window_list = g_list_remove(window_list, hidden_convwin);
 
 	purple_signal_connect(purple_accounts_get_handle(), "account-status-changed",
-                        handle, PURPLE_CALLBACK(account_status_changed_cb), NULL);
+						handle, PURPLE_CALLBACK(account_status_changed_cb), NULL);
 
 	/* Callbacks to update a conversation */
 	purple_signal_connect(blist_handle, "blist-node-added", handle,
@@ -8442,12 +8436,12 @@
 	                               6);
 	gtk_window_set_resizable(GTK_WINDOW(warn_close_dialog), FALSE);
 
-  /* TODO: figure out how to set no separator in GTK+ 3.0 */
-  /*
-  gtk_dialog_set_has_separator(GTK_DIALOG(warn_close_dialog),
+	/* TODO: figure out how to set no separator in GTK+ 3.0 */
+#if 0
+	gtk_dialog_set_has_separator(GTK_DIALOG(warn_close_dialog),
 	                             FALSE);
-  */
-                               
+#endif
+
 	/* Setup the outside spacing. */
 	vbox = gtk_dialog_get_content_area(GTK_DIALOG(warn_close_dialog));
 
@@ -8723,10 +8717,10 @@
 
 	if (e->button == 1) {
 		int nb_x, nb_y;
-    GtkAllocation allocation;
-
-    gtk_widget_get_allocation(gtkconv->infopane_hbox, &allocation);
-      
+		GtkAllocation allocation;
+
+		gtk_widget_get_allocation(gtkconv->infopane_hbox, &allocation);
+
 		if (gtkconv->win->in_drag)
 			return TRUE;
 
@@ -8781,7 +8775,7 @@
 	int tab_clicked;
 	GtkWidget *page;
 	GtkWidget *tab;
-  GtkAllocation allocation;
+	GtkAllocation allocation;
 
 	if (e->button == 2 && e->type == GDK_BUTTON_PRESS) {
 		PidginConversation *gtkconv;
@@ -8831,7 +8825,7 @@
 	page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(win->notebook), tab_clicked);
 	tab = gtk_notebook_get_tab_label(GTK_NOTEBOOK(win->notebook), page);
 
-  gtk_widget_get_allocation(tab, &allocation);
+	gtk_widget_get_allocation(tab, &allocation);
 
 	win->drag_min_x = allocation.x      + nb_x;
 	win->drag_min_y = allocation.y      + nb_y;
@@ -8844,8 +8838,8 @@
 	    e->y_root <  win->drag_min_y ||
 	    e->y_root >= win->drag_max_y) {
 
-		    return FALSE;
-	    }
+		return FALSE;
+	}
 
 	win->in_predrag = TRUE;
 	win->drag_tab = tab_clicked;
@@ -9080,8 +9074,8 @@
 {
 	GtkWidget *item;
 	PidginConversation *gtkconv;
-  GtkWidget *menu = gtk_notebook_get_menu
-    
+	GtkWidget *menu = gtk_notebook_get_menu
+
 	if (event->type != GDK_BUTTON_PRESS || event->button != 3)
 		return FALSE;
 
@@ -9176,8 +9170,7 @@
 		PurpleBuddy *buddy;
 		buddy = purple_find_buddy(account, name);
 		if (buddy != NULL) {
-			purple_blist_alias_buddy(buddy,
-                                                 gtk_entry_get_text(entry));
+			purple_blist_alias_buddy(buddy, gtk_entry_get_text(entry));
 		}
 		serv_alias_buddy(buddy);
 	} else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
@@ -9323,14 +9316,18 @@
 make_status_icon_list(const char *stock, GtkWidget *w)
 {
 	GList *l = NULL;
-	l = g_list_append(l, gtk_widget_render_icon (w, stock,
-                                       gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL), "GtkWindow"));
-	l = g_list_append(l, gtk_widget_render_icon (w, stock,
-                                       gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_SMALL), "GtkWindow"));
-	l = g_list_append(l, gtk_widget_render_icon (w, stock,
-                                       gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_MEDIUM), "GtkWindow"));
-	l = g_list_append(l, gtk_widget_render_icon (w, stock,
-                                       gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_LARGE), "GtkWindow"));
+	l = g_list_append(l,
+		gtk_widget_render_icon(w, stock,
+			gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL), "GtkWindow"));
+	l = g_list_append(l,
+		gtk_widget_render_icon(w, stock,
+			gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_SMALL), "GtkWindow"));
+	l = g_list_append(l,
+		gtk_widget_render_icon(w, stock,
+			gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_MEDIUM), "GtkWindow"));
+	l = g_list_append(l,
+		gtk_widget_render_icon(w, stock,
+			gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_LARGE), "GtkWindow"));
 	return l;
 }
 
@@ -9388,8 +9385,8 @@
 pidgin_conv_set_position_size(PidginWindow *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
-          * position is sane... */
+	/* if the window exists, is hidden, we're saving positions, and the
+	 * position is sane... */
 	if (win && win->window &&
 			!gtk_widget_get_visible(win->window) && conv_width != 0) {
 
@@ -9476,13 +9473,13 @@
 	gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), FALSE);
 	gtk_notebook_set_show_border(GTK_NOTEBOOK(win->notebook), TRUE);
 
-  /* TODO: figure out how to add custom stuff to the right-click menu in
-     GtkNotebook in GTK+ 3.0 */
-  /*
+	/* TODO: figure out how to add custom stuff to the right-click menu in
+	   GtkNotebook in GTK+ 3.0 */
+#if 0
 	g_signal_connect(G_OBJECT(win->notebook), "button-press-event",
 					G_CALLBACK(right_click_menu_cb), win);
-  */
-          
+#endif
+
 	gtk_widget_show(win->notebook);
 
 	g_signal_connect(G_OBJECT(win->notebook), "switch_page",
--- a/pidgin/gtkdialogs.c	Sun Feb 13 06:40:09 2011 +0000
+++ b/pidgin/gtkdialogs.c	Sun Feb 13 07:38:19 2011 +0000
@@ -454,7 +454,7 @@
 	button = pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_CLOSE,
 	                G_CALLBACK(destroy_win), win);
 
-  gtk_widget_set_can_default(button, TRUE);
+	gtk_widget_set_can_default(button, TRUE);
 	gtk_widget_grab_default(button);
 
 	gtk_widget_show_all(win);
@@ -901,12 +901,12 @@
 
 	gtk_container_set_border_width (GTK_CONTAINER(window), PIDGIN_HIG_BOX_SPACE);
 	gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
-  /* TODO: figure out how to set no separator in a dialog in GTK+ 3.0 */
-  /*gtk_dialog_set_has_separator(GTK_DIALOG(window), FALSE);*/
+	/* TODO: figure out how to set no separator in a dialog in GTK+ 3.0 */
+	/*gtk_dialog_set_has_separator(GTK_DIALOG(window), FALSE);*/
 	gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(window))),
-                      PIDGIN_HIG_BORDER);
-	gtk_container_set_border_width (GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(window))),
-                                  PIDGIN_HIG_BOX_SPACE);
+	                    PIDGIN_HIG_BORDER);
+	gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(window))),
+	                               PIDGIN_HIG_BOX_SPACE);
 
 	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
 	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(window))), hbox);
--- a/pidgin/gtkimhtml.c	Sun Feb 13 06:40:09 2011 +0000
+++ b/pidgin/gtkimhtml.c	Sun Feb 13 07:38:19 2011 +0000
@@ -1073,7 +1073,7 @@
 	}
 	if (primary) /* This was allocated here */
 		g_free(text);
- }
+}
 
 static void gtk_imhtml_primary_clipboard_clear(GtkClipboard *clipboard, GtkIMHtml *imhtml)
 {
@@ -1342,7 +1342,7 @@
 				       paste_received_cb, imhtml);
 
 		return TRUE;
-        }
+	}
 
 	return FALSE;
 }
@@ -1904,10 +1904,10 @@
 
 	gdk_drag_status (context, suggested_action, time);
 
-  /* TRUE return means don't propagate the drag motion to parent
-   * widgets that may also be drop sites.
-   */
-  return TRUE;
+	/* TRUE return means don't propagate the drag motion to parent
+	 * widgets that may also be drop sites.
+	 */
+	return TRUE;
 }
 
 static void
@@ -1966,7 +1966,7 @@
 
 				i++;
 			}
-            g_strfreev(links);
+			g_strfreev(links);
 			break;
 		case GTK_IMHTML_DRAG_HTML:
 			{
@@ -4260,7 +4260,7 @@
 					gtk_text_buffer_remove_tag(imhtml->text_buffer, tag, &iter, e);
 
 				g_free(name);
-      }
+			}
 
 			g_slist_free(tags);
 		}
@@ -5010,7 +5010,7 @@
 						}
 					}
 				} else {
- 					imhtml->num_animations++;
+					imhtml->num_animations++;
 				}
 				g_signal_connect(G_OBJECT(icon), "destroy", G_CALLBACK(animated_smiley_destroy_cb), imhtml);
 				g_queue_push_tail(imhtml->animations, icon);
--- a/pidgin/gtkimhtmltoolbar.c	Sun Feb 13 06:40:09 2011 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Sun Feb 13 07:38:19 2011 +0000
@@ -125,14 +125,14 @@
 	GtkFontSelection *sel;
 
 	sel = GTK_FONT_SELECTION(
-          gtk_font_selection_dialog_get_font_selection(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)));
+		gtk_font_selection_dialog_get_font_selection(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)));
 	gtk_widget_hide(gtk_widget_get_parent(
-                    gtk_font_selection_get_size_entry(sel)));
+		gtk_font_selection_get_size_entry(sel)));
 	gtk_widget_show_all(gtk_font_selection_get_family_list(sel));
 	gtk_widget_show(gtk_widget_get_parent(
-                    gtk_font_selection_get_family_list(sel)));
+		gtk_font_selection_get_family_list(sel)));
 	gtk_widget_show(gtk_widget_get_parent(gtk_widget_get_parent(
-                    gtk_font_selection_get_family_list(sel))));
+		gtk_font_selection_get_family_list(sel))));
 }
 
 static void
@@ -196,11 +196,11 @@
 			g_signal_connect(G_OBJECT(toolbar->font_dialog), "delete_event",
 							 G_CALLBACK(destroy_toolbar_font), toolbar);
 			g_signal_connect(G_OBJECT(
-        gtk_font_selection_dialog_get_ok_button(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog))),
-               "clicked", G_CALLBACK(apply_font), toolbar->font_dialog);
+				gtk_font_selection_dialog_get_ok_button(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog))),
+				"clicked", G_CALLBACK(apply_font), toolbar->font_dialog);
 			g_signal_connect(G_OBJECT(
-        gtk_font_selection_dialog_get_cancel_button(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog))),
-               "clicked", G_CALLBACK(cancel_toolbar_font), toolbar);
+				gtk_font_selection_dialog_get_cancel_button(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog))),
+				"clicked", G_CALLBACK(cancel_toolbar_font), toolbar);
 			g_signal_connect_after(G_OBJECT(toolbar->font_dialog), "realize",
 							 G_CALLBACK(realize_toolbar_font), toolbar);
 		}
@@ -259,12 +259,12 @@
 		char *color = gtk_imhtml_get_current_forecolor(GTK_IMHTML(toolbar->imhtml));
 
 		if (!toolbar->fgcolor_dialog) {
-      GtkWidget *ok_button;
-      GtkWidget *cancel_button;
-        
+			GtkWidget *ok_button;
+			GtkWidget *cancel_button;
+
 			toolbar->fgcolor_dialog = gtk_color_selection_dialog_new(_("Select Text Color"));
 			colorsel =
-            gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog));
+				gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog));
 			if (color) {
 				gdk_color_parse(color, &fgcolor);
 				gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &fgcolor);
@@ -273,14 +273,13 @@
 
 			g_object_set_data(G_OBJECT(colorsel), "purple_toolbar", toolbar);
 
-      g_object_get(G_OBJECT(toolbar->fgcolor_dialog), "ok-button", &ok_button, NULL);
-      g_object_get(G_OBJECT(toolbar->fgcolor_dialog), "cancel-button",
-                   &cancel_button, NULL);
+			g_object_get(G_OBJECT(toolbar->fgcolor_dialog), "ok-button", &ok_button, NULL);
+			g_object_get(G_OBJECT(toolbar->fgcolor_dialog), "cancel-button", &cancel_button, NULL);
 			g_signal_connect(G_OBJECT(toolbar->fgcolor_dialog), "delete_event",
 							 G_CALLBACK(destroy_toolbar_fgcolor), toolbar);
 			g_signal_connect(G_OBJECT(ok_button), "clicked", G_CALLBACK(do_fgcolor), colorsel);
 			g_signal_connect(G_OBJECT(cancel_button), "clicked",
-                       G_CALLBACK(cancel_toolbar_fgcolor), toolbar);
+			                 G_CALLBACK(cancel_toolbar_fgcolor), toolbar);
 		}
 		gtk_window_present(GTK_WINDOW(toolbar->fgcolor_dialog));
 	} else {
@@ -344,14 +343,14 @@
 		char *color = gtk_imhtml_get_current_backcolor(GTK_IMHTML(toolbar->imhtml));
 
 		if (!toolbar->bgcolor_dialog) {
-      GtkWidget *ok_button;
-      GtkWidget *cancel_button;
-          
+			GtkWidget *ok_button;
+			GtkWidget *cancel_button;
+
 			toolbar->bgcolor_dialog = gtk_color_selection_dialog_new(_("Select Background Color"));
 			colorsel =
-            gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog));
+				gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog));
 
-      if (color) {
+			if (color) {
 				gdk_color_parse(color, &bgcolor);
 				gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &bgcolor);
 				g_free(color);
@@ -359,13 +358,13 @@
 
 			g_object_set_data(G_OBJECT(colorsel), "purple_toolbar", toolbar);
 
-      g_object_get(G_OBJECT(toolbar->bgcolor_dialog), "ok-button", &ok_button, NULL);
-      g_object_get(G_OBJECT(toolbar->bgcolor_dialog), "cancel-button",
-                   &cancel_button, NULL);
+			g_object_get(G_OBJECT(toolbar->bgcolor_dialog), "ok-button", &ok_button, NULL);
+			g_object_get(G_OBJECT(toolbar->bgcolor_dialog), "cancel-button",
+			             &cancel_button, NULL);
 			g_signal_connect(G_OBJECT(toolbar->bgcolor_dialog), "delete_event",
 							 G_CALLBACK(destroy_toolbar_bgcolor), toolbar);
 			g_signal_connect(G_OBJECT(ok_button), "clicked",
-               G_CALLBACK(do_bgcolor), colorsel);
+			                 G_CALLBACK(do_bgcolor), colorsel);
 			g_signal_connect(G_OBJECT(cancel_button), "clicked",
 							 G_CALLBACK(cancel_toolbar_bgcolor), toolbar);
 
@@ -479,12 +478,12 @@
 
 static void insert_hr_cb(GtkWidget *widget, GtkIMHtmlToolbar *toolbar)
 {
-        GtkTextIter iter;
-        GtkTextMark *ins;
+	GtkTextIter iter;
+	GtkTextMark *ins;
 	GtkIMHtmlScalable *hr;
 
-        ins = gtk_text_buffer_get_insert(gtk_text_view_get_buffer(GTK_TEXT_VIEW(toolbar->imhtml)));
-        gtk_text_buffer_get_iter_at_mark(gtk_text_view_get_buffer(GTK_TEXT_VIEW(toolbar->imhtml)), &iter, ins);
+	ins = gtk_text_buffer_get_insert(gtk_text_view_get_buffer(GTK_TEXT_VIEW(toolbar->imhtml)));
+	gtk_text_buffer_get_iter_at_mark(gtk_text_view_get_buffer(GTK_TEXT_VIEW(toolbar->imhtml)), &iter, ins);
 	hr = gtk_imhtml_hr_new();
 	gtk_imhtml_hr_add_to(hr, GTK_IMHTML(toolbar->imhtml), &iter);
 }
@@ -1113,11 +1112,11 @@
 {
 	GtkWidget *widget = GTK_WIDGET(data);
 	GtkRequisition menu_req;
-  GtkAllocation allocation;
-  gint ythickness = gtk_widget_get_style(widget)->ythickness;
+	GtkAllocation allocation;
+	gint ythickness = gtk_widget_get_style(widget)->ythickness;
 	int savy;
 
-  gtk_widget_get_allocation(widget, &allocation);    
+	gtk_widget_get_allocation(widget, &allocation);    
 	gtk_widget_size_request(GTK_WIDGET (menu), &menu_req);
 	gdk_window_get_origin(gtk_widget_get_window(widget), x, y);
 	*x += allocation.x;
--- a/pidgin/gtklog.c	Sun Feb 13 06:40:09 2011 +0000
+++ b/pidgin/gtklog.c	Sun Feb 13 07:38:19 2011 +0000
@@ -582,10 +582,11 @@
 	gtk_dialog_add_button(GTK_DIALOG(lv->window), _("_Browse logs folder"), GTK_RESPONSE_HELP);
 #endif
 	gtk_container_set_border_width (GTK_CONTAINER(lv->window), PIDGIN_HIG_BOX_SPACE);
-  /* TODO: is it possible to set this in GTK+ 3.0?
-  gtk_dialog_set_has_separator(GTK_DIALOG(lv->window), FALSE);
-  */
-  gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(lv->window))), 0);
+	/* TODO: is it possible to set this in GTK+ 3.0? */
+#if 0
+	gtk_dialog_set_has_separator(GTK_DIALOG(lv->window), FALSE);
+#endif
+	gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(lv->window))), 0);
 	g_signal_connect(G_OBJECT(lv->window), "response",
 					 G_CALLBACK(destroy_cb), ht);
 	gtk_window_set_role(GTK_WINDOW(lv->window), "log_viewer");
@@ -595,7 +596,7 @@
 		title_box = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 		gtk_container_set_border_width(GTK_CONTAINER(title_box), PIDGIN_HIG_BOX_SPACE);
 		gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(lv->window))),
-                       title_box, FALSE, FALSE, 0);
+		                   title_box, FALSE, FALSE, 0);
 
 		gtk_box_pack_start(GTK_BOX(title_box), icon, FALSE, FALSE, 0);
 	} else
@@ -615,7 +616,7 @@
 	pane = gtk_hpaned_new();
 	gtk_container_set_border_width(GTK_CONTAINER(pane), PIDGIN_HIG_BOX_SPACE);
 	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(lv->window))),
-                     pane, TRUE, TRUE, 0);
+	                   pane, TRUE, TRUE, 0);
 
 	/* List *************/
 	sw = gtk_scrolled_window_new (NULL, NULL);
@@ -654,7 +655,7 @@
 		/*		gtk_paned_add1(GTK_PANED(pane), size_label); */
 		gtk_misc_set_alignment(GTK_MISC(size_label), 0, 0);
 		gtk_box_pack_end(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(lv->window))),
-                     size_label, FALSE, FALSE, 0);
+		                 size_label, FALSE, FALSE, 0);
 		g_free(sz_txt);
 		g_free(text);
 	}
--- a/pidgin/gtknotify.c	Sun Feb 13 06:40:09 2011 +0000
+++ b/pidgin/gtknotify.c	Sun Feb 13 07:38:19 2011 +0000
@@ -534,18 +534,19 @@
 
 	gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BORDER);
 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
-  /* TODO: not sure if there is a way to do this in gtk+ 3, or
-     if we want to...
+	/* TODO: not sure if there is a way to do this in gtk+ 3, or
+	   if we want to... */
+#if 0
 	gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
-  */
-  gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                      PIDGIN_HIG_BORDER);
+#endif
+	gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
+	                    PIDGIN_HIG_BORDER);
 	gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                                 PIDGIN_HIG_BOX_SPACE);
+	                               PIDGIN_HIG_BOX_SPACE);
 
 	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
 	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                    hbox);
+	                  hbox);
 
 	if (img != NULL)
 		gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
@@ -1523,12 +1524,13 @@
 	/* Setup the dialog */
 	gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BOX_SPACE);
 	gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                                 PIDGIN_HIG_BOX_SPACE);
-  /* TODO: not sure if this is possible (or nessesary) in gtk+ 3
+	                               PIDGIN_HIG_BOX_SPACE);
+	/* TODO: not sure if this is possible (or necessary) in gtk+ 3 */
+#if 0
 	gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
-  */
+#endif
 	gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                      PIDGIN_HIG_BORDER);
+	                    PIDGIN_HIG_BORDER);
 
 	/* Vertical box */
 	vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
--- a/pidgin/gtkplugin.c	Sun Feb 13 06:40:09 2011 +0000
+++ b/pidgin/gtkplugin.c	Sun Feb 13 07:38:19 2011 +0000
@@ -562,13 +562,13 @@
 pidgin_plugins_paint_tooltip(GtkWidget *tipwindow, gpointer data)
 {
 	PangoLayout *layout = g_object_get_data(G_OBJECT(tipwindow), "tooltip-plugin");
-  cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(tipwindow));
-  gtk_paint_layout(gtk_widget_get_style(tipwindow), cr, GTK_STATE_NORMAL, FALSE,
+	cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(tipwindow));
+	gtk_paint_layout(gtk_widget_get_style(tipwindow), cr, GTK_STATE_NORMAL, FALSE,
 			tipwindow, "tooltip",
 			6, 6, layout);
-  cairo_destroy(cr);
+	cairo_destroy(cr);
 
-  return TRUE;
+	return TRUE;
 }
 
 static gboolean
@@ -738,7 +738,7 @@
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
 
 	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(plugin_dialog))),
-                     sw, TRUE, TRUE, 0);
+	                   sw, TRUE, TRUE, 0);
 
 	ls = gtk_list_store_new(4, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN);
 	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(ls),
@@ -799,7 +799,7 @@
 	gtk_widget_set_sensitive(expander, FALSE);
 	gtk_container_add(GTK_CONTAINER(expander), create_details());
 	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(plugin_dialog))),
-    expander, FALSE, FALSE, 0);
+	                   expander, FALSE, FALSE, 0);
 
 
 	g_signal_connect (G_OBJECT (sel), "changed", G_CALLBACK (prefs_plugin_sel), NULL);
--- a/pidgin/gtkpounce.c	Sun Feb 13 06:40:09 2011 +0000
+++ b/pidgin/gtkpounce.c	Sun Feb 13 07:38:19 2011 +0000
@@ -410,9 +410,9 @@
 				GtkSelectionData *sd, guint info, guint t, gpointer data)
 {
 	PidginPounceDialog *dialog;
-  GdkAtom target = gtk_selection_data_get_target(sd);
-  const guchar *sd_data = gtk_selection_data_get_data(sd);
-    
+	GdkAtom target = gtk_selection_data_get_target(sd);
+	const guchar *sd_data = gtk_selection_data_get_data(sd);
+
 	if (target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE))
 	{
 		PurpleBlistNode *node = NULL;
--- a/pidgin/gtkprefs.c	Sun Feb 13 06:40:09 2011 +0000
+++ b/pidgin/gtkprefs.c	Sun Feb 13 07:38:19 2011 +0000
@@ -867,7 +867,7 @@
 	gchar *name = g_strchomp((gchar *)gtk_selection_data_get_data(sd));
 
 	if ((gtk_selection_data_get_length(sd) >= 0)
-      && (gtk_selection_data_get_format(sd) == 8)) {
+	 && (gtk_selection_data_get_format(sd) == 8)) {
 		/* Well, it looks like the drag event was cool.
 		 * Let's do something with it */
 		gchar *temp;
@@ -2540,18 +2540,17 @@
 								sound_changed2_cb, vbox);
 #endif
 	vbox = pidgin_make_frame(ret, _("Sound Events"));
-  parent = gtk_widget_get_parent(vbox);
-  parent_parent = gtk_widget_get_parent(parent);
-  parent_parent_parent = gtk_widget_get_parent(parent_parent);
-    
+	parent = gtk_widget_get_parent(vbox);
+	parent_parent = gtk_widget_get_parent(parent);
+	parent_parent_parent = gtk_widget_get_parent(parent_parent);
+
 	/* The following is an ugly hack to make the frame expand so the
 	 * sound events list is big enough to be usable */
 	gtk_box_set_child_packing(GTK_BOX(parent), vbox, TRUE, TRUE, 0,
 			GTK_PACK_START);
 	gtk_box_set_child_packing(GTK_BOX(parent_parent),
-      parent, TRUE, TRUE, 0, GTK_PACK_START);
-	gtk_box_set_child_packing(
-      GTK_BOX(parent_parent_parent),
+			parent, TRUE, TRUE, 0, GTK_PACK_START);
+	gtk_box_set_child_packing(GTK_BOX(parent_parent_parent),
 			parent_parent, TRUE, TRUE, 0, GTK_PACK_START);
 
 	/* SOUND SELECTION */
--- a/pidgin/gtkrequest.c	Sun Feb 13 06:40:09 2011 +0000
+++ b/pidgin/gtkrequest.c	Sun Feb 13 07:38:19 2011 +0000
@@ -106,9 +106,9 @@
 
 	if (GTK_IS_DIALOG(cont)) {
 		gtk_box_pack_start(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(cont))),
-                       image, FALSE, TRUE, 0);
+	                       image, FALSE, TRUE, 0);
 		gtk_box_reorder_child(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(cont))),
-                          image, 0);
+	                          image, 0);
 	} else if (GTK_IS_HBOX(cont)) {
 		gtk_misc_set_alignment(GTK_MISC(image), 0, 0);
 		gtk_box_pack_end(GTK_BOX(cont), image, FALSE, TRUE, 0);
@@ -362,20 +362,21 @@
 	/* Setup the dialog */
 	gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BORDER/2);
 	gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                                 PIDGIN_HIG_BORDER / 2);
+	                               PIDGIN_HIG_BORDER / 2);
 	if (!multiline)
 		gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
-  /* TODO: not sure how to do this with GTK+ 3 
+	/* TODO: not sure how to do this with GTK+ 3 */
+#if 0
 	gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
-  */
+#endif
 	gtk_dialog_set_default_response(GTK_DIALOG(dialog), 0);
 	gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                      PIDGIN_HIG_BORDER);
+	                    PIDGIN_HIG_BORDER);
 
 	/* Setup the main horizontal box */
 	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
 	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                    hbox);
+	                  hbox);
 
 	/* Dialog icon. */
 	img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
@@ -544,18 +545,19 @@
 	/* Setup the dialog */
 	gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BORDER/2);
 	gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                                 PIDGIN_HIG_BORDER / 2);
+	                               PIDGIN_HIG_BORDER / 2);
 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
-  /* TODO: don't know if this is possible with GTK+ 3
-  gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
-  */
+	/* TODO: don't know if this is possible with GTK+ 3 */
+#if 0
+	gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+#endif
 	gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                      PIDGIN_HIG_BORDER);
+	                    PIDGIN_HIG_BORDER);
 
 	/* Setup the main horizontal box */
 	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
 	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                    hbox);
+	                  hbox);
 
 	/* Dialog icon. */
 	img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
@@ -671,18 +673,19 @@
 	/* Setup the dialog */
 	gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BORDER/2);
 	gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                                 PIDGIN_HIG_BORDER / 2);
+	                               PIDGIN_HIG_BORDER / 2);
 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
-  /* TODO: this is probably not supported by GTK+ 3
-  gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
-  */
+	/* TODO: this is probably not supported by GTK+ 3 */
+#if 0
+	gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+#endif
 	gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                      PIDGIN_HIG_BORDER);
+	                    PIDGIN_HIG_BORDER);
 
 	/* Setup the main horizontal box */
 	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
 	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-                    hbox);
+	                  hbox);
 
 	/* Dialog icon. */
 	if (icon_data) {
@@ -753,8 +756,8 @@
 
 
 	if (default_action == PURPLE_DEFAULT_ACTION_NONE) {
-    gtk_widget_set_can_default(img, TRUE);
-    gtk_widget_set_can_focus(img, TRUE);
+		gtk_widget_set_can_default(img, TRUE);
+		gtk_widget_set_can_focus(img, TRUE);
 		gtk_widget_grab_focus(img);
 		gtk_widget_grab_default(img);
 	} else
@@ -1281,12 +1284,12 @@
 
 	/* Cancel button */
 	button = pidgin_dialog_add_button(GTK_DIALOG(win), text_to_stock(cancel_text), G_CALLBACK(multifield_cancel_cb), data);
-  gtk_widget_set_can_default(button, TRUE);
+	gtk_widget_set_can_default(button, TRUE);
 
 	/* OK button */
 	button = pidgin_dialog_add_button(GTK_DIALOG(win), text_to_stock(ok_text), G_CALLBACK(multifield_ok_cb), data);
 	data->ok_button = button;
-  gtk_widget_set_can_default(button, TRUE);
+	gtk_widget_set_can_default(button, TRUE);
 	gtk_window_set_default(GTK_WINDOW(win), button);
 
 	pidgin_widget_decorate_account(hbox, account);
--- a/pidgin/gtkroomlist.c	Sun Feb 13 06:40:09 2011 +0000
+++ b/pidgin/gtkroomlist.c	Sun Feb 13 07:38:19 2011 +0000
@@ -359,9 +359,8 @@
 	int current_height, max_width;
 	int max_text_width;
 	GtkTextDirection dir = gtk_widget_get_direction(GTK_WIDGET(grl->tree));
-  cairo_t *cr =
-        gdk_cairo_create(gtk_widget_get_window(grl->tipwindow));
-    
+	cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(grl->tipwindow));
+
 	style = gtk_widget_get_style(grl->tipwindow);
 
 	max_text_width = MAX(grl->tip_width, grl->tip_name_width);
@@ -390,7 +389,7 @@
 				current_height + grl->tip_name_height,
 				grl->tip_layout);
 	}
-  cairo_destroy(cr);
+	cairo_destroy(cr);
 
 	return FALSE;
 }
--- a/pidgin/gtkutils.c	Sun Feb 13 06:40:09 2011 +0000
+++ b/pidgin/gtkutils.c	Sun Feb 13 07:38:19 2011 +0000
@@ -1807,8 +1807,8 @@
 		group = gtk_menu_get_accel_group(GTK_MENU(menu));
 		if (group) {
 			char *path = g_strdup_printf("%s/%s",
-                    gtk_menu_item_get_accel_path(GTK_MENU_ITEM(menuitem)),
-                    act->label);
+				gtk_menu_item_get_accel_path(GTK_MENU_ITEM(menuitem)),
+				act->label);
 			gtk_menu_set_accel_path(GTK_MENU(submenu), path);
 			g_free(path);
 			gtk_menu_set_accel_group(GTK_MENU(submenu), group);
@@ -2188,7 +2188,7 @@
 	gtk_widget_destroy(dialog->icon_filesel);
 	g_free(filename);
 	g_free(dialog);
- }
+}
 
 
 static void
@@ -2822,7 +2822,7 @@
 	if (!widget)
 		return "dim grey";
 
- 	style = gtk_widget_get_style(widget);
+	style = gtk_widget_get_style(widget);
 	if (!style)
 		return "dim grey";
 
--- a/pidgin/gtkwhiteboard.c	Sun Feb 13 06:40:09 2011 +0000
+++ b/pidgin/gtkwhiteboard.c	Sun Feb 13 07:38:19 2011 +0000
@@ -360,7 +360,7 @@
 	cairo_t *cr;
 	GdkWindow *window = gtk_widget_get_window(widget);
 	GtkAllocation allocation;
-    
+
 	if (pixbuf) {
 		cr = g_object_get_data(G_OBJECT(pixbuf), "cairo-context");
 		if (cr)
@@ -369,11 +369,11 @@
 	}
 
 	gtk_widget_get_allocation(widget, &allocation);
-    
+
 	pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
-    	FALSE, gdk_visual_get_depth(GDK_VISUAL(window)),
-		allocation.width, allocation.height);
-                                                    
+	    	                FALSE, gdk_visual_get_depth(GDK_VISUAL(window)),
+	    	                allocation.width, allocation.height);
+
 	gtkwb->pixbuf = pixbuf;
 
 	cr = gdk_cairo_create(gtk_widget_get_window(widget));
@@ -708,10 +708,10 @@
 	GdkPixbuf *pixbuf = gtkwb->pixbuf;
 	GtkWidget *drawing_area = gtkwb->drawing_area;
 	cairo_t *cr = g_object_get_data(G_OBJECT(pixbuf), "cairo-context");
-  GtkAllocation allocation;
+	GtkAllocation allocation;
 
-  gtk_widget_get_allocation(drawing_area, &allocation);
-    
+	gtk_widget_get_allocation(drawing_area, &allocation);
+
 	gdk_cairo_set_source_color(cr, &gtk_widget_get_style(drawing_area)->white);
 	cairo_rectangle(cr,
 	                0, 0,
@@ -788,15 +788,15 @@
 		gtk_widget_destroy(dialog);
 
 		/* Makes an icon from the whiteboard's canvas 'image' */
-    pixbuf = gtkwb->pixbuf;
-    /*
+		pixbuf = gtkwb->pixbuf;
+/*
 		pixbuf = gdk_pixbuf_get_from_drawable(NULL,
 											  (GdkDrawable*)(gtkwb->pixmap),
 											  gdk_drawable_get_colormap(gtkwb->pixmap),
 											  0, 0,
 											  0, 0,
 											  gtkwb->width, gtkwb->height);
-    */
+*/
 
 		if(gdk_pixbuf_save(pixbuf, filename, "jpeg", NULL, "quality", "100", NULL))
 			purple_debug_info("gtkwhiteboard", "File Saved...\n");
@@ -817,15 +817,15 @@
 	GdkPixbuf *pixbuf;
 
 	/* Makes an icon from the whiteboard's canvas 'image' */
-  pixbuf = gtkwb->pixbuf;
-  /*
+	pixbuf = gtkwb->pixbuf;
+/*
 	pixbuf = gdk_pixbuf_get_from_drawable(NULL,
 										  (GdkDrawable*)(gtkwb->pixmap),
 										  gdk_drawable_get_colormap(gtkwb->pixmap),
 										  0, 0,
 										  0, 0,
 										  gtkwb->width, gtkwb->height);
-  */
+*/
 
 	gtk_window_set_icon((GtkWindow*)(gtkwb->window), pixbuf);
 }
@@ -866,21 +866,20 @@
 {
 	GdkColor color;
 	GtkColorSelectionDialog *dialog;
-  GtkWidget *ok_button;
-    
+	GtkWidget *ok_button;
+
 	dialog = (GtkColorSelectionDialog *)gtk_color_selection_dialog_new(_("Select color"));
 	g_object_set_data(G_OBJECT(gtkwb->window), "colour-dialog", dialog);
 
 	g_signal_connect(G_OBJECT(gtk_color_selection_dialog_get_color_selection(dialog)),
-          "color-changed",
-					G_CALLBACK(change_color_cb), gtkwb);
+	                 "color-changed", G_CALLBACK(change_color_cb), gtkwb);
 
-  /*
+/*
 	gtk_widget_destroy(dialog->cancel_button);
 	gtk_widget_destroy(dialog->help_button);
-  */
-  g_object_get(G_OBJECT(dialog), "ok-button", &ok_button, NULL);
-      
+*/
+	g_object_get(G_OBJECT(dialog), "ok-button", &ok_button, NULL);
+
 	g_signal_connect(G_OBJECT(ok_button), "clicked",
 					G_CALLBACK(color_selection_dialog_destroy), gtkwb);
 
@@ -888,7 +887,7 @@
 
 	pidgin_whiteboard_rgb24_to_rgb48(gtkwb->brush_color, &color);
 	gtk_color_selection_set_current_color(
-      GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(dialog)), &color);
+		GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(dialog)), &color);
 
 	gtk_widget_show_all(GTK_WIDGET(dialog));
 }
--- a/pidgin/pidginstock.c	Sun Feb 13 06:40:09 2011 +0000
+++ b/pidgin/pidginstock.c	Sun Feb 13 07:38:19 2011 +0000
@@ -95,7 +95,7 @@
 
 typedef struct {
 	const char *name;
- 	const char *dir;
+	const char *dir;
 	const char *filename;
 	gboolean microscopic;
 	gboolean extra_small;