diff options
| author | Etan Reisner <deryni@pidgin.im> | 2009-08-16 05:29:25 +0000 |
|---|---|---|
| committer | Etan Reisner <deryni@pidgin.im> | 2009-08-16 05:29:25 +0000 |
| commit | 78bbe075ec4911e83aa210e28155b5509fd0c316 (patch) | |
| tree | f1e3e3b82d65e4b242d79295379f640a8d9972de /libpurple | |
| parent | ea4ebdfddf6b5d39845ccaeedb70aade62eef473 (diff) | |
| parent | f7da7cf3991a3feb4cca9ecf06aada9f7526c4fc (diff) | |
| download | pidgin-78bbe075ec4911e83aa210e28155b5509fd0c316.tar.gz | |
merge of 'ec6dd456b74c48113c7d01a9930756b11ae9af8f'
and '05e03b51f398606c5d6f83e79c067f945c957cf5'
Diffstat (limited to 'libpurple')
| -rw-r--r-- | libpurple/protocols/msn/Makefile.mingw | 1 | ||||
| -rw-r--r-- | libpurple/protocols/yahoo/libyahoo.c | 2 | ||||
| -rw-r--r-- | libpurple/protocols/yahoo/libyahoojp.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/libpurple/protocols/msn/Makefile.mingw b/libpurple/protocols/msn/Makefile.mingw index fe75c1cb68..40d5ea9db8 100644 --- a/libpurple/protocols/msn/Makefile.mingw +++ b/libpurple/protocols/msn/Makefile.mingw @@ -41,7 +41,6 @@ C_SRC = cmdproc.c \ command.c \ contact.c\ dialog.c \ - directconn.c \ error.c \ group.c \ history.c \ diff --git a/libpurple/protocols/yahoo/libyahoo.c b/libpurple/protocols/yahoo/libyahoo.c index 1e1b890da6..1cd625dc9f 100644 --- a/libpurple/protocols/yahoo/libyahoo.c +++ b/libpurple/protocols/yahoo/libyahoo.c @@ -278,7 +278,7 @@ static PurplePluginInfo info = NULL, /**< dependencies */ PURPLE_PRIORITY_DEFAULT, /**< priority */ "prpl-yahoo", /**< id */ - "Yahoo!", /**< name */ + "Yahoo", /**< name */ DISPLAY_VERSION, /**< version */ /** summary */ N_("Yahoo! Protocol Plugin"), diff --git a/libpurple/protocols/yahoo/libyahoojp.c b/libpurple/protocols/yahoo/libyahoojp.c index 7131dd4b10..b69c6c4cfa 100644 --- a/libpurple/protocols/yahoo/libyahoojp.c +++ b/libpurple/protocols/yahoo/libyahoojp.c @@ -174,7 +174,7 @@ static PurplePluginInfo info = NULL, /**< dependencies */ PURPLE_PRIORITY_DEFAULT, /**< priority */ "prpl-yahoojp", /**< id */ - "Yahoo! JAPAN", /**< name */ + "Yahoo JAPAN", /**< name */ DISPLAY_VERSION, /**< version */ /** summary */ N_("Yahoo! JAPAN Protocol Plugin"), |