Mercurial > pidgin
changeset 27648:6e952b8b3672
merge of '13c5077bcfd832ab1e88f6b32c9563e6d46ebf82'
and '8f9a140783faca52a82e4844a2ae53fee7137282'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 20 Jul 2009 18:29:16 +0000 |
| parents | 8b669aaa3ed7 (current diff) 8de82ce7de5c (diff) |
| children | bbce09a8e5a5 |
| files | |
| diffstat | 5 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/Makefile.am Mon Jul 20 18:28:16 2009 +0000 +++ b/libpurple/plugins/Makefile.am Mon Jul 20 18:29:16 2009 +0000 @@ -157,5 +157,5 @@ $(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS) $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS) @rm -f tmp$@.lo tmp$@.o libtmp$@.la - @cp .libs/libtmp$@.so.so $@ + @cp .libs/libtmp$@*.so $@ @rm -rf .libs/libtmp$@.*
--- a/libpurple/util.c Mon Jul 20 18:28:16 2009 +0000 +++ b/libpurple/util.c Mon Jul 20 18:29:16 2009 +0000 @@ -1409,6 +1409,12 @@ gboolean ignore; }; +/* NOTE: Do not put `do {} while(0)` around this macro (as this is the method + recommended in the GCC docs). It contains 'continue's that should + affect the while-loop in purple_markup_html_to_xhtml and doing the + above would break that. + Also, remember to put braces in constructs that require them for + multiple statements when using this macro. */ #define ALLOW_TAG_ALT(x, y) if(!g_ascii_strncasecmp(c, "<" x " ", strlen("<" x " "))) { \ const char *o = c + strlen("<" x); \ const char *p = NULL, *q = NULL, *r = NULL; \ @@ -1480,6 +1486,7 @@ c = strchr(c, '>') + 1; \ continue; \ } +/* Don't forget to check the note above for ALLOW_TAG_ALT. */ #define ALLOW_TAG(x) ALLOW_TAG_ALT(x, x) void purple_markup_html_to_xhtml(const char *html, char **xhtml_out,
--- a/pidgin.desktop.in Mon Jul 20 18:28:16 2009 +0000 +++ b/pidgin.desktop.in Mon Jul 20 18:29:16 2009 +0000 @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Pidgin Internet Messenger _GenericName=Internet Messenger _Comment=Send instant messages over multiple protocols
--- a/pidgin/plugins/Makefile.am Mon Jul 20 18:28:16 2009 +0000 +++ b/pidgin/plugins/Makefile.am Mon Jul 20 18:29:16 2009 +0000 @@ -140,5 +140,5 @@ $(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS) $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS) @rm -f tmp$@.lo tmp$@.o libtmp$@.la - @cp .libs/libtmp$@.so.so $@ + @cp .libs/libtmp$@*.so $@ @rm -rf .libs/libtmp$@.*
--- a/po/nl.po Mon Jul 20 18:28:16 2009 +0000 +++ b/po/nl.po Mon Jul 20 18:29:16 2009 +0000 @@ -10874,7 +10874,7 @@ #, fuzzy msgid "_Remain in chat after window is closed." -msgstr "Verberg c_hat wanneer de verbinding verbroken wordt." +msgstr "Verberg c_hat wanneer het venster gesloten is." msgid "Please enter the name of the group to be added." msgstr "Geef de naam van de toe te voegen groep."