Mercurial > pidgin.yaz
diff pidgin/gtkdocklet.c @ 18462:d4d31d8112b5
merge of 'b0ec0f2d37460f78a06935a7f1d5a57f897c916f'
and 'f77175b39d6209f3bca85b3d1baca3eee2f14900'
author | Will Thompson <will.thompson@collabora.co.uk> |
---|---|
date | Mon, 09 Jul 2007 12:13:38 +0000 |
parents | 1bb77e24cced |
children |
line wrap: on
line diff
--- a/pidgin/gtkdocklet.c Fri Jul 06 13:43:28 2007 +0000 +++ b/pidgin/gtkdocklet.c Mon Jul 09 12:13:38 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);