# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1055016722 0
# Node ID d23c0d94be18003b4c94d46c88d838332fb9b636
# Parent  4ee33a2f421ec93aedf82d859709e404d0a2d59e
[gaim-migrate @ 6232]
The account editor is now gtk 2.0 again.

committer: Tailor Script <tailor@pidgin.im>

diff -r 4ee33a2f421e -r d23c0d94be18 src/gtkaccount.c
--- a/src/gtkaccount.c	Sat Jun 07 19:39:26 2003 +0000
+++ b/src/gtkaccount.c	Sat Jun 07 20:12:02 2003 +0000
@@ -1143,6 +1143,42 @@
 }
 
 static void
+move_account_after(GtkListStore *store, GtkTreeIter *iter,
+				   GtkTreeIter *position)
+{
+	GtkTreeIter new_iter;
+	GaimAccount *account;
+
+	gtk_tree_model_get(GTK_TREE_MODEL(store), iter,
+					   COLUMN_DATA, &account,
+					   -1);
+
+	gtk_list_store_insert_after(store, &new_iter, position);
+
+	set_account(store, &new_iter, account);
+
+	gtk_list_store_remove(store, iter);
+}
+
+static void
+move_account_before(GtkListStore *store, GtkTreeIter *iter,
+					GtkTreeIter *position)
+{
+	GtkTreeIter new_iter;
+	GaimAccount *account;
+
+	gtk_tree_model_get(GTK_TREE_MODEL(store), iter,
+					   COLUMN_DATA, &account,
+					   -1);
+
+	gtk_list_store_insert_before(store, &new_iter, position);
+
+	set_account(store, &new_iter, account);
+
+	gtk_list_store_remove(store, iter);
+}
+
+static void
 drag_data_received_cb(GtkWidget *widget, GdkDragContext *ctx,
 						guint x, guint y, GtkSelectionData *sd,
 						guint info, guint t, AccountsDialog *dialog)
@@ -1171,42 +1207,19 @@
 			switch (position) {
 				case GTK_TREE_VIEW_DROP_AFTER:
 				case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
-					gaim_debug(GAIM_DEBUG_MISC, "gtkaccount",
-							   "after\n");
-					gtk_list_store_move_after(dialog->model,
-											  &dialog->drag_iter, &iter);
+					move_account_after(dialog->model, &dialog->drag_iter,
+									   &iter);
 					dest_index = g_list_index(gaim_accounts_get_all(),
 											  account) + 1;
 					break;
 
 				case GTK_TREE_VIEW_DROP_BEFORE:
 				case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
-					gaim_debug(GAIM_DEBUG_MISC, "gtkaccount",
-							   "before\n");
 					dest_index = g_list_index(gaim_accounts_get_all(),
 											  account);
 
-					gaim_debug(GAIM_DEBUG_MISC, "gtkaccount",
-							   "iter = %p\n", &iter);
-					gaim_debug(GAIM_DEBUG_MISC, "gtkaccount",
-							   "account = %s\n",
-							   gaim_account_get_username(account));
-
-					/*
-					 * Somebody figure out why inserting before the first
-					 * account sometimes moves to the end, please :(
-					 */
-					if (dest_index == 0) {
-						gtk_list_store_move_after(dialog->model,
-												  &dialog->drag_iter, &iter);
-						gtk_list_store_swap(dialog->model, &iter,
-											&dialog->drag_iter);
-					}
-					else {
-						gtk_list_store_move_before(dialog->model,
-												   &dialog->drag_iter, &iter);
-					}
-
+					move_account_before(dialog->model, &dialog->drag_iter,
+										&iter);
 					break;
 
 				default: