Mercurial > pidgin
diff libpurple/protocols/yahoo/yahoo.c @ 19697:481749fc0b6b
merge of '1c7910841138381c841363256ca3c7905b1f26b0'
and '5818cbd5fe95d6a167f1555b882526f36790b141'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Mon, 10 Sep 2007 13:57:15 +0000 |
| parents | 301f1597d41f 44b4e8bd759b |
| children | d3d9e3978d82 |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/yahoo.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ @@ -3505,7 +3505,7 @@ static void yahoo_show_chat_goto(PurplePluginAction *action) { PurpleConnection *gc = (PurpleConnection *) action->context; - purple_request_input(gc, NULL, _("Join who in chat?"), NULL, + purple_request_input(gc, NULL, _("Join whom in chat?"), NULL, "", FALSE, FALSE, NULL, _("OK"), G_CALLBACK(yahoo_chat_goto), _("Cancel"), NULL,