Mercurial > pidgin.yaz
changeset 22937:4798de46bf4a
merge of '994f8bdccfcf73a73924e593d2c398c8d416e5e9'
and 'e1c49c9ec5c6869ed9813feccd8ee41d2ca40f35'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Wed, 14 May 2008 04:58:36 +0000 |
| parents | 5a359f6666c2 (diff) 9b7af052fd6a (current diff) |
| children | c0fc992da040 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Wed May 14 04:30:40 2008 +0000 +++ b/configure.ac Wed May 14 04:58:36 2008 +0000 @@ -948,9 +948,8 @@ AC_SUBST(GADU_LIBS) AC_SUBST(GADU_CFLAGS) -# uncomment the next line to make MSNP14 the available -# AC_ARG_ENABLE(msnp14,[AC_HELP_STRING([--enable-msnp14], [Disable the newer MSNP14 protocol])],,enable_msnp14=no) -enable_msnp14=no +# change the next line to make MSNP14 the default (s/enable/disable/; s/no/yes/;) +AC_ARG_ENABLE(msnp14,[AC_HELP_STRING([--enable-msnp14], [Enable the newer MSNP14 protocol (unsupported)])],,enable_msnp14=no) AC_ARG_ENABLE(distrib,,,enable_distrib=no) AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")
--- a/pidgin/gtkblist.c Wed May 14 04:30:40 2008 +0000 +++ b/pidgin/gtkblist.c Wed May 14 04:58:36 2008 +0000 @@ -2716,7 +2716,8 @@ * above node types first. */ tmp = g_strdup(_("Unknown node type")); } - node_name = g_strdup_printf("<span size='x-large' weight='bold'>%s</span>", tmp); + node_name = g_strdup_printf("<span size='x-large' weight='bold'>%s</span>", + tmp ? tmp : ""); g_free(tmp); td->name_layout = create_pango_layout(node_name, &td->name_width, &td->name_height);