diff options
| author | Richard Laager <rlaager@pidgin.im> | 2008-09-11 21:12:24 +0000 |
|---|---|---|
| committer | Richard Laager <rlaager@pidgin.im> | 2008-09-11 21:12:24 +0000 |
| commit | a05cd76891b6f6152fb0aa92d62897d5a5c6e052 (patch) | |
| tree | e0fa28107bf422fc43d55cc9a62945e02903279f | |
| parent | 80b07aa03462758de6f2f924d4e105a7cd9c76a9 (diff) | |
| download | pidgin-a05cd76891b6f6152fb0aa92d62897d5a5c6e052.tar.gz | |
disapproval of revision '3ddbca0498b2774da7d7321895e19521d667cffa'
| -rw-r--r-- | pidgin/gtkprefs.c | 6 | ||||
| -rw-r--r-- | pidgin/gtksavedstatuses.c | 1 | ||||
| -rw-r--r-- | pidgin/gtkstatusbox.c | 3 |
3 files changed, 1 insertions, 9 deletions
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c index 6f9c623c69..8c91e6b7a7 100644 --- a/pidgin/gtkprefs.c +++ b/pidgin/gtkprefs.c @@ -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; diff --git a/pidgin/gtksavedstatuses.c b/pidgin/gtksavedstatuses.c index 3cf3d5d6bc..2ae61933a8 100644 --- a/pidgin/gtksavedstatuses.c +++ b/pidgin/gtksavedstatuses.c @@ -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 diff --git a/pidgin/gtkstatusbox.c b/pidgin/gtkstatusbox.c index 01e76a315d..9fbeab330d 100644 --- a/pidgin/gtkstatusbox.c +++ b/pidgin/gtkstatusbox.c @@ -2715,8 +2715,7 @@ static void pidgin_status_box_changed(PidginStatusBox *status_box) 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 { |