pidgin-git:pidgin-git.git
7 years agoFix crash when attempting to log into a bonjour account and init failed
Daniel Atallah [Mon, 25 Oct 2010 22:43:30 +0000 (22:43 +0000)]
Fix crash when attempting to log into a bonjour account and init failed

7 years agoC89ize that comment.
Ivan Komarov [Mon, 25 Oct 2010 20:01:50 +0000 (20:01 +0000)]
C89ize that comment.

7 years agoOuch, I accidentally removed too much code in b367bdaac1f79166db0e9478ae30e2a7628f6848.
Ivan Komarov [Sun, 24 Oct 2010 18:57:21 +0000 (18:57 +0000)]
Ouch, I accidentally removed too much code in b367bdaac1f79166db0e9478ae30e2a7628f6848.
Fixes #12768.

7 years agoRemoved a stray tab.
Ivan Komarov [Sun, 24 Oct 2010 16:42:20 +0000 (16:42 +0000)]
Removed a stray tab.

7 years agoUpdated ChangeLog with changes from ICQ SoC branch.
Ivan Komarov [Sun, 24 Oct 2010 16:32:59 +0000 (16:32 +0000)]
Updated ChangeLog with changes from ICQ SoC branch.

7 years agoMark this string as translatable now that we're out of freeze.
John Bailey [Thu, 21 Oct 2010 04:18:16 +0000 (04:18 +0000)]
Mark this string as translatable now that we're out of freeze.

7 years agoCommit updated po files. This makes the nightly cron job run quicker and should...
John Bailey [Thu, 21 Oct 2010 04:14:05 +0000 (04:14 +0000)]
Commit updated po files.  This makes the nightly cron job run quicker and should be done at least every release.

7 years agoUpdated Romanian translation. Fixes #12766. Unfortunately it was too late for 2...
John Bailey [Thu, 21 Oct 2010 04:10:55 +0000 (04:10 +0000)]
Updated Romanian translation.  Fixes #12766.  Unfortunately it was too late for 2.7.4.

7 years agoUpdate for 2.7.5devel.
John Bailey [Thu, 21 Oct 2010 04:07:56 +0000 (04:07 +0000)]
Update for 2.7.5devel.

7 years agomerge of '2872bcba5019558c0d77e8cf9b43801167e5efc8'
John Bailey [Thu, 21 Oct 2010 03:53:37 +0000 (03:53 +0000)]
Merge ... '2872bcba5019558c0d77e8cf9b43801167e5efc8'
     and '3cb4024617c6b97a4c383ddcabe7f047af92f68c'

7 years agoGerman translation update
Björn Voigt [Wed, 20 Oct 2010 19:33:47 +0000 (19:33 +0000)]
German translation update
- 2 new strings
- 1 updated string

7 years agoTwo strings marked as translatable. You find them in the ICQ account
Björn Voigt [Wed, 20 Oct 2010 19:27:32 +0000 (19:27 +0000)]
Two strings marked as translatable. You find them in the ICQ account
menu.

7 years agoSmall German update
Björn Voigt [Wed, 20 Oct 2010 19:04:08 +0000 (19:04 +0000)]
Small German update
- two strings "Visible List" and "Invisible List"

7 years agoanother update for the German translation, I missed a string in my last commit
Jochen Kemnade [Wed, 20 Oct 2010 17:05:58 +0000 (17:05 +0000)]
another update for the German translation, I missed a string in my last commit

7 years agoUpdate for the additional files marked for translation in [4e3a87a078cbc0c62b7e201bb7...
Jochen Kemnade [Wed, 20 Oct 2010 16:35:09 +0000 (16:35 +0000)]
Update for the additional files marked for translation in [4e3a87a078cbc0c62b7e201bb747715d4e2ab13e]

7 years agoUpdate versions for release. v2.7.4
John Bailey [Wed, 20 Oct 2010 15:49:09 +0000 (15:49 +0000)]
Update versions for release.

7 years agoNEWSing
John Bailey [Wed, 20 Oct 2010 15:48:27 +0000 (15:48 +0000)]
NEWSing

7 years agoUpdated translations. Fixes #12762, #12763.
John Bailey [Wed, 20 Oct 2010 15:32:53 +0000 (15:32 +0000)]
Updated translations.  Fixes #12762, #12763.

7 years agomerge of '86a5f47962135f70129fec6720614b66a7b08532'
John Bailey [Tue, 19 Oct 2010 03:11:12 +0000 (03:11 +0000)]
Merge ... '86a5f47962135f70129fec6720614b66a7b08532'
     and 'b5a241943187497bbbdc81af15bcbe029ac2b2dc'

7 years agoAdd missing headers to fix distcheck
Daniel Atallah [Mon, 18 Oct 2010 23:47:32 +0000 (23:47 +0000)]
Add missing headers to fix distcheck

7 years agoFix translation syntax so installer works
Daniel Atallah [Mon, 18 Oct 2010 20:36:20 +0000 (20:36 +0000)]
Fix translation syntax so installer works

7 years agoUpdated Chinese translations (again). Fixes #12756.
John Bailey [Sun, 17 Oct 2010 20:52:28 +0000 (20:52 +0000)]
Updated Chinese translations (again).  Fixes #12756.

7 years agoStu says adding this will make the l10n page show the language name for the code...
John Bailey [Sun, 17 Oct 2010 16:43:06 +0000 (16:43 +0000)]
Stu says adding this will make the l10n page show the language name for the code mai.

7 years agoFrench translation update.
Éric Boumaour [Sun, 17 Oct 2010 13:55:50 +0000 (13:55 +0000)]
French translation update.

7 years agoChangeLog that last commit.
John Bailey [Sun, 17 Oct 2010 03:57:48 +0000 (03:57 +0000)]
ChangeLog that last commit.

7 years agoFix for CVE-2010-3711. Properly validate the return value from
Daniel Atallah [Sun, 17 Oct 2010 03:55:04 +0000 (03:55 +0000)]
Fix for CVE-2010-3711.  Properly validate the return value from
purple_base64_decode() (the CVE issue) and purple_base16_decode() (just a bug).
Coincidentally, this should also fix #12614.

7 years agoApparently I forgot to run 'intltool-update --maintain' before announcing the freeze.
John Bailey [Sun, 17 Oct 2010 03:40:26 +0000 (03:40 +0000)]
Apparently I forgot to run 'intltool-update --maintain' before announcing the freeze.

7 years ago11 translation updates and add a Maithili translation. Fixes #12466, #12512,
John Bailey [Sun, 17 Oct 2010 03:33:52 +0000 (03:33 +0000)]
11 translation updates and add a Maithili translation.  Fixes #12466, #12512,
#12579, #12633, #12711, #12728, #12729, #12735, #12739, #12746, #12751.

7 years agoCan I take some liberties?
Mark Doliner [Thu, 14 Oct 2010 06:37:33 +0000 (06:37 +0000)]
Can I take some liberties?
* Move Malu and Masca from "CPWw" to "developers" (yay!)
* Move Sean and marv from "developers" to "retired"
* Move DennisR from "CPW" to "retired CPW"

People in the "retired" list should of course feel welcome to come back any
time.  Many of you should still have commit access.  I just think we should
try to keep these lists more up to date, based on who is checking stuff
in and submitting patches

7 years agojabber: Handle a corner case better by throwing an error instead of stalling
Paul Aurich [Thu, 14 Oct 2010 03:12:01 +0000 (03:12 +0000)]
jabber: Handle a corner case better by throwing an error instead of stalling

This happens if the server *has* a TXT record for _xmppconnect.$domain,
but has no useful content there.  Fixes #12744, #a14367.

7 years agoFix typoed short option for "force-online".
Daniel Atallah [Wed, 13 Oct 2010 21:20:57 +0000 (21:20 +0000)]
Fix typoed short option for "force-online".
As best I can tell from the debian ticket, the issue was debugged by Nirgal VourgA"re.
Fixes #12745

7 years agoLet's make Ivan a developer!
Mark Doliner [Wed, 13 Oct 2010 02:25:50 +0000 (02:25 +0000)]
Let's make Ivan a developer!

7 years agoRemove unused variable
Mark Doliner [Tue, 12 Oct 2010 23:59:34 +0000 (23:59 +0000)]
Remove unused variable

7 years agoSimplify the way that string length and memory allocation is done.
Daniel Atallah [Tue, 12 Oct 2010 21:50:56 +0000 (21:50 +0000)]
Simplify the way that string length and memory allocation is done.
I noticed this while investigating #12587 (which I don't think this will fix).

7 years agonote that we need version 2.0 of Apple's Bonjour runtime on Windows
Daniel Atallah [Mon, 11 Oct 2010 14:36:18 +0000 (14:36 +0000)]
note that we need version 2.0 of Apple's Bonjour runtime on Windows

7 years agomerge of '0ff371dbf457757cf975dd2588f1a858f3d3d09a'
Paul Aurich [Sun, 10 Oct 2010 16:43:30 +0000 (16:43 +0000)]
Merge ... '0ff371dbf457757cf975dd2588f1a858f3d3d09a'
     and 'c69bc8e83c4645b4d8a7a4fefcc17d822d988de3'

7 years agojabber: Set a connection display name even when using legacy auth
Paul Aurich [Sun, 10 Oct 2010 16:42:30 +0000 (16:42 +0000)]
jabber: Set a connection display name even when using legacy auth

Previously, the only place we were setting one was in the bind-result
code path, so it was always NULL when doing legacy auth, but that
causes issues with jabber_presence_fake_to_self, so let's just have
a default init in jabber_stream_new().  Should Fixes #12499

7 years agoUpdate Hungarian translation for 2.7.4
Kelemen Gábor [Sun, 10 Oct 2010 10:41:37 +0000 (10:41 +0000)]
Update Hungarian translation for 2.7.4

7 years agoChangelog those. Refs #12667, #12668, #12594.
Paul Aurich [Sun, 10 Oct 2010 05:41:57 +0000 (05:41 +0000)]
Changelog those.  Refs #12667, #12668, #12594.

7 years agoca-certs: Add new Thawte and Deutsche Telekom Roots. Fixes #12667, #12668.
Paul Aurich [Sun, 10 Oct 2010 05:39:43 +0000 (05:39 +0000)]
ca-certs: Add new Thawte and Deutsche Telekom Roots.  Fixes #12667, #12668.

Retrieved from Thawte's website and Debian's CA cert set respectively.

7 years agoca-certs: Add the Go Daddy Class 2 self-signed root. Fixes #12594
Paul Aurich [Sun, 10 Oct 2010 05:31:54 +0000 (05:31 +0000)]
ca-certs: Add the Go Daddy Class 2 self-signed root.  Fixes #12594

There's another copy of this cert that's a ICA up to ValiCert via
some voodoo X.509 hacks, but I went with the self-signed root version
(if someone can rationally explain to me why people use the same
keying material to make "the same" cert but as an ICA instead
of root, please do)

7 years agomerge of '2fa8397877be345efa9c19c1530ad7686236d8e4'
Paul Aurich [Sun, 10 Oct 2010 05:25:42 +0000 (05:25 +0000)]
Merge ... '2fa8397877be345efa9c19c1530ad7686236d8e4'
     and 'c6b054bb793c9916eb187da12bda64c518f506df'

7 years agoBeginning a file transfer multiple times leaks file handles.
Daniel Atallah [Thu, 7 Oct 2010 03:32:53 +0000 (03:32 +0000)]
Beginning a file transfer multiple times leaks file handles.
Add some debugging and guarding to detect and avoid that.

This is only part of the full fix (mostly to help bring attention to the
problem)

The real problem is that in the MSN prpl (and possibly others), file transfers
are started multiple times.  This happens for every file transfer over MSN that
I've tested.

Refs #12660

7 years agoUse g_fopen() instead of fopen() in a few places that snuck in.
Daniel Atallah [Thu, 7 Oct 2010 02:02:15 +0000 (02:02 +0000)]
Use g_fopen() instead of fopen() in a few places that snuck in.

7 years agoForgot to changelog that. Need a name for todo to credit him/her. Refs #12688.
John Bailey [Wed, 6 Oct 2010 02:36:00 +0000 (02:36 +0000)]
Forgot to changelog that.  Need a name for todo to credit him/her.  Refs #12688.

7 years agoFix SMS carrier URL per todo's advice. Fixes #12688.
John Bailey [Wed, 6 Oct 2010 02:33:45 +0000 (02:33 +0000)]
Fix SMS carrier URL per todo's advice.  Fixes #12688.

7 years agoupdate German translation
Jochen Kemnade [Mon, 4 Oct 2010 18:46:04 +0000 (18:46 +0000)]
update German translation

7 years agoUse IPV6_V6ONLY for the bonjour IPv6 socket so that we can register the separate...
Daniel Atallah [Mon, 4 Oct 2010 02:36:19 +0000 (02:36 +0000)]
Use IPV6_V6ONLY for the bonjour IPv6 socket so that we can register the separate IPv4 socket on the same port. Fixes #12657

7 years agoDeal with the hostname being a substring of the account name prior to the '@'
Daniel Atallah [Mon, 4 Oct 2010 02:33:28 +0000 (02:33 +0000)]
Deal with the hostname being a substring of the account name prior to the '@'

7 years agoThe hostname used for a bonjour account should always be the current machine
Daniel Atallah [Mon, 4 Oct 2010 00:48:25 +0000 (00:48 +0000)]
The hostname used for a bonjour account should always be the current machine
name.  This fixes our behavior so the previous statement is always the case.
Unfortunately, this means that if the hostname was previously not the current
machine name, the bonjour jid ends up looking like "username\40otherhost@hostname".

Fixes #12674

7 years agoUse DNSServiceGetAddrInfo() from dns_sd.h to resolve the IP for remote bonjour
Daniel Atallah [Mon, 4 Oct 2010 00:35:26 +0000 (00:35 +0000)]
Use DNSServiceGetAddrInfo() from dns_sd.h to resolve the IP for remote bonjour
users on Win32 instead of the libpurple resolving API.  This way, we make sure
we're using the same interface as we received the presence notification on.

There is also some debug message improvement and using constants instead of
magic numbers in this commit.

7 years agoAdd a ticket number here.
Elliott Sales de Andrade [Sat, 2 Oct 2010 23:04:49 +0000 (23:04 +0000)]
Add a ticket number here.

7 years agoAdd a newline to debug message
Paul Aurich [Wed, 29 Sep 2010 05:38:04 +0000 (05:38 +0000)]
Add a newline to debug message

7 years agoLet's make it clear that means locally
Paul Aurich [Wed, 29 Sep 2010 05:11:49 +0000 (05:11 +0000)]
Let's make it clear that means locally

7 years agojabber: Commit some non-existent code.
Paul Aurich [Wed, 29 Sep 2010 05:11:09 +0000 (05:11 +0000)]
jabber: Commit some non-existent code.

(I'm trying to see if I can find a server that supports SASL
security layers via Cyrus SASL)

7 years agomerge of '2f6318bd834113559a405ec68cdb178f2180b680'
Elliott Sales de Andrade [Sun, 26 Sep 2010 20:16:15 +0000 (20:16 +0000)]
Merge ... '2f6318bd834113559a405ec68cdb178f2180b680'
     and '64e02b98551e11e093e4649f1516f3aceaa321e2'

7 years agodisapproval of revision 'eca3adf7cdd9217fcf670611fb705385fcfaa48d'
Ivan Komarov [Sun, 26 Sep 2010 15:49:16 +0000 (15:49 +0000)]
disapproval of revision 'eca3adf7cdd9217fcf670611fb705385fcfaa48d'

This was an experimental change from my SoC branch, which is not quite release-worthy. I'll undo it for now.

7 years agoCredit Stanislav for his patch. Refs #12505.
John Bailey [Fri, 24 Sep 2010 23:34:18 +0000 (23:34 +0000)]
Credit Stanislav for his patch.  Refs #12505.

7 years agoChange default browser for new non-Windows users to xdg-open. Fixes #12505.
sbrabec [Fri, 24 Sep 2010 23:32:18 +0000 (23:32 +0000)]
Change default browser for new non-Windows users to xdg-open.  Fixes #12505.

7 years agojabber: Catch resource conflict IQ stanza errors returned by server
Paul Aurich [Wed, 22 Sep 2010 06:05:14 +0000 (06:05 +0000)]
jabber: Catch resource conflict IQ stanza errors returned by server

Discussion on IETF XMPP WG mailing list pointed out this is a possible
outcome, and needs to be handled better in clients.  So, here's handling
it better in clients!

7 years agocert: Tell users to check their computer's date/time for expired certs, too
Paul Aurich [Tue, 21 Sep 2010 14:08:35 +0000 (14:08 +0000)]
cert: Tell users to check their computer's date/time for expired certs, too

Fixes #12654

7 years agomerge of '6c7b27abd37198a7bf98e9255299159259bcffc7'
Elliott Sales de Andrade [Tue, 21 Sep 2010 04:37:26 +0000 (04:37 +0000)]
Merge ... '6c7b27abd37198a7bf98e9255299159259bcffc7'
     and 'bdb5fe6e0e06c8f8275aff942d31b2d4359487bb'

7 years agojabber: use g_ascii_strtod instead of atof here, should be more portable in multiple...
Marcus Lundblad [Mon, 20 Sep 2010 19:54:46 +0000 (19:54 +0000)]
jabber: use g_ascii_strtod instead of atof here, should be more portable in multiple locales

7 years agoI thought I had done this in my last commit. Clearly I'm an idiot. This fixes
John Bailey [Mon, 20 Sep 2010 15:39:12 +0000 (15:39 +0000)]
I thought I had done this in my last commit.  Clearly I'm an idiot.  This fixes
all the references to the browser command pref to use the new pref name that I
created.  Refs #12024.

7 years agoProper credit for rtobar. Refs #12024.
John Bailey [Mon, 20 Sep 2010 03:55:18 +0000 (03:55 +0000)]
Proper credit for rtobar.  Refs #12024.

7 years agoChange the "Manual" browser command pref's name to allow for a relatively simple
John Bailey [Mon, 20 Sep 2010 03:53:47 +0000 (03:53 +0000)]
Change the "Manual" browser command pref's name to allow for a relatively simple
migration of an existing value from the path pref to the new string pref.  As I
note in the comment in the migration code, I realize this will break things for
and confuse those users who use the same config directory for mutliple versions
of Pidgin, but I'm not inclined to devise a solution that will make that work.
The solution I've implemented fixes the most important case--users who upgrade.
The rest of the world will just have to move on.  Refs #12024.

7 years agojabber/jingle: Fix 2 warnings:
Paul Aurich [Mon, 20 Sep 2010 03:35:16 +0000 (03:35 +0000)]
jabber/jingle: Fix 2 warnings:
jingle/transport.c: In function 'jingle_transport_set_property':
jingle/transport.c:111: warning: unused variable 'transport'
jingle/transport.c: In function 'jingle_transport_get_property':
jingle/transport.c:124: warning: unused variable 'transport'

7 years agojabber: Comment the problematic behavior of jabber_add_(feature|identity)
Paul Aurich [Mon, 20 Sep 2010 03:25:12 +0000 (03:25 +0000)]
jabber: Comment the problematic behavior of jabber_add_(feature|identity)

7 years agoI should probably add a ChangeLog entry for this one since it's a bit
Elliott Sales de Andrade [Mon, 20 Sep 2010 01:08:08 +0000 (01:08 +0000)]
I should probably add a ChangeLog entry for this one since it's a bit
annoying.

Refs #12387.

7 years agojabber: Partial revert (everything but ChangeLog) of 945ef5abc5
Paul Aurich [Mon, 20 Sep 2010 00:51:21 +0000 (00:51 +0000)]
jabber: Partial revert (everything but ChangeLog) of 945ef5abc5

It causes issues with non-GAfyD accounts associated with arbitrary
email addresses (since Google lets the user auth with that email
and then changes the JID to be "@gmail.com").  Fixes #a14153

7 years agoCredit where due. Refs #12049.
John Bailey [Sat, 18 Sep 2010 22:27:49 +0000 (22:27 +0000)]
Credit where due.  Refs #12049.

7 years agoMake purple-remote expect and produce UTF-8 instead of ASCII. Fixes #12049.
Guillaume Brunerie [Sat, 18 Sep 2010 22:23:13 +0000 (22:23 +0000)]
Make purple-remote expect and produce UTF-8 instead of ASCII.  Fixes #12049.

7 years agoCredit where credit is due. Refs #12471.
John Bailey [Sat, 18 Sep 2010 17:52:07 +0000 (17:52 +0000)]
Credit where credit is due.  Refs #12471.

7 years agoAllow using the Send To menu in the case that the active conversation's account
pidgin [Sat, 18 Sep 2010 17:50:29 +0000 (17:50 +0000)]
Allow using the Send To menu in the case that the active conversation's account
disconnects.  Previously, the Send To menu was unusable in this case, making it
impossible to simply switch accounts and continue the conversation.
Fixes #12471.

7 years agoAlmost forgot to ChangeLog that. Refs #12024. Still need a name for the COPYRIGHT...
John Bailey [Sat, 18 Sep 2010 17:34:35 +0000 (17:34 +0000)]
Almost forgot to ChangeLog that.  Refs #12024.  Still need a name for the COPYRIGHT file.

7 years agoMake the "Manual" browser setting's command be stored as a string instead of as
rtobar [Sat, 18 Sep 2010 15:54:17 +0000 (15:54 +0000)]
Make the "Manual" browser setting's command be stored as a string instead of as
a path.  Storing it as a path requires specifying the full path to the command
when just the command name would suffice.  Fixes #12024.

7 years agoAdd the new browsers here so they do useful stuff by default.
John Bailey [Sat, 18 Sep 2010 02:01:29 +0000 (02:01 +0000)]
Add the new browsers here so they do useful stuff by default.

7 years agoModernize the list of browsers a bit by adding Google Chrome and Chromium to
John Bailey [Sat, 18 Sep 2010 01:38:41 +0000 (01:38 +0000)]
Modernize the list of browsers a bit by adding Google Chrome and Chromium to
the list of possible browsers.  Refs #12505.

7 years agoUseful snippet of debugging that helped me out.
John Bailey [Sat, 18 Sep 2010 01:33:34 +0000 (01:33 +0000)]
Useful snippet of debugging that helped me out.

7 years agoChangeLog Eion's patch. Refs #12601.
John Bailey [Sat, 18 Sep 2010 00:23:10 +0000 (00:23 +0000)]
ChangeLog Eion's patch.  Refs #12601.

7 years agoUse GRegex where available. Fixes #12601.
eion [Sat, 18 Sep 2010 00:20:35 +0000 (00:20 +0000)]
Use GRegex where available.  Fixes #12601.

7 years agoconfig.h is needed to determine USE_GTKSPELL here.
Daniel Atallah [Fri, 17 Sep 2010 18:40:46 +0000 (18:40 +0000)]
config.h is needed to determine USE_GTKSPELL here.

7 years agoMake the win32 build possible to compile without GtkSpell if HAVE_GTKSPELL isn't...
Daniel Atallah [Fri, 17 Sep 2010 14:41:34 +0000 (14:41 +0000)]
Make the win32 build possible to compile without GtkSpell if HAVE_GTKSPELL isn't defined.

7 years agoFix some cases where an arbitrary string was being specified as a printf format.
Daniel Atallah [Fri, 17 Sep 2010 14:40:13 +0000 (14:40 +0000)]
Fix some cases where an arbitrary string was being specified as a printf format.

7 years agoSpecify an IPv6 scope on the IP address being used to reference a Bonjour Buddy.
Daniel Atallah [Fri, 17 Sep 2010 14:32:31 +0000 (14:32 +0000)]
Specify an IPv6 scope on the IP address being used to reference a Bonjour Buddy.
Thanks goes to Antonio Ospite for figuring out that this needs to be done.

Fixes #12629

7 years agojabber: Fix picking up bytestream proxies advertised by the server
Paul Aurich [Thu, 16 Sep 2010 02:25:56 +0000 (02:25 +0000)]
jabber: Fix picking up bytestream proxies advertised by the server

7 years agoFix a minor error in the German translation.
John Bailey [Wed, 15 Sep 2010 14:50:22 +0000 (14:50 +0000)]
Fix a minor error in the German translation.

7 years agojabber: actually look at the correct description on an incoming Google session
Marcus Lundblad [Mon, 13 Sep 2010 18:33:09 +0000 (18:33 +0000)]
jabber: actually look at the correct description on an incoming Google session

7 years agoRemove an unnecessary cast. Get's rid of this compile warning:
Mark Doliner [Mon, 13 Sep 2010 09:22:59 +0000 (09:22 +0000)]
Remove an unnecessary cast.  Get's rid of this compile warning:
gtkplugin.c: In function ‘pidgin_plugin_dialog_show’:
gtkplugin.c:804: warning: passing argument 1 of ‘pidgin_auto_parent_window’ from incompatible pointer type
gtkutils.h:819: note: expected ‘struct GtkWidget *’ but argument is of type ‘struct GtkWindow *’

7 years agoFix this inconsequential compile warning:
Mark Doliner [Mon, 13 Sep 2010 09:20:18 +0000 (09:20 +0000)]
Fix this inconsequential compile warning:
disco.c: In function ‘jabber_disco_server_items_result_cb’:
disco.c:602: warning: unused variable ‘node’

7 years agopropagate from branch 'im.pidgin.cpw.sulabh.yahoo' (head cfd6bbbc1b109a21d2fc5e30d829...
sulabh [Fri, 10 Sep 2010 08:52:09 +0000 (08:52 +0000)]
propagate from branch 'im.pidgin.cpw.sulabh.yahoo' (head cfd6bbbc1b109a21d2fc5e30d829c7f6c8953a07)
            to branch 'im.pidgin.pidgin' (head f904ce0216ba087391ad82dc04d388600399ddd1)

7 years agoRemove the last traces of the standalone IdleTracker
Daniel Atallah [Fri, 10 Sep 2010 01:44:38 +0000 (01:44 +0000)]
Remove the last traces of the standalone IdleTracker

7 years agopropagate from branch 'im.pidgin.pidgin' (head 7b998c02b684a694f1089bee715e4a3952bbcf08) im.pidgin.cpw.sulabh.yahoo
sulabh [Thu, 9 Sep 2010 18:49:00 +0000 (18:49 +0000)]
propagate from branch 'im.pidgin.pidgin' (head 7b998c02b684a694f1089bee715e4a3952bbcf08)
            to branch 'im.pidgin.cpw.sulabh.yahoo' (head 15bec46c35831daf795a870712e4ef6dd91034ce)

7 years agomerge of '392709af0c706d582bbd6a2b1f0d9423457e6351' im.pidgin.soc.2010.icq-tlc
Marcus Lundblad [Mon, 6 Sep 2010 19:41:27 +0000 (19:41 +0000)]
Merge ... '392709af0c706d582bbd6a2b1f0d9423457e6351'
     and 'b1c7aabc888f764a6ed12bd30699c654534ea253'

7 years agoChangeLog the Google relay stuff
Marcus Lundblad [Mon, 6 Sep 2010 19:36:31 +0000 (19:36 +0000)]
ChangeLog the Google relay stuff

7 years agoAdded comment about including the relay token twice in the HTTP request im.pidgin.cpw.malu.xmpp.google_relay
Marcus Lundblad [Mon, 6 Sep 2010 19:32:51 +0000 (19:32 +0000)]
Added comment about including the relay token twice in the HTTP request

7 years agorestore the Jingle method selection to prefer standard over Google-specific
Marcus Lundblad [Mon, 6 Sep 2010 19:28:13 +0000 (19:28 +0000)]
restore the Jingle method selection to prefer standard over Google-specific

7 years agoUpdated German translation:
Björn Voigt [Mon, 6 Sep 2010 08:04:16 +0000 (08:04 +0000)]
Updated German translation:
- missing comma

7 years agomerge of '0576c6c542692f13557ba1ab61c00b3320aee2f6'
Paul Aurich [Mon, 6 Sep 2010 03:47:47 +0000 (03:47 +0000)]
Merge ... '0576c6c542692f13557ba1ab61c00b3320aee2f6'
     and 'bb163d6f4337c871d963d8a3e0ee05008caec839'

7 years agoperl: Wrap purple_chat_get_components
Paul Aurich [Mon, 6 Sep 2010 03:46:24 +0000 (03:46 +0000)]
perl: Wrap purple_chat_get_components