pidgin: 7b270e8b: disapproval of revision 'fedd8495d3e49df...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 7b270e8b949f20550eec69f904e57b5431a83f10
Ancestor: fedd8495d3e49df957ae842bc5fa289452d048f8
Author: rlaager at pidgin.im
Date: 2008-09-11T21:12:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7b270e8b949f20550eec69f904e57b5431a83f10

Modified files:
        pidgin/gtkprefs.c pidgin/gtksavedstatuses.c
        pidgin/gtkstatusbox.c

ChangeLog: 

disapproval of revision 'fedd8495d3e49df957ae842bc5fa289452d048f8'
-------------- next part --------------
============================================================
--- pidgin/gtkprefs.c	029641dacc2718be8af96119a02478a4e943a9fa
+++ pidgin/gtkprefs.c	8809e6b4d86c5a2d7b5d4242747b3c536a53a078
@@ -1005,12 +1005,6 @@ interface_page(void)
 	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;
============================================================
--- pidgin/gtksavedstatuses.c	a18295d7124b130e2fda23528fafc6b066be0197
+++ pidgin/gtksavedstatuses.c	26d7f2493b4efd47f78544b5aa8b2a6c2b5dedc8
@@ -1913,7 +1913,6 @@ pidgin_status_init(void)
 	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
============================================================
--- pidgin/gtkstatusbox.c	d3562d5ee01581b93b6f85de87436a4f7983d71e
+++ pidgin/gtkstatusbox.c	1b95c96acf0a83332cf25d43b0f185338fe9871c
@@ -2715,8 +2715,7 @@ static void pidgin_status_box_changed(Pi
 			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));
+			gtk_imhtml_clear(GTK_IMHTML(status_box->imhtml));
 		}
 		else
 		{