Mercurial > pidgin
changeset 18417:579ba9866882
merge of '2c61c0960a48cb258fd0a3c93727265ec78e7809'
and 'efa0e31922a07bb598a6fc8951462e1fa96a886e'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Mon, 02 Jul 2007 22:59:10 +0000 |
| parents | 93c5c785a811 (current diff) ec20ef0c2509 (diff) |
| children | b51dcbac4798 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jul 02 22:58:36 2007 +0000 +++ b/ChangeLog Mon Jul 02 22:59:10 2007 +0000 @@ -18,6 +18,10 @@ directory. The net effect of this is that trying to start Pidgin a second time will raise the buddy list. (Gabriel Schulhof) * Undo capability in the conversation window + * The formatting toolbar has been reorganized to be more concise. + * A new status area has been added to the top of conversations to + provide additional detail about the buddy, including buddy icon, + protocol and status message. Finch: * There's support for workspaces now (details in the manpage)
--- a/pidgin/gtkdocklet.c Mon Jul 02 22:58:36 2007 +0000 +++ b/pidgin/gtkdocklet.c Mon Jul 02 22:59:10 2007 +0000 @@ -636,7 +636,7 @@ purple_prefs_add_none(PIDGIN_PREFS_ROOT "/docklet"); purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/blink", FALSE); - purple_prefs_add_string(PIDGIN_PREFS_ROOT "/docklet/show", "always"); + purple_prefs_add_string(PIDGIN_PREFS_ROOT "/docklet/show", "pending"); purple_prefs_connect_callback(docklet_handle, PIDGIN_PREFS_ROOT "/docklet/show", docklet_show_pref_changed_cb, NULL);