Mercurial > pidgin
changeset 18113:97b735ca9d7a
merge of '55af2e26c71950d7f8fc3a7b6a9b2249abb5ae0f'
and 'ab66c9deff83832be4f49fffce0742d853b6c8b1'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sat, 16 Jun 2007 20:16:36 +0000 |
| parents | f52def9dc7c9 (current diff) d40fd7106ebf (diff) |
| children | 9b9e202eb449 |
| files | ChangeLog.API libpurple/blist.c libpurple/conversation.c pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkimhtml.c pidgin/gtkimhtmltoolbar.c pidgin/gtkpounce.c pidgin/gtkutils.c |
| diffstat | 3 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkaccount.c Sat Jun 16 17:57:07 2007 +0000 +++ b/pidgin/gtkaccount.c Sat Jun 16 20:16:36 2007 +0000 @@ -2686,3 +2686,4 @@ purple_signals_unregister_by_instance(pidgin_account_get_handle()); } +
--- a/pidgin/gtkblist.c Sat Jun 16 17:57:07 2007 +0000 +++ b/pidgin/gtkblist.c Sat Jun 16 20:16:36 2007 +0000 @@ -4234,7 +4234,7 @@ {"application/x-im-contact", 0, DRAG_BUDDY}, {"text/x-vcard", 0, DRAG_VCARD }}; if (gtkblist && gtkblist->window) { - purple_blist_set_visible(TRUE); + purple_blist_set_visible(purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/list_visible")); return; } @@ -5030,6 +5030,7 @@ PurpleContact *contact; PurpleBuddy *buddy; struct _pidgin_blist_node *gtknode; + if (editing_blist) return; @@ -5128,6 +5129,7 @@ PurpleChat *chat; g_return_if_fail(PURPLE_BLIST_NODE_IS_CHAT(node)); + if (editing_blist) return; @@ -6736,3 +6738,4 @@ if (activeitem) gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(activeitem), TRUE); } +