log

age author description
2010-05-28 andrew victor merge of 'c32c1fdff08db87b69fc0eb921a5eaafcb5ef67e'
2010-05-28 andrew victor Some spelling fixes to code comments.
2010-07-22 Yoshiki Yazawa should not HTML wrap messages on non-ICQ services, otherwise non-ascii message would not be delivered.
2010-07-22 Yoshiki Yazawa merged from im.pidgin.pidgin
2010-07-21 Mark Doliner We are the future, now
2010-07-21 Mark Doliner Oh my bad, we said we'd stop updating this
2010-07-21 Mark Doliner Grab changes from the 2.7.2 branch
2010-07-21 Mark Doliner Fix a crash bug in oscar related to trying to allocate too much memory.
2010-07-21 Mark Doliner This patch attempts to fix four bugs in the oscar protocol plugin that
2010-07-20 Björn Voigt Small German translation update
2010-07-20 Björn Voigt German translation update
2010-07-20 Stu Tomlinson Some fixes to IRC handling in purple-url-handler, mainly to fix
2010-07-19 Sadrul Habib Chowdhury Make it possible for perl plugins to connect to log-signals.
2010-07-17 Elliott Sales de Andrade Remove a buddy that left a chat from an internal list. Otherwise, the
2010-07-17 Elliott Sales de Andrade Add a timeout which forces the login process to complete. This won't
2010-07-17 Elliott Sales de Andrade The session parameter appears unused in msn_add_contact_xml.
2010-07-17 Elliott Sales de Andrade Clear the password on an MSN account if saving is disabled and the
2010-07-12 Sadrul Habib Chowdhury merge of '6eb94bb98b242b76b07fe78fe89d136b9201d6f1'
2010-07-12 Sadrul Habib Chowdhury Get rid of a few unnecessary strlen/g_snprintf's.
2010-07-12 Sadrul Habib Chowdhury Remove some timeout/input handlers for upnp.
2010-07-10 Paul Aurich merge of '188465fa1e8064c35ae348b4c71cee7fb4c7c755'
2010-07-10 Sadrul Habib Chowdhury Add missing window-scroll-down and -up for finch in the man page.
2010-07-10 Paul Aurich jabber: Move another function out of caps.c...
2010-07-10 Paul Aurich jabber: Move (and harden) a function to xdata.c
2010-07-10 Paul Aurich const-ify the xmlnode* parameter to xmlnode_get_attrib(_with_namespace)
2010-07-10 Paul Aurich jabber: Minor cleanup (formatting + strcmp->g_str_equal) of caps
2010-07-09 Paul Aurich jabber: Don't crash on caps that include an empty <value/> in the Software Information extended info. Fixes #12292
2010-07-09 Paul Aurich jabber: Start adding some caps tests
2010-07-08 Paul Aurich jabber: Set js->serverFQDN when connecting via BOSH. Fixes #12289
2010-07-08 Paul Aurich jabber: This is more accurate, I think (e.g. Cyrus doesn't know what SCRAM-SHA-1 is)
2010-07-08 Stu Tomlinson rpmlint was complaining about the \*Q and \*U included in finch's man page:
2010-07-07 Marcus Lundblad merge of '5aacaf467359c75ac94de8b4a1897a191bc2a261'
2010-07-07 Marcus Lundblad pidgin: Re-arrange media window. Layout remote and local video side-by-side.
2010-07-07 Yoshiki Yazawa merged from im.pidgin.pidgin
2010-07-05 Sadrul Habib Chowdhury Add sound-support for got-attention event.
2010-07-05 Sadrul Habib Chowdhury Fix a crash in Finch < 2.7.0 with purple >= 2.7.0.
2010-07-05 Sadrul Habib Chowdhury Whoops.
2010-07-05 Sadrul Habib Chowdhury Make the combobox a tiny bit friendlier.
2010-07-05 Sadrul Habib Chowdhury Fix build with --with-ncurses-headers.
2010-07-05 Sadrul Habib Chowdhury Make the combobox a bit more friendly.
2010-07-05 Sadrul Habib Chowdhury Some updates to the account window.
2010-07-04 Sadrul Habib Chowdhury Fix data selection in a list-type request-field.
2010-07-04 Sadrul Habib Chowdhury Fix parsing XHTML.
2010-07-03 Elliott Sales de Andrade merge of '9e21ee2eab363a8afc2552ab67c23b90a88d7553'
2010-07-03 Elliott Sales de Andrade Destroy a DC if its corresponding slpcall is going away and it hasn't
2010-07-02 Elliott Sales de Andrade Enable silent build rules. You can disable them using the configure
2010-07-03 Sadrul Habib Chowdhury Compile.
2010-07-03 Paul Aurich Did I mention this is entirely untested? (I don't have GTK+ on
2010-07-03 Paul Aurich Add notify::visibilty handlers for the 'lean' GtkIMHtmlToolbar,
2010-07-03 Paul Aurich merge of '2774f6446b6bd057a7012aad6408b8dea457fbf6'
2010-07-03 Paul Aurich Use a helper variable to (vastly, to me) improve readability.
2010-07-02 Stu Tomlinson Fix the mingw Makefiles to ensure plugins are rebuilt when config.h or
2010-07-01 Paul Aurich *** Plucked rev 6290e1fa3bfba05e59462968ebbff460342c48dd (ivan.komarov@soc.pidgin.im):
2010-06-30 Paul Aurich *** Plucked rev 16e7d9f71db071e6d043c456869b8f860bcc8d45 (ivan.komarov@soc.pidgin.im):
2010-06-30 Paul Aurich *** Plucked rev 1e62e7c65758de7e0aaa5377f865d4164e4482f5 (ivan.komarov@soc.pidgin.im):
2010-06-30 Marcus Lundblad merge of '7c3cd4e07a01085a68042131f5075778e65b1ab6'
2010-06-30 Marcus Lundblad merge of '0a7239b54affab8c6c4a3a097560826d888cf991'
2010-06-30 Marcus Lundblad jabber: Don't show resources that we know for sure isn't supporting the file
2010-06-30 Stu Tomlinson Allow setting sound volume when ALSA is used
2010-06-30 Stu Tomlinson Create the ~/.purple/plugins directory on startup if it does not exist
2010-06-30 Stu Tomlinson I'm sure there's a legitimate reason I had this change locally in one of my
2010-06-30 Stu Tomlinson Get rid of this warning:
2010-06-29 Paul Aurich Add a comment noting the moods should be sorted post-translation.
2010-06-29 Paul Aurich certificate: Add helpful text to the 'not yet active' message.
2010-06-23 Yoshiki Yazawa merged from im.pidgin.pidgin
2010-06-23 Paul Aurich Re-flow the ChangeLog to an 8-char wide tab.
2010-06-22 Elliott Sales de Andrade Fix Yahoo file transfers that get stuck saying \"Waiting for transfer to
2010-06-22 ulidtko Fixes non-ASCII arguments to /mode, /umode, etc. Thanks to Max
2010-06-21 Yoshiki Yazawa merged from im.pidgin.pidgin
2010-06-20 Peter Hjalmarsson Updated swedish translation
2010-06-19 John Bailey So it turns out the name vs oname thing wasn't a typo on Mark's part. I just
2010-06-18 Paul Aurich merge of '0627a49f54e3d5317e6a8dd97956ee2abfa32f9d'
2010-06-18 Paul Aurich Only call failure_cb if it exists for the [gs]et_public_alias functions.
2010-06-18 Paul Aurich merge of '7fe056535dca3e50f6489654f491a2f9e487b4d4'
2010-06-17 John Bailey merge of '17361f09097a5f1f0b18ee376798623ad992ef35'
2010-06-17 Sadrul Habib Chowdhury Initialize pointer, fix a typo to fix a crash.
2010-06-17 John Bailey Fix a typo and solve a crash. g_free() is not safe on uninitialized pointers.
2010-06-18 Mark Doliner Formatting changes. Hopefully I didn't break anything this time
2010-06-17 Paul Aurich merge of '18ddd668ba1cc77ed0a0595a053f8a2879dddfd0'
2010-06-17 Paul Aurich jabber: Exclude ASCII 127 (Delete) from allowed SASLprep characters
2010-06-17 Mark Doliner Minor cleanup
2010-06-17 Mark Doliner We've already checked for the existance of the starttls node, so we know
2010-06-17 Mark Doliner Remove some stray spaces
2010-06-17 Paul Aurich jabber: Fix a crash when sending typing notifications to a malformed buddy
2010-06-17 Paul Aurich jabber: Fix a crash in the BoB code when receiving from Jabbim.
2010-06-17 Paul Aurich jabber: Don't use a static array when it might not be sufficient.
2010-06-17 Paul Aurich jabber: Oops, forgot to save the file before the last commit.
2010-06-17 Paul Aurich jabber: Add a bunch of g_return_if_fail checks to the BoB code
2010-06-15 Paul Aurich merge of '2e4b491ee89464d56b79db045bcef7f63fda6b97'
2010-06-15 Paul Aurich jabber: Stricter checks on the send_raw prpl function.
2010-06-15 Sadrul Habib Chowdhury Allow rebinding the key to show the dropdown menu for comboboxes.
2010-06-15 Sadrul Habib Chowdhury Ignore invisible widgets when resizing. References #12169.
2010-06-15 Paul Aurich merge of '04b459a0054fec05e338c8cb5cdafb9d3feb12b5'
2010-06-15 Stu Tomlinson Catch some more invalid email addresses, thanks to Mark for additional
2010-06-15 Paul Aurich gg: s/exit/_exit/ in the resolver fork() code
2010-06-14 Mark Doliner Oh, let's put our original test cases in the two arrays, to make things
2010-06-14 Daniel Atallah merge of '74a81229c626a318447546176d5b27a0197a44a4'
2010-06-14 Daniel Atallah Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
2010-06-14 Mark Doliner Expand our test for purple_email_is_valid(). I stumbled across a large list
2010-06-14 John Bailey !ChangeLog all the changes I've made to the Yahoo prpls so far. Refs #11986.
2010-06-14 John Bailey Fix a mistake I made with the fallback code. Refs #11986.
2010-06-14 John Bailey Change the shortcut key for "Set Mood" to Ctrl+O for uniqueness. Fixes #12166.
2010-06-14 John Bailey Make HTTP proxy detection in the yahoo prpls a bit more robust. This should
2010-06-13 John Bailey Very hackily implement a fallback mechanism in Yahoo, but not for Yahoo Japan
2010-06-13 Paul Aurich Formatting
2010-06-12 Paul Aurich jabber: Document the other cyrus hack (ignoring EXTERNAL)
2010-06-12 Paul Aurich jabber: Make that more future-proof by never generating "GSSAPI "
2010-06-12 Paul Aurich jabber: Fix the GSSAPI-not-attempted fallback. Refs #12031
2010-06-12 John Bailey Change the function of the "proxy_ssl" account option to cover regular HTTP
2010-06-10 Marcus Lundblad merge of '2e94598029dc6350d656fd335ad83738ff0c8e29'
2010-06-10 Marcus Lundblad media: Fix the TURN server setting to actually work again (it was apparently
2010-06-10 Elliott Sales de Andrade gpointer* is redundant.
2010-06-09 Sadrul Habib Chowdhury merge of '6df484b58e54743f46465726f124c339a884768f'
2010-06-09 Sadrul Habib Chowdhury Allow page-up/downing in the suggestion list.
2010-06-07 Marcus Lundblad Removed some commented-out code
2010-06-07 Marcus Lundblad woops, this should remain de-activated for a while yet... :)
2010-06-07 Marcus Lundblad pidgin: Re-set focus after clicking on the attention button.
2010-06-06 Sadrul Habib Chowdhury merge of '52f4817b6a7b2db5cad41758c4911c0f20f77eb2'
2010-06-06 Sadrul Habib Chowdhury Do not paste in a read-only imhtml. Fixes #12109.
2010-06-05 Stu Tomlinson merge of '2354bdb318de029dd9fd2b15e2bb66ffe99920a6'
2010-06-05 Stu Tomlinson Fix parallel builds on win32
2010-06-05 Stu Tomlinson Make the advice for symlink-ing devhelp docs more explicit to reduce the
2010-06-04 Yoshiki Yazawa merged from im.pidgin.pidgin
2010-06-03 Sadrul Habib Chowdhury merge of '34e44fc5b81fa29b233deac42ea221cb1c367101'
2010-06-03 Sadrul Habib Chowdhury Apparently file/directory names in windows cannot end in periods/spaces.
2010-06-03 Sadrul Habib Chowdhury Prevent an invalid read when a message starts with 'mailto:'.
2010-06-03 Sadrul Habib Chowdhury Linkify file://
2010-06-03 Sadrul Habib Chowdhury Remove code duplications, and some invalid memory reads.
2010-06-03 Mark Doliner I found these by running "strings" on some MSN binary files. Doesn't seem
2010-06-03 Sadrul Habib Chowdhury merge of '1ea3865b477734411bc371709c1d29d4a4be04ab'
2010-06-03 Sadrul Habib Chowdhury Do not trigger the formatting toolbar buttons on right-click.
2010-06-03 Sadrul Habib Chowdhury Reset 'undo' history when a message is sent.
2010-06-03 Daniel Atallah Make sure that the translations in the installer are displayed sorted.
2010-06-03 Mark Doliner I noticed that this wasn't being used
2010-06-02 Elliott Sales de Andrade We shouldn't free user->extinfo here because it can also contain phone
2010-06-02 Mark Doliner Remove a stray word from a comment
2010-06-02 Stu Tomlinson Minor comment fix.
2010-06-02 Stu Tomlinson Minor comment fix.
2010-06-02 Stu Tomlinson I forgot to update the RPM spec file for building for older releases with
2010-05-31 Mark Doliner Copy the third hunk from 3c30f64efedafc379b6536852bbb3b6ef5f1f6c9 to trunk
2010-05-31 Stu Tomlinson Fix up translations so windows installer can be created
2010-05-31 Björn Voigt Added the language code "de" to the new field "Language:" (gettext 0.18)
2010-05-31 Elliott Sales de Andrade merge of '215ef5d9abdd1383add930273847c6f71152f12e'
2010-05-31 John Bailey Commit updated po's so that hopefully the stats script doesn't have to work
2010-05-31 John Bailey We're tagged, move on for 2.7.2.
2010-05-31 Elliott Sales de Andrade Correctly reset and free user->extinfo when the buddy is not listening to
2010-05-31 Elliott Sales de Andrade Remove some extra variables.
2010-05-30 Yoshiki Yazawa merged from im.pidgin.pidgin
2010-05-30 Josep Puigdemont Catalan translation updated.
2010-05-30 Marcus Lundblad Double space before full stop.
2010-05-30 Marcus Lundblad NEWS!
2010-05-30 John Bailey Prepping for release.
2010-05-30 John Bailey Updated a bunch of translations (and added them to the po ChangeLog!).
2010-05-30 John Bailey merge of '0c5825d5c8cf7e382a744e266bb4c67753d24db4'
2010-05-29 John Bailey Update POTFILES.in to make distcheck happy. I could swear I checked this not
2010-05-29 Elliott Sales de Andrade Fix a read-after-free from valgrind:
2010-05-29 Elliott Sales de Andrade Comment spellcheck.
2010-05-29 Elliott Sales de Andrade And another one just like 94fa017925fa206fc36f520ee42c54f57429b4e1. But
2010-05-29 Björn Voigt German translation update
2010-05-29 Elliott Sales de Andrade NEWS... Because rekkanoryo said it was a good idea...
2010-05-29 Kelemen Gábor Updated Hungarian translation for 2.7.1
2010-05-29 Paul Aurich merge of '8955da011b0481f0598f9cb0ee24fc2184396c69'
2010-05-29 Elliott Sales de Andrade And another one of those reverse links. We don't want dc to automatically
2010-05-28 Elliott Sales de Andrade It's probably best just to be explicit about the ordering here.
2010-05-28 Elliott Sales de Andrade So, elb informs me this is probably not safe on non-x86 architectures.
2010-05-29 Paul Aurich roomlist: "glib.h" -> <glib.h>; seems correct-er to me
2010-05-28 Elliott Sales de Andrade For some reason, this line creates the following warning:
2010-05-28 Kevin Stange Fix some errors. I also declare that we will release 2.7.1 sometime in 2010.
2010-05-28 Stu Tomlinson Avoid a crash (null pointer dereference) in QQ if the server_time was not
2010-05-28 Daniel Atallah Fix win32 build
2010-05-28 Daniel Atallah Fix a crash when setting a non account-specific mood and an enabled account is offline
2010-05-28 masca Add MXit ChangeLog as asked by Andrew.
2010-05-28 Elliott Sales de Andrade NULL-ify one more link on destroy that might lead to a crash.
2010-05-28 Elliott Sales de Andrade Oops, I left an extra line here.
2010-05-28 Elliott Sales de Andrade merge of '3083d5a5d5b46193be6849e67ddef5bb26111789'
2010-05-28 Elliott Sales de Andrade Add a configure option --enable-trayicon-compat which installs tray icons
2010-05-28 Elliott Sales de Andrade I don't know why this AM_CONDITIONAL is so far away from its setup.
2010-05-28 John Bailey I agree with Stu that this is the correct way to handle the Sun CC specific
2010-05-28 Mark Doliner Remove unnecessary check
2010-05-27 Josep Puigdemont Updated Catalan (Valencian) translation on behalf of Toni Hermoso.
2010-05-27 Stu Tomlinson Fix compiling gevolution plugin with e-d-s >= 2.29.1
2010-05-27 Stu Tomlinson Fix the "Send email" context menu option for gevolution so it actually works
2010-05-27 Stu Tomlinson Fix the Group selectors on gevolution plugin add buddy and new person
2010-05-27 Mark Doliner It appears this function was removed
2010-05-27 Elliott Sales de Andrade Fix D-Bus version of purple_xfer_get_thumbnail. I don't think this was a
2010-05-26 Elliott Sales de Andrade I think it's more accurate to say that a DC is a P2P transfer, so if that
2010-05-26 Elliott Sales de Andrade ALICE sends a "603 Decline" to our DC request, so we need to fallback to a
2010-05-26 Elliott Sales de Andrade Add an error handler for SLP messages instead of bailing out immediately.
2010-05-30 Yoshiki Yazawa revive tray-icon in non-gnome environment by reverting 29717 and 29761.
2010-05-27 Yoshiki Yazawa merged from im.pidgin.pidgin
2010-05-26 John Bailey propagate from branch 'im.pidgin.pidgin.mxit' (head b4547e5df2f928e2dc0e471d88aa7a8975222c0e)
2010-05-25 andrew victor Specify purple_request_field_set_required() for the Capcha input textbox.
2010-05-26 Daniel Atallah merge of '1f6b3e2158dd96486ec32995b3f4f93d6b376780'
2010-05-26 Elliott Sales de Andrade GtkStatusIcon only exposes a single button press on a Mac for whatever
2010-05-26 Elliott Sales de Andrade Add a minimal index.theme for the tray icons.
2010-05-26 Björn Voigt German translation update
2010-05-25 Mark Doliner Apply Polynomial-C's suggestion for fixing a compile error with
2010-05-25 Josep Puigdemont Catalan translation updated.
2010-05-26 Yoshiki Yazawa restore file name encoding conversion
2010-05-25 Yoshiki Yazawa merged from im.pidgin.pidgin
2010-05-24 Daniel Atallah Fix malformed installer string
2010-05-24 Elliott Sales de Andrade Add and remove an extra ref per MsnMessage when saving it in a slpmsg, to
2010-05-23 Elliott Sales de Andrade NULL-ify some reverse links so that there's no double-free on exit.
2010-05-23 jirka Make Pidgin build correctly when using the --disable-nls configure flag.
2010-05-23 John Bailey merge of '637cbec3044756a8ef4273f687d84b18f10b05c4'
2010-05-23 Stu Tomlinson Don't free captcha_req just before dereferencing it.
2010-05-23 John Bailey Merge Windows-specific changes for 2.7.0 and 2.7.1 into the main ChangeLog and
2010-05-22 Éric Boumaour Update french translation for 2.7.1 release
2010-05-21 Elliott Sales de Andrade merge of '4f95778269e5a6f5dc65dc999e28f67e5604b35a'
2010-05-21 Elliott Sales de Andrade Minor comment fix.
2010-05-21 Elliott Sales de Andrade C comments only.
2010-05-21 Elliott Sales de Andrade Make it more explicit that incoming and outgoing timeouts are different.
2010-05-21 Elliott Sales de Andrade A nonce doesn't seem to be necessary for an INVITE with Bridges. Didn't I
2010-05-21 Elliott Sales de Andrade This is supposed to go along with the queue sending stuff.
2010-05-21 Elliott Sales de Andrade Don't crash if there's no Hashed-Nonce or Nonce.
2010-05-21 Elliott Sales de Andrade I don't know why this function returns a boolean that's never used.
2010-05-21 Elliott Sales de Andrade Disable direct connections when the account option is off.
2010-05-21 Elliott Sales de Andrade We want to call got_invite for existing slpcalls, too.
2010-05-21 Elliott Sales de Andrade merge of '53053c3093fabd661045da5b90dd26b37214a73c'
2010-05-20 Elliott Sales de Andrade merge of '5bfb0ca73bb205b34170e5e0c07c35f5e8598734'
2010-05-20 Elliott Sales de Andrade If there's stuff stuck in the DC queue, then try to send it over the SB if
2010-05-20 Elliott Sales de Andrade Wait, command can't be both INVITE and CANCEL at the same time.
2010-05-18 Elliott Sales de Andrade It seems like aMSN can get a bit stuck when using multiple file transfers,
2010-05-17 Elliott Sales de Andrade Ref the slplink before destroying the DC, or we might lose our slpcall.
2010-05-17 Elliott Sales de Andrade Use msn_dc_fallback_to_p2p where possible.
2010-05-17 Elliott Sales de Andrade merge of '4fc447ffec2a8d0d5fde9ccdb17acf825a5ccab5'
2010-05-17 Elliott Sales de Andrade This is not a timeout, but an input handler.
2010-05-17 Elliott Sales de Andrade Fallback to P2P if connecting to external IP didn't work immediately.
2010-05-15 Elliott Sales de Andrade If removing a timeout and return FALSE in its handler isn't good, then
2010-05-14 Elliott Sales de Andrade merge of 'b5086a027dfbc0926b74627b9783794d250c2cb4'
2010-05-11 Elliott Sales de Andrade merge of '8995bf8c14c5b7fb67a84a18ba9bf73e7be3fca8'
2010-05-08 Elliott Sales de Andrade We can't both remove a timeout and return FALSE in its callback.
2010-05-07 Elliott Sales de Andrade merge of '5378b2067023c1be51d87906196d87f03c9992e3'
2010-05-06 Elliott Sales de Andrade Close the DC when the slplink is empty.
2010-05-06 Elliott Sales de Andrade This should probably work a bit better. At least, we want to get rid of any
2010-05-06 Elliott Sales de Andrade I think user might be NULL here.
2010-05-05 Elliott Sales de Andrade Valgrind pointed out that dest and src may overlap, so we need to use
2010-05-05 Elliott Sales de Andrade I've seen packet sizes larger than our current maximum. Hopefully 8KiB is
2010-05-05 Elliott Sales de Andrade Remote more seemingly unnecessary stuff.
2010-05-05 Elliott Sales de Andrade I'm not sure what this stuff is, but it looks old and useless.
2010-05-05 Elliott Sales de Andrade I'm pretty sure we need to actually use dc->msg_pos for something, instead
2010-05-05 Elliott Sales de Andrade I think this finally works with both aMSN and the official client, for
2010-05-05 Elliott Sales de Andrade Try and reduce some code duplication.
2010-05-05 Elliott Sales de Andrade Make msn_dc_fallback_to_p2p non-static, and remove some old code.
2010-05-05 Elliott Sales de Andrade It's probably a good idea to free the direct connection when the slplink
2010-05-05 Elliott Sales de Andrade The length of a DC packet does not include itself.
2010-04-25 Elliott Sales de Andrade It seems like every DC packet requires a length, so why make every little
2010-04-25 Elliott Sales de Andrade Obviously, if this comparison fails, I should be returning FALSE.
2010-04-24 Elliott Sales de Andrade All these processing functions are called from places where dc != NULL,
2010-04-24 Elliott Sales de Andrade Remove some duplicate code.
2010-04-24 Elliott Sales de Andrade Don't bother sending a direct connection request if the other side doesn't
2010-04-24 Elliott Sales de Andrade Support old-style Nonce, which should let us use direct connections to
2010-04-24 Elliott Sales de Andrade These lines are redundant since this was allocated with g_new0.
2010-04-23 Elliott Sales de Andrade Save remote nonce, and verify we get the same data when initiating the
2010-04-23 Elliott Sales de Andrade merge of '21280175da42b51e30e31b091bb3b4adf7708407'
2010-04-23 Elliott Sales de Andrade Fix some leaks, and simplify these branches.