Mercurial > pidgin
changeset 24102:23f7321b8291
merge of '7b270e8b949f20550eec69f904e57b5431a83f10'
and 'f12c8903079425d7850fa183df0b3f937b2952be'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Thu, 11 Sep 2008 21:13:13 +0000 |
| parents | 1c45897c79fc (diff) 40a4e02027f4 (current diff) |
| children | 0d200c4188e4 |
| files | |
| diffstat | 3 files changed, 1 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkprefs.c Thu Sep 11 04:19:37 2008 +0000 +++ b/pidgin/gtkprefs.c Thu Sep 11 21:13:13 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 04:19:37 2008 +0000 +++ b/pidgin/gtksavedstatuses.c Thu Sep 11 21:13:13 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 04:19:37 2008 +0000 +++ b/pidgin/gtkstatusbox.c Thu Sep 11 21:13:13 2008 +0000 @@ -2715,8 +2715,7 @@ 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 {