changeset 24104:f5b03b4536bb

merge of 'a636632c34e757253b9488f72068ffa94dc1727f' and 'fdd9f3f010d4b669ac116e908ed6ba8ace58d18f'

--- a/ChangeLog	Thu Sep 11 20:58:15 2008 +0000
+++ b/ChangeLog	Thu Sep 11 21:16:07 2008 +0000
@@ -31,6 +31,7 @@
 	Pidgin:
 	* Prevent use of custom smilies without "shortcuts."
 	* Fix a crash that could appear with AIM buddy tooltips.
+	* The status selector now saves your message when changing status.
 
 	Artwork:
 	* General refresh of many icons in the interface.

--- a/pidgin/gtkprefs.c	Thu Sep 11 20:58:15 2008 +0000
+++ b/pidgin/gtkprefs.c	Thu Sep 11 21:16:07 2008 +0000
@@ -1005,12 +1005,6 @@
 	keyboard_shortcuts(ret);
 
 
-	/* Status selector options */
-	vbox = pidgin_make_frame(ret, _("Status Selector"));
-	pidgin_prefs_checkbox(_("Keep the status message when the status is changed"),
-				PIDGIN_PREFS_ROOT "/status/keep_status_message", vbox);
-
-
 	gtk_widget_show_all(ret);
 	g_object_unref(sg);
 	return ret;

--- a/pidgin/gtksavedstatuses.c	Thu Sep 11 20:58:15 2008 +0000
+++ b/pidgin/gtksavedstatuses.c	Thu Sep 11 21:16:07 2008 +0000
@@ -1913,7 +1913,6 @@
 	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/status/dialog");
 	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/status/dialog/width",  550);
 	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/status/dialog/height", 250);
-	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/status/keep_status_message", FALSE);
 }
 
 void

--- a/pidgin/gtkstatusbox.c	Thu Sep 11 20:58:15 2008 +0000
+++ b/pidgin/gtkstatusbox.c	Thu Sep 11 21:16:07 2008 +0000
@@ -2715,8 +2715,6 @@
 			gtk_widget_show_all(status_box->vbox);
 			status_box->typing = g_timeout_add(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box);
 			gtk_widget_grab_focus(status_box->imhtml);
-			if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/status/keep_status_message"))
-				gtk_imhtml_clear(GTK_IMHTML(status_box->imhtml));
 		}
 		else
 		{