soc.2012.android: d793e961: propagate from branch 'im.pidgin.pidgin'...
michael at soc.pidgin.im
michael at soc.pidgin.im
Mon May 28 11:42:29 EDT 2012
----------------------------------------------------------------------
Revision: d793e9615e8abcff19f883a38477835d2033ef8b
Parent: 257607fea4c29923037534e43b8a48acab44491e
Parent: 87ddfd62632fa36c2e05ca50a1f19aff2a24a559
Author: michael at soc.pidgin.im
Date: 05/28/12 11:38:49
Branch: im.pidgin.soc.2012.android
URL: http://d.pidgin.im/viewmtn/revision/info/d793e9615e8abcff19f883a38477835d2033ef8b
Changelog:
propagate from branch 'im.pidgin.pidgin' (head 87ddfd62632fa36c2e05ca50a1f19aff2a24a559)
to branch 'im.pidgin.soc.2012.android' (head 257607fea4c29923037534e43b8a48acab44491e)
Changes against parent 257607fea4c29923037534e43b8a48acab44491e
patched ChangeLog
patched ChangeLog.API
patched libpurple/protocols/irc/irc.c
patched libpurple/protocols/irc/irc.h
patched libpurple/protocols/irc/msgs.c
patched libpurple/protocols/jabber/jabber.c
patched libpurple/protocols/jabber/usermood.c
patched libpurple/protocols/jabber/usermood.h
patched libpurple/protocols/msn/contact.c
patched libpurple/protocols/msn/msg.c
patched libpurple/proxy.c
patched libpurple/stun.c
patched pidgin/gtkblist.c
patched pidgin/gtkblist.h
patched pidgin/gtkconv.c
patched pidgin/gtkdialogs.c
patched pidgin/gtklog.c
patched pidgin/themes/Contents/Resources/main.css
patched pidgin/themes/Template.html
patched po/ChangeLog
patched po/de.po
patched po/pl.po
Changes against parent 87ddfd62632fa36c2e05ca50a1f19aff2a24a559
added android
added android/workspace
added android/workspace/im.pidgin.libpurple
added android/workspace/im.pidgin.libpurple/.externalToolBuilders
added android/workspace/im.pidgin.libpurple/.settings
added android/workspace/im.pidgin.libpurple/assets
added android/workspace/im.pidgin.libpurple/bin
added android/workspace/im.pidgin.libpurple/deploy
added android/workspace/im.pidgin.libpurple/gen
added android/workspace/im.pidgin.libpurple/native
added android/workspace/im.pidgin.libpurple/res
added android/workspace/im.pidgin.libpurple/res/drawable-hdpi
added android/workspace/im.pidgin.libpurple/res/drawable-ldpi
added android/workspace/im.pidgin.libpurple/res/drawable-mdpi
added android/workspace/im.pidgin.libpurple/res/drawable-xhdpi
added android/workspace/im.pidgin.libpurple/res/layout
added android/workspace/im.pidgin.libpurple/res/values
added android/workspace/im.pidgin.libpurple/src
added android/workspace/im.pidgin.libpurple/src/im
added android/workspace/im.pidgin.libpurple/src/im/pidgin
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/account
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/blist
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/buddy
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/core
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/core/dns
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/glib
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/peering
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/plugin
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/uiops
added android/workspace/im.pidgin.libpurple.build
added android/workspace/im.pidgin.libpurple.build/.externalToolBuilders
added android/workspace/im.pidgin.libpurple.build/.settings
added android/workspace/im.pidgin.libpurple.build/build
added android/workspace/im.pidgin.libpurple.build/buildscripts
added android/workspace/im.pidgin.libpurple.build/downloads
added android/workspace/im.pidgin.libpurple.build/src
added android/workspace/im.pidgin.libpurple.build/src/im
added android/workspace/im.pidgin.libpurple.build/src/im/pidgin
added android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple
added android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build
added android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/constants
added android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/libs
added android/workspace/im.pidgin.libpurple.testclient
added android/workspace/im.pidgin.libpurple.testclient/.externalToolBuilders
added android/workspace/im.pidgin.libpurple.testclient/bin
added android/workspace/im.pidgin.libpurple.testclient/gen
added android/workspace/im.pidgin.libpurple.testclient/libs
added android/workspace/im.pidgin.libpurple.testclient/res
added android/workspace/im.pidgin.libpurple.testclient/res/drawable
added android/workspace/im.pidgin.libpurple.testclient/res/layout
added android/workspace/im.pidgin.libpurple.testclient/res/values
added android/workspace/im.pidgin.libpurple.testclient/src
added android/workspace/im.pidgin.libpurple.testclient/src/im
added android/workspace/im.pidgin.libpurple.testclient/src/im/pidgin
added android/workspace/im.pidgin.libpurple.testclient/src/im/pidgin/libpurple
added android/workspace/im.pidgin.libpurple.testclient/src/im/pidgin/libpurple/testclient
added android/workspace/im.pidgin.libpurple/.classpath
added android/workspace/im.pidgin.libpurple/.cproject
added android/workspace/im.pidgin.libpurple/.externalToolBuilders/headers and native.launch
added android/workspace/im.pidgin.libpurple/.project
added android/workspace/im.pidgin.libpurple/.settings/org.eclipse.cdt.codan.core.prefs
added android/workspace/im.pidgin.libpurple/AndroidManifest.xml
added android/workspace/im.pidgin.libpurple/loadlibs.ant
added android/workspace/im.pidgin.libpurple/native/GHashTableReference.c
added android/workspace/im.pidgin.libpurple/native/GListReference.c
added android/workspace/im.pidgin.libpurple/native/PurpleInstance.c
added android/workspace/im.pidgin.libpurple/native/StringPeerGenerator.c
added android/workspace/im.pidgin.libpurple/native/build.ant
added android/workspace/im.pidgin.libpurple/native/distribute.ant
added android/workspace/im.pidgin.libpurple/native/generateheaders.ant
added android/workspace/im.pidgin.libpurple/native/helpers.c
added android/workspace/im.pidgin.libpurple/native/helpers.h
added android/workspace/im.pidgin.libpurple/proguard-project.txt
added android/workspace/im.pidgin.libpurple/project.properties
added android/workspace/im.pidgin.libpurple/res/values/strings.xml
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/account/PurpleAccount.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/account/PurpleAccountList.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/account/PurpleAccountListListener.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/account/PurpleAccountListener.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/account/PurpleStatus.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/blist/PurpleBlist.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/blist/PurpleBlistManager.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/blist/PurpleBlistNode.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/blist/PurpleContact.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/buddy/PurpleBuddy.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/core/AbstractPurpleManaged.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/core/CoreManager.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/core/EventLoop.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/core/PeeredPurpleManaged.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/core/PurpleInstance.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/core/PurpleLibraryLoader.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/core/PurpleManaged.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/core/PurpleThread.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/core/dns/DnsQueryData.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/core/dns/DnsQueryFailedCallback.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/core/dns/DnsQueryResolvedCallback.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/core/dns/DnsQueryUiOps.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/glib/GHashTable.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/glib/GHashTableIterator.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/glib/GHashTableReference.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/glib/GHashTableSet.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/glib/GList.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/glib/GListIterator.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/glib/GListReference.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/glib/GSourceFunctionCall.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/peering/NativeObjectUnavailableException.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/peering/PeerGenerator.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/peering/Peered.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/peering/StringPeerGenerator.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/plugin/PurplePlugin.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/plugin/PurplePluginManager.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/plugin/PurpleProtocolPlugin.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/uiops/CoreUiOps.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/uiops/DebugUiOps.java
added android/workspace/im.pidgin.libpurple/src/im/pidgin/libpurple/uiops/EventLoopUiOps.java
added android/workspace/im.pidgin.libpurple.build/.classpath
added android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/dbus.launch
added android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/glib.launch
added android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libffi.launch
added android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libgettext.launch
added android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libiconv.launch
added android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libxml2.launch
added android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/purple.launch
added android/workspace/im.pidgin.libpurple.build/.project
added android/workspace/im.pidgin.libpurple.build/.settings/org.eclipse.ltk.core.refactoring.prefs
added android/workspace/im.pidgin.libpurple.build/buildscripts/androidarpa.h
added android/workspace/im.pidgin.libpurple.build/buildscripts/common.ant
added android/workspace/im.pidgin.libpurple.build/buildscripts/config.sub.patch
added android/workspace/im.pidgin.libpurple.build/buildscripts/dbus.ant
added android/workspace/im.pidgin.libpurple.build/buildscripts/dbus.patch
added android/workspace/im.pidgin.libpurple.build/buildscripts/fcntl.h
added android/workspace/im.pidgin.libpurple.build/buildscripts/gettext.patch
added android/workspace/im.pidgin.libpurple.build/buildscripts/glib.ant
added android/workspace/im.pidgin.libpurple.build/buildscripts/glib.patch
added android/workspace/im.pidgin.libpurple.build/buildscripts/glob.h
added android/workspace/im.pidgin.libpurple.build/buildscripts/libffi.ant
added android/workspace/im.pidgin.libpurple.build/buildscripts/libgettext.ant
added android/workspace/im.pidgin.libpurple.build/buildscripts/libiconv.ant
added android/workspace/im.pidgin.libpurple.build/buildscripts/libxml2.ant
added android/workspace/im.pidgin.libpurple.build/buildscripts/purple.ant
added android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/constants/ConstantExtractor.java
added android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/constants/ConstantName.java
added android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/constants/EnumItem.java
added android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/constants/EnumName.java
added android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/constants/EnumObject.java
added android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/constants/ExtractConstants.java
added android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/constants/ExtractorException.java
added android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/libs/Library.java
added android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/libs/LibraryDirectory.java
added android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/libs/ReplaceLibNames.java
added android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/libs/Replacer.java
added android/workspace/im.pidgin.libpurple.testclient/.classpath
added android/workspace/im.pidgin.libpurple.testclient/.externalToolBuilders/Andorid build.launch
added android/workspace/im.pidgin.libpurple.testclient/.project
added android/workspace/im.pidgin.libpurple.testclient/AndroidManifest.xml
added android/workspace/im.pidgin.libpurple.testclient/build.ant
added android/workspace/im.pidgin.libpurple.testclient/proguard-project.txt
added android/workspace/im.pidgin.libpurple.testclient/project.properties
added android/workspace/im.pidgin.libpurple.testclient/res/drawable/pidgin.png
added android/workspace/im.pidgin.libpurple.testclient/res/layout/main.xml
added android/workspace/im.pidgin.libpurple.testclient/res/values/strings.xml
added android/workspace/im.pidgin.libpurple.testclient/src/im/pidgin/libpurple/testclient/PurpleTestClient.java
patched autogen.sh
patched libpurple/core.h
patched libpurple/dnsquery.c
patched libpurple/dnssrv.c
patched libpurple/example/nullclient.c
attr on android/workspace/im.pidgin.libpurple.testclient/res/drawable/pidgin.png
set mtn:manual_merge
to true
More information about the Commits
mailing list