diff libpurple/dbus-server.c @ 22525:86c18b2a16cc

merge of '541f6529c3dbec16782707ce37eb8206f95fc92e' and 'e4c829c5c55062700c14f234887b29ade8239b63'
author Etan Reisner <pidgin@unreliablesource.net>
date Tue, 04 Mar 2008 02:48:30 +0000
parents 4c28d1e4e284
children 48d09d62912e
line wrap: on
line diff