# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1139443208 0
# Node ID 7099a443131dfe1fdb1756370e482396df8e3200
# Parent  3426bc61bb8b7ee7625df1c4f7280ad417f49734
[gaim-migrate @ 15557]
The other half of sf patch #1414103, from Sadrul Habib Chowdhury
"Make the initial selection in the substatus-
edit dialog correct (currently it always opens with the
last status in the list selected)."

committer: Tailor Script <tailor@pidgin.im>

diff -r 3426bc61bb8b -r 7099a443131d src/gtksavedstatuses.c
--- a/src/gtksavedstatuses.c	Wed Feb 08 23:53:26 2006 +0000
+++ b/src/gtksavedstatuses.c	Thu Feb 09 00:00:08 2006 +0000
@@ -1392,7 +1392,7 @@
 	GtkWidget *win;
 	GtkTreeIter iter;
 	GtkCellRenderer *rend;
-	const char *id = NULL;
+	const char *status_id = NULL;
 	const GList *list;
 	gboolean select = FALSE;
 
@@ -1524,8 +1524,9 @@
 			gtk_imhtml_append_text(dialog->message,
 								   gaim_savedstatus_substatus_get_message(substatus),
 								   0);
-			id = gaim_status_type_get_id(gaim_savedstatus_substatus_get_type(substatus));
+			status_id = gaim_status_type_get_id(gaim_savedstatus_substatus_get_type(substatus));
 		}
+		/* TODO: Else get the generic status type from our parent */
 	}
 
 	for (list = gaim_account_get_status_types(account); list; list = list->next)
@@ -1552,7 +1553,7 @@
 						   -1);
 		if (pixbuf != NULL)
 			g_object_unref(pixbuf);
-		if (id && !strcmp(id, gaim_status_type_get_id(status_type)))
+		if ((status_id != NULL) && !strcmp(status_id, id))
 		{
 			gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo), &iter);
 			select = TRUE;