Mercurial > pidgin
changeset 18606:ac9f19a31051
merge of 'ee06baadf86c44d4707c364c06c874bd9b27ad07'
and 'ff1016b75717a37c96fb6e4d7e388259022043de'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 22 Jul 2007 07:09:33 +0000 |
| parents | 5733c0691c25 (diff) 321658bf0e03 (current diff) |
| children | c46515956e2e a244c34ce59c |
| files | |
| diffstat | 2 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Sun Jul 22 06:53:13 2007 +0000 +++ b/pidgin/gtkconv.c Sun Jul 22 07:09:33 2007 +0000 @@ -4804,6 +4804,11 @@ else gtk_widget_hide(gtkconv->toolbar); + if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons")) + gtk_widget_show(gtkconv->infopane_hbox); + else + gtk_widget_hide(gtkconv->infopane_hbox); + gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml), purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_timestamps")); gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->imhtml), @@ -6783,9 +6788,14 @@ for (l = purple_get_conversations(); l != NULL; l = l->next) { PurpleConversation *conv = l->data; - - if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) + if (GPOINTER_TO_INT(value)) + gtk_widget_show(PIDGIN_CONVERSATION(conv)->infopane_hbox); + else + gtk_widget_hide(PIDGIN_CONVERSATION(conv)->infopane_hbox); + + if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) { pidgin_conv_update_buddy_icon(conv); + } } }
--- a/pidgin/gtkprefs.c Sun Jul 22 06:53:13 2007 +0000 +++ b/pidgin/gtkprefs.c Sun Jul 22 07:09:33 2007 +0000 @@ -994,7 +994,7 @@ pidgin_prefs_checkbox(_("Show _formatting on incoming messages"), PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting", vbox); - iconpref1 = pidgin_prefs_checkbox(_("Show buddy _icons"), + iconpref1 = pidgin_prefs_checkbox(_("Show Buddy _Details"), PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons", vbox); iconpref2 = pidgin_prefs_checkbox(_("Enable buddy ic_on animation"), PIDGIN_PREFS_ROOT "/conversations/im/animate_buddy_icons", vbox);