Mercurial > pidgin
changeset 20650:31f4199a4cd4
merge of '0323f7621f6891ce008d0a124fef6ed63c856802'
and '6ce1cc1ed82e1940fd7b17f4ca3c8350885117fa'
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sun, 23 Sep 2007 11:38:13 +0000 |
| parents | 964014aee978 (current diff) c905f5824422 (diff) |
| children | c1b559a2610f |
| files | |
| diffstat | 4 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Sep 22 03:21:11 2007 +0000 +++ b/ChangeLog Sun Sep 23 11:38:13 2007 +0000 @@ -36,6 +36,10 @@ * You should no longer lose proxy settings when Pidgin is restarted. * ICQ Birthday notifications are shown as buddy list emblems + Finch: + * Pressing 'Insert' in the buddylist will bring up the 'Add Buddy' + dialog. + Version 2.2.0 (09/13/2007): http://developer.pidgin.im/query?status=closed&milestone=2.2.0
--- a/autogen.sh Sat Sep 22 03:21:11 2007 +0000 +++ b/autogen.sh Sun Sep 23 11:38:13 2007 +0000 @@ -58,7 +58,7 @@ done libtoolize -c -f --automake -glib-gettextize --force --copy --previous +glib-gettextize --force --copy intltoolize --force --copy aclocal $ACLOCAL_FLAGS || exit; autoheader || exit;
--- a/finch/gntblist.c Sat Sep 22 03:21:11 2007 +0000 +++ b/finch/gntblist.c Sun Sep 23 11:38:13 2007 +0000 @@ -1510,6 +1510,8 @@ } else if (strcmp(text, GNT_KEY_CTRL_O) == 0) { purple_prefs_set_bool(PREF_ROOT "/showoffline", !purple_prefs_get_bool(PREF_ROOT "/showoffline")); + } else if (strcmp(text, GNT_KEY_INS) == 0) { + purple_blist_request_add_buddy(NULL, NULL, NULL, NULL); } else if (!gnt_tree_is_searching(GNT_TREE(ggblist->tree))) { if (strcmp(text, "t") == 0) { finch_blist_toggle_tag_buddy(gnt_tree_get_selection_data(GNT_TREE(ggblist->tree)));
--- a/po/POTFILES.in Sat Sep 22 03:21:11 2007 +0000 +++ b/po/POTFILES.in Sun Sep 23 11:38:13 2007 +0000 @@ -91,11 +91,13 @@ libpurple/protocols/jabber/usermood.c libpurple/protocols/jabber/usernick.c libpurple/protocols/jabber/xdata.c +libpurple/protocols/msn/contact.c libpurple/protocols/msn/dialog.c libpurple/protocols/msn/error.c libpurple/protocols/msn/msn.c libpurple/protocols/msn/nexus.c libpurple/protocols/msn/notification.c +libpurple/protocols/msn/oim.c libpurple/protocols/msn/servconn.c libpurple/protocols/msn/session.c libpurple/protocols/msn/state.c