[Gaim-commits] CVS: gaim/src gtksavedstatuses.c,1.41,1.42

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13397

Modified Files:
	gtksavedstatuses.c 
Log Message:
Make sure AIM users can't try to set themselves "DND" or Extended
Away or whatever by respected the "is user settable?" flag for
status types in gtksavedstatuses.c


Index: gtksavedstatuses.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtksavedstatuses.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -p -r1.41 -r1.42
--- gtksavedstatuses.c	19 Jan 2006 18:20:46 -0000	1.41
+++ gtksavedstatuses.c	23 Jan 2006 04:18:34 -0000	1.42
@@ -759,8 +759,8 @@ status_editor_ok_cb(GtkButton *button, g
 	if (status_window != NULL)
 	  add_status_to_saved_status_list(status_window->model, saved_status);
 
-	if ((button == dialog->saveanduse_button)
-			|| (button != dialog->save_button))
+	/* If they clicked on "Save & Use" or "Use," then activate the status */
+	if (button != dialog->save_button)
 		gaim_savedstatus_activate(saved_status);
 }
 
@@ -1463,6 +1463,11 @@ edit_substatus(StatusEditor *status_edit
 		const char *id, *name;
 
 		status_type = list->data;
+
+		/* Only allow users to select statuses that are flagged as "user settable" */
+		if (!gaim_status_type_is_user_settable(status_type))
+			continue;
+
 		id = gaim_status_type_get_id(status_type);
 		pixbuf = gaim_gtk_create_prpl_icon_with_status(account, status_type);
 		if (pixbuf != NULL)