Mercurial > pidgin.yaz
changeset 30090:49ffb40f3bcd
merged with im.pidgin.pidgin
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Sun, 04 Apr 2010 14:22:45 +0900 |
| parents | 34d787feb17c (current diff) 29df7408df03 (diff) |
| children | 1f1d58d35746 |
| files | configure.ac libpurple/protocols/msn/msn.c libpurple/protocols/yahoo/libyahoo.c libpurple/protocols/yahoo/libyahoojp.c |
| diffstat | 11 files changed, 19 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Apr 04 14:20:56 2010 +0900 +++ b/ChangeLog Sun Apr 04 14:22:45 2010 +0900 @@ -17,6 +17,7 @@ priority can be overridden by using "*" as the host. See the GnuTLS manual for documentation on the format of the priority strings. + * Fix autoconf detection of Python. (Brad Smith) Pidgin: * Moved the "Debugging Information" section of the About box to a
--- a/configure.ac Sun Apr 04 14:20:56 2010 +0900 +++ b/configure.ac Sun Apr 04 14:22:45 2010 +0900 @@ -1402,7 +1402,7 @@ [which python interpreter to use for dbus code generation]), PYTHON=$withval) -if test "x$enable_dbus" = "xyes" ; then +if test "x$enable_dbus" = "xyes" || test "x$enable_consoleui" = "xyes" ; then if test -z "$PYTHON" -o "x$PYTHON" = "xyes"; then AC_PATH_PROG([PYTHON], [python], [no]) fi @@ -1411,9 +1411,7 @@ AC_MSG_WARN([python interpreter not found in your path]) enable_dbus=no fi -fi -if test "x$enable_dbus" = "xyes" ; then if $PYTHON -c "import sys; sys.exit(sys.version[[:3]] >= '2.4')" ; then AC_MSG_WARN([python version >= 2.4 required]) enable_dbus=no @@ -1484,14 +1482,13 @@ dnl Check for Python headers (currently useful only for libgnt) dnl (Thanks to XChat) -AC_PATH_PROG(pythonpath, python) -if test "_$pythonpath" != _ ; then +if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then AC_MSG_CHECKING(for Python compile flags) - PY_PREFIX=`$pythonpath -c 'import sys ; print sys.prefix'` - PY_EXEC_PREFIX=`$pythonpath -c 'import sys ; print sys.exec_prefix'` + PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'` + PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'` changequote(<<, >>)dnl - PY_VERSION=`$pythonpath -c 'import sys ; print sys.version[0:3]'` - PY_MAJOR=`$pythonpath -c 'import sys ; print sys.version[0:2]'` + PY_VERSION=`$PYTHON -c 'import sys ; print sys.version[0:3]'` + PY_MAJOR=`$PYTHON -c 'import sys ; print sys.version[0:2]'` changequote([, ])dnl if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h -a "$PY_MAJOR" = "2."; then AC_MSG_RESULT()
--- a/libpurple/protocols/jabber/buddy.c Sun Apr 04 14:20:56 2010 +0900 +++ b/libpurple/protocols/jabber/buddy.c Sun Apr 04 14:22:45 2010 +0900 @@ -362,7 +362,7 @@ {N_("Email"), "USERID", "EMAIL"}, {N_("Organization Name"), "ORGNAME", "ORG"}, {N_("Organization Unit"), "ORGUNIT", "ORG"}, - {N_("Title"), "TITLE", NULL}, + {N_("Job Title"), "TITLE", NULL}, {N_("Role"), "ROLE", NULL}, {N_("Birthday"), "BDAY", NULL}, {N_("Description"), "DESC", NULL}, @@ -1160,7 +1160,7 @@ g_free(text2); } } else if(text && !strcmp(child->name, "TITLE")) { - purple_notify_user_info_add_pair(user_info, _("Title"), text); + purple_notify_user_info_add_pair(user_info, _("Job Title"), text); } else if(text && !strcmp(child->name, "ROLE")) { purple_notify_user_info_add_pair(user_info, _("Role"), text); } else if(text && !strcmp(child->name, "DESC")) {
--- a/libpurple/protocols/msn/msn.c Sun Apr 04 14:20:56 2010 +0900 +++ b/libpurple/protocols/msn/msn.c Sun Apr 04 14:22:45 2010 +0900 @@ -936,9 +936,9 @@ status = purple_status_type_new_with_attrs(PURPLE_STATUS_TUNE, "tune", NULL, FALSE, TRUE, TRUE, - PURPLE_TUNE_ARTIST, _("Artist"), purple_value_new(PURPLE_TYPE_STRING), - PURPLE_TUNE_ALBUM, _("Album"), purple_value_new(PURPLE_TYPE_STRING), - PURPLE_TUNE_TITLE, _("Title"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), "game", _("Game Title"), purple_value_new(PURPLE_TYPE_STRING), "office", _("Office Title"), purple_value_new(PURPLE_TYPE_STRING), NULL);
--- a/libpurple/protocols/mxit/actions.c Sun Apr 04 14:20:56 2010 +0900 +++ b/libpurple/protocols/mxit/actions.c Sun Apr 04 14:22:45 2010 +0900 @@ -335,7 +335,7 @@ purple_request_field_group_add_field( group, field ); /* title */ - field = purple_request_field_string_new( "title", _( "Title" ), profile->title, FALSE ); + field = purple_request_field_string_new( "title", _( "Job Title" ), profile->title, FALSE ); purple_request_field_group_add_field( group, field ); /* first name */
--- a/libpurple/protocols/mxit/profile.c Sun Apr 04 14:20:56 2010 +0900 +++ b/libpurple/protocols/mxit/profile.c Sun Apr 04 14:22:45 2010 +0900 @@ -128,7 +128,7 @@ purple_notify_user_info_add_section_break( info ); /* optional information */ - purple_notify_user_info_add_pair( info, _( "Title" ), profile->title ); + purple_notify_user_info_add_pair( info, _( "Job Title" ), profile->title ); purple_notify_user_info_add_pair( info, _( "First Name" ), profile->firstname ); purple_notify_user_info_add_pair( info, _( "Last Name" ), profile->lastname ); purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
--- a/libpurple/protocols/myspace/myspace.c Sun Apr 04 14:20:56 2010 +0900 +++ b/libpurple/protocols/myspace/myspace.c Sun Apr 04 14:22:45 2010 +0900 @@ -503,8 +503,8 @@ TRUE, /* should be user_settable some day */ TRUE, /* independent */ - PURPLE_TUNE_ARTIST, _("Artist"), purple_value_new(PURPLE_TYPE_STRING), - PURPLE_TUNE_TITLE, _("Title"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), NULL); types = g_list_append(types, status);
--- a/libpurple/protocols/novell/novell.c Sun Apr 04 14:20:56 2010 +0900 +++ b/libpurple/protocols/novell/novell.c Sun Apr 04 14:22:45 2010 +0900 @@ -1494,7 +1494,7 @@ else if (strcmp(tag, "personalTitle") == 0) return _("Personal Title"); else if (strcmp(tag, "Title") == 0) - return _("Title"); + return _("Job Title"); else if (strcmp(tag, "mailstop") == 0) return _("Mailstop"); else if (strcmp(tag, "Internet EMail Address") == 0)
--- a/libpurple/protocols/qq/group_info.c Sun Apr 04 14:20:56 2010 +0900 +++ b/libpurple/protocols/qq/group_info.c Sun Apr 04 14:22:45 2010 +0900 @@ -138,7 +138,8 @@ room_info = purple_notify_user_info_new(); - purple_notify_user_info_add_pair(room_info, _("Title"), rmd->title_utf8); + /* XXX: Should this be "Topic"? */ + purple_notify_user_info_add_pair(room_info, _("Room Title"), rmd->title_utf8); purple_notify_user_info_add_pair(room_info, _("Notice"), rmd->notice_utf8); purple_notify_user_info_add_pair(room_info, _("Detail"), rmd->desc_utf8);
--- a/libpurple/protocols/yahoo/libyahoo.c Sun Apr 04 14:20:56 2010 +0900 +++ b/libpurple/protocols/yahoo/libyahoo.c Sun Apr 04 14:22:45 2010 +0900 @@ -332,12 +332,6 @@ option = purple_account_option_string_new(_("Chat room list URL"), "room_list", YAHOO_ROOMLIST_URL); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - option = purple_account_option_string_new(_("Yahoo Chat server"), "ycht-server", YAHOO_YCHT_HOST); - prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - - option = purple_account_option_int_new(_("Yahoo Chat port"), "ycht-port", YAHOO_YCHT_PORT); - prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - my_protocol = plugin; yahoo_register_commands(); yahoo_init_colorht();
--- a/libpurple/protocols/yahoo/libyahoojp.c Sun Apr 04 14:20:56 2010 +0900 +++ b/libpurple/protocols/yahoo/libyahoojp.c Sun Apr 04 14:22:45 2010 +0900 @@ -228,12 +228,6 @@ option = purple_account_option_string_new(_("Chat room list URL"), "room_list", YAHOOJP_ROOMLIST_URL); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - option = purple_account_option_string_new(_("Yahoo Chat server"), "ycht-server", YAHOOJP_YCHT_HOST); - prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - - option = purple_account_option_int_new(_("Yahoo Chat port"), "ycht-port", YAHOOJP_YCHT_PORT); - prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - yahoojp_register_commands(); yahoo_init_colorht(); }