Mercurial > pidgin
changeset 22936:c0fc992da040
merge of '7fd0d8c5830d11a8f34c0d2fa6a6290427b182c4'
and 'cfa8bcce1dfa952cf5b50a0d15e1e15a63d1f120'
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Wed, 14 May 2008 11:57:02 +0000 |
| parents | f96e73fbb9f4 (current diff) 4798de46bf4a (diff) |
| children | 917bc972a141 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Wed May 14 07:38:58 2008 +0000 +++ b/configure.ac Wed May 14 11:57:02 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 07:38:58 2008 +0000 +++ b/pidgin/gtkblist.c Wed May 14 11:57:02 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);