Hello community, here is the log from the commit of package gnome-online-accounts for openSUSE:Factory checked in at 2014-07-06 22:52:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-online-accounts (Old) and /work/SRC/openSUSE:Factory/.gnome-online-accounts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-online-accounts" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-online-accounts/gnome-online-accounts.changes 2014-05-20 14:25:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-online-accounts.new/gnome-online-accounts.changes 2014-07-06 22:52:12.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 23 18:13:07 UTC 2014 - zai...@opensuse.org + +- Update to version 3.12.3: + + Bugs fixed: bgo#699553, bgo#730041, bgo#730810. + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-online-accounts-3.12.2.tar.xz New: ---- gnome-online-accounts-3.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-online-accounts.spec ++++++ --- /var/tmp/diff_new_pack.mQ7qFE/_old 2014-07-06 22:52:13.000000000 +0200 +++ /var/tmp/diff_new_pack.mQ7qFE/_new 2014-07-06 22:52:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: gnome-online-accounts -Version: 3.12.2 +Version: 3.12.3 Release: 0 Summary: GNOME service to access online accounts License: LGPL-2.0+ ++++++ gnome-online-accounts-3.12.2.tar.xz -> gnome-online-accounts-3.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-online-accounts-3.12.2/NEWS new/gnome-online-accounts-3.12.3/NEWS --- old/gnome-online-accounts-3.12.2/NEWS 2014-05-13 16:19:11.000000000 +0200 +++ new/gnome-online-accounts-3.12.3/NEWS 2014-06-05 13:57:37.000000000 +0200 @@ -1,3 +1,15 @@ +Overview of changes in 3.12.3 +============================= + +* Bugs fixed: + 699553 ewsclient: Correctly cancel pending messages on success + 730041 ewsclient: Autodiscover XML can contain multiple Protocol elements + 730810 flickr: Use SSL + +* Updated translations: + Norwegian bokmål + + Overview of changes in 3.12.2 ============================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-online-accounts-3.12.2/configure new/gnome-online-accounts-3.12.3/configure --- old/gnome-online-accounts-3.12.2/configure 2014-05-13 16:22:09.000000000 +0200 +++ new/gnome-online-accounts-3.12.3/configure 2014-06-05 14:01:38.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNOME Online Accounts 3.12.2. +# Generated by GNU Autoconf 2.69 for GNOME Online Accounts 3.12.3. # # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-online-accounts>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='GNOME Online Accounts' PACKAGE_TARNAME='gnome-online-accounts' -PACKAGE_VERSION='3.12.2' -PACKAGE_STRING='GNOME Online Accounts 3.12.2' +PACKAGE_VERSION='3.12.3' +PACKAGE_STRING='GNOME Online Accounts 3.12.3' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-online-accounts' PACKAGE_URL='' @@ -1492,7 +1492,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNOME Online Accounts 3.12.2 to adapt to many kinds of systems. +\`configure' configures GNOME Online Accounts 3.12.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1563,7 +1563,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNOME Online Accounts 3.12.2:";; + short | recursive ) echo "Configuration of GNOME Online Accounts 3.12.3:";; esac cat <<\_ACEOF @@ -1751,7 +1751,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNOME Online Accounts configure 3.12.2 +GNOME Online Accounts configure 3.12.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2120,7 +2120,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNOME Online Accounts $as_me 3.12.2, which was +It was created by GNOME Online Accounts $as_me 3.12.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2985,7 +2985,7 @@ # Define the identity of the package. PACKAGE='gnome-online-accounts' - VERSION='3.12.2' + VERSION='3.12.3' cat >>confdefs.h <<_ACEOF @@ -11852,7 +11852,7 @@ GOA_MAJOR_VERSION=3 GOA_MINOR_VERSION=12 -GOA_MICRO_VERSION=2 +GOA_MICRO_VERSION=3 @@ -11877,7 +11877,7 @@ $as_echo "#define GOA_MINOR_VERSION 12" >>confdefs.h -$as_echo "#define GOA_MICRO_VERSION 2" >>confdefs.h +$as_echo "#define GOA_MICRO_VERSION 3" >>confdefs.h # Initialization @@ -16202,7 +16202,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNOME Online Accounts $as_me 3.12.2, which was +This file was extended by GNOME Online Accounts $as_me 3.12.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16268,7 +16268,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNOME Online Accounts config.status 3.12.2 +GNOME Online Accounts config.status 3.12.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-online-accounts-3.12.2/configure.ac new/gnome-online-accounts-3.12.3/configure.ac --- old/gnome-online-accounts-3.12.2/configure.ac 2014-05-13 15:49:08.000000000 +0200 +++ new/gnome-online-accounts-3.12.3/configure.ac 2014-06-05 13:57:51.000000000 +0200 @@ -1,6 +1,6 @@ m4_define([goa_major_version], [3]) m4_define([goa_minor_version], [12]) -m4_define([goa_micro_version], [2]) +m4_define([goa_micro_version], [3]) m4_define([goa_nano_version], [0]) m4_define([goa_base_version], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-online-accounts-3.12.2/doc/Makefile.in new/gnome-online-accounts-3.12.3/doc/Makefile.in --- old/gnome-online-accounts-3.12.2/doc/Makefile.in 2014-05-13 16:22:10.000000000 +0200 +++ new/gnome-online-accounts-3.12.3/doc/Makefile.in 2014-06-05 14:01:39.000000000 +0200 @@ -864,11 +864,11 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_GTK_DOC_FALSE@uninstall-local: -@ENABLE_GTK_DOC_FALSE@maintainer-clean-local: -@ENABLE_GTK_DOC_FALSE@clean-local: @ENABLE_GTK_DOC_FALSE@install-data-local: @ENABLE_GTK_DOC_FALSE@distclean-local: +@ENABLE_GTK_DOC_FALSE@uninstall-local: +@ENABLE_GTK_DOC_FALSE@clean-local: +@ENABLE_GTK_DOC_FALSE@maintainer-clean-local: clean: clean-recursive clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-online-accounts-3.12.2/doc/html/goa-Version-Information.html new/gnome-online-accounts-3.12.3/doc/html/goa-Version-Information.html --- old/gnome-online-accounts-3.12.2/doc/html/goa-Version-Information.html 2014-05-13 16:25:31.000000000 +0200 +++ new/gnome-online-accounts-3.12.3/doc/html/goa-Version-Information.html 2014-06-05 14:03:40.000000000 +0200 @@ -275,7 +275,7 @@ <hr> <div class="refsect2"> <a name="GOA-MICRO-VERSION:CAPS"></a><h3>GOA_MICRO_VERSION</h3> -<pre class="programlisting">#define GOA_MICRO_VERSION 2 +<pre class="programlisting">#define GOA_MICRO_VERSION 3 </pre> <p>The micro version number of the GOA daemon and library.</p> <p>Like <a class="link" href="goa-Version-Information.html#goa-micro-version" title="goa_micro_version"><span class="type">goa_micro_version</span></a>, but from the headers used at diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-online-accounts-3.12.2/doc/html/index.html new/gnome-online-accounts-3.12.3/doc/html/index.html --- old/gnome-online-accounts-3.12.2/doc/html/index.html 2014-05-13 16:25:31.000000000 +0200 +++ new/gnome-online-accounts-3.12.3/doc/html/index.html 2014-06-05 14:03:40.000000000 +0200 @@ -32,7 +32,7 @@ </p></div></div> </div> </div></div> -<div><p class="releaseinfo">Version 3.12.2 +<div><p class="releaseinfo">Version 3.12.3 </p></div> <div><p class="copyright">Copyright © 2011, 2012 The GOA Authors</p></div> <div><div class="legalnotice"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-online-accounts-3.12.2/po/nb.po new/gnome-online-accounts-3.12.3/po/nb.po --- old/gnome-online-accounts-3.12.2/po/nb.po 2014-05-13 15:48:12.000000000 +0200 +++ new/gnome-online-accounts-3.12.3/po/nb.po 2014-06-05 13:55:00.000000000 +0200 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: gnome-online-accounts 3.11.x\n" +"Project-Id-Version: gnome-online-accounts 3.12.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-18 18:27+0100\n" -"PO-Revision-Date: 2014-03-18 18:28+0100\n" +"POT-Creation-Date: 2014-06-03 18:54+0200\n" +"PO-Revision-Date: 2014-06-03 18:56+0200\n" "Last-Translator: Kjartan Maraas <kmar...@gnome.org>\n" "Language-Team: Norwegian bokmål <i18n...@lister.ping.uio.no>\n" "Language: \n" @@ -28,27 +28,27 @@ msgstr "Egenskap ProviderType er ikke satt for kontoen" #. TODO: more specific -#: ../src/goabackend/goaewsclient.c:231 ../src/goabackend/goahttpclient.c:172 +#: ../src/goabackend/goaewsclient.c:230 ../src/goabackend/goahttpclient.c:172 #, c-format msgid "Code: %u — Unexpected response from server" msgstr "Kode: %u - Uventet svar fra tjener" #. TODO: more specific -#: ../src/goabackend/goaewsclient.c:247 +#: ../src/goabackend/goaewsclient.c:246 #, c-format msgid "Failed to parse autodiscover response XML" msgstr "Klarte ikke å lese XML-svar for automatisk gjenkjenning" #. TODO: more specific #. Translators: the parameter is an XML element name. -#: ../src/goabackend/goaewsclient.c:258 ../src/goabackend/goaewsclient.c:273 -#: ../src/goabackend/goaewsclient.c:288 +#: ../src/goabackend/goaewsclient.c:257 ../src/goabackend/goaewsclient.c:272 +#: ../src/goabackend/goaewsclient.c:287 #, c-format msgid "Failed to find ‘%s’ element" msgstr "Klarte ikke å finne element «%s»" #. TODO: more specific -#: ../src/goabackend/goaewsclient.c:305 +#: ../src/goabackend/goaewsclient.c:308 #, c-format msgid "Failed to find ASUrl and OABUrl in autodiscover response" msgstr "Klarte ikke å finne ASUrl og OABUrl i svar for automatisk gjenkjenning" @@ -185,20 +185,20 @@ #. Translators: This is a label for a series of #. * options switches. For example: “Use for Mail”. #: ../src/goabackend/goaexchangeprovider.c:943 -#: ../src/goabackend/goafacebookprovider.c:433 +#: ../src/goabackend/goafacebookprovider.c:434 #: ../src/goabackend/goaflickrprovider.c:424 #: ../src/goabackend/goagoogleprovider.c:563 #: ../src/goabackend/goakerberosprovider.c:1727 #: ../src/goabackend/goaowncloudprovider.c:1101 #: ../src/goabackend/goapocketprovider.c:425 #: ../src/goabackend/goatelepathyprovider.c:915 -#: ../src/goabackend/goawindowsliveprovider.c:453 +#: ../src/goabackend/goawindowsliveprovider.c:427 msgid "Use for" msgstr "Bruk for" #: ../src/goabackend/goaexchangeprovider.c:945 #: ../src/goabackend/goagoogleprovider.c:565 -#: ../src/goabackend/goawindowsliveprovider.c:455 +#: ../src/goabackend/goawindowsliveprovider.c:429 msgid "_Mail" msgstr "E-_post" @@ -219,19 +219,21 @@ msgstr "Facebook" #. Translators: the %d is a HTTP status code and the %s is a textual description of it -#: ../src/goabackend/goafacebookprovider.c:215 +#: ../src/goabackend/goafacebookprovider.c:216 #: ../src/goabackend/goaflickrprovider.c:186 #: ../src/goabackend/goagoogleprovider.c:214 -#: ../src/goabackend/goawindowsliveprovider.c:194 +#: ../src/goabackend/goawindowsliveprovider.c:192 #: ../src/goabackend/goayahooprovider.c:184 #, c-format msgid "" "Expected status 200 when requesting your identity, instead got status %d (%s)" -msgstr "Forventet status 200 ved forespørsel om din identitet, men fikk status %d (%s)" +msgstr "" +"Forventet status 200 ved forespørsel om din identitet, men fikk status %d " +"(%s)" -#: ../src/goabackend/goafacebookprovider.c:234 -#: ../src/goabackend/goafacebookprovider.c:246 -#: ../src/goabackend/goafacebookprovider.c:256 +#: ../src/goabackend/goafacebookprovider.c:235 +#: ../src/goabackend/goafacebookprovider.c:247 +#: ../src/goabackend/goafacebookprovider.c:257 #: ../src/goabackend/goaflickrprovider.c:205 #: ../src/goabackend/goaflickrprovider.c:217 #: ../src/goabackend/goaflickrprovider.c:227 @@ -242,9 +244,9 @@ #: ../src/goabackend/goaoauth2provider.c:728 #: ../src/goabackend/goaoauth2provider.c:758 #: ../src/goabackend/goaoauth2provider.c:770 -#: ../src/goabackend/goawindowsliveprovider.c:213 -#: ../src/goabackend/goawindowsliveprovider.c:225 -#: ../src/goabackend/goawindowsliveprovider.c:237 +#: ../src/goabackend/goawindowsliveprovider.c:211 +#: ../src/goabackend/goawindowsliveprovider.c:223 +#: ../src/goabackend/goawindowsliveprovider.c:235 #: ../src/goabackend/goayahooprovider.c:203 #: ../src/goabackend/goayahooprovider.c:215 #: ../src/goabackend/goayahooprovider.c:226 @@ -255,14 +257,13 @@ msgid "Could not parse response" msgstr "Kunne ikke å lese svar" -#: ../src/goabackend/goafacebookprovider.c:435 +#: ../src/goabackend/goafacebookprovider.c:436 #: ../src/goabackend/goagoogleprovider.c:580 #: ../src/goabackend/goatelepathyprovider.c:917 -#: ../src/goabackend/goawindowsliveprovider.c:460 msgid "C_hat" msgstr "_Prat" -#: ../src/goabackend/goafacebookprovider.c:440 +#: ../src/goabackend/goafacebookprovider.c:441 #: ../src/goabackend/goaflickrprovider.c:426 msgid "_Photos" msgstr "_Bilder" @@ -283,7 +284,7 @@ #: ../src/goabackend/goagoogleprovider.c:585 #: ../src/goabackend/goaowncloudprovider.c:1113 -#: ../src/goabackend/goawindowsliveprovider.c:465 +#: ../src/goabackend/goawindowsliveprovider.c:434 msgid "_Documents" msgstr "_Dokumenter" @@ -440,7 +441,7 @@ msgstr "Bedriftsdomene eller områdenavn" #: ../src/goabackend/goakerberosprovider.c:1353 -#: ../src/goaidentity/goaidentityservice.c:1112 +#: ../src/goaidentity/goaidentityservice.c:1109 msgid "Log In to Realm" msgstr "Logg inn i område" @@ -471,7 +472,7 @@ #, c-format msgid "" "Expected status 200 when requesting access token, instead got status %d (%s)" -msgstr "" +msgstr "Forventet status 200 ved forespørsel om aksesstegn. Fikk i stedet status %d (%s)" #: ../src/goabackend/goaoauth2provider.c:961 msgid "Authorization response: " @@ -538,7 +539,7 @@ #, c-format msgid "" "Expected status 200 for getting a Request Token, instead got status %d (%s)" -msgstr "" +msgstr "Forventet status 200 for å få et forespørselstegn. Fikk i stedet status %d (%s)" #: ../src/goabackend/goaoauthprovider.c:961 #, c-format @@ -549,7 +550,7 @@ #: ../src/goabackend/goaoauthprovider.c:978 #, c-format msgid "Paste token obtained from the <a href=\"%s\">authorization page</a>:" -msgstr "" +msgstr "Lim inn tegn kode hentet fra <a href=\"%s\">autorisasjonssiden</a>:" #: ../src/goabackend/goaoauthprovider.c:1575 #, c-format @@ -763,80 +764,80 @@ msgid "Expected status 200 when requesting name, instead got status %d (%s)" msgstr "Forventet status 200 ved forespørsel om navn, men fikk status %d (%s)" -#: ../src/goaidentity/goaalarm.c:212 +#: ../src/goaidentity/goaalarm.c:173 msgid "Time" msgstr "Tid" -#: ../src/goaidentity/goaalarm.c:213 +#: ../src/goaidentity/goaalarm.c:174 msgid "Time to fire" msgstr "Tid før start" -#: ../src/goaidentity/goaidentityservice.c:376 +#: ../src/goaidentity/goaidentityservice.c:373 msgid "initial secret passed before secret key exchange" msgstr "Opprinnelig hemmelighet videresendt før utveksling av hemmelig nøkkel" -#: ../src/goaidentity/goaidentityservice.c:568 +#: ../src/goaidentity/goaidentityservice.c:565 msgid "Initial secret key is invalid" msgstr "Opprinnelig hemmelig nøkkel er ugyldig" -#: ../src/goaidentity/goaidentityservice.c:1117 +#: ../src/goaidentity/goaidentityservice.c:1114 #, c-format msgid "The network realm %s needs some information to sign you in." msgstr "Nettverksområde %s trenger informasjon for å logge deg inn." -#: ../src/goaidentity/goakerberosidentity.c:261 -#: ../src/goaidentity/goakerberosidentity.c:270 -#: ../src/goaidentity/goakerberosidentity.c:598 +#: ../src/goaidentity/goakerberosidentity.c:254 +#: ../src/goaidentity/goakerberosidentity.c:263 +#: ../src/goaidentity/goakerberosidentity.c:590 msgid "Could not find identity in credential cache: %k" msgstr "Fant ikke identiteten i buffer for påloggingsinformasjon: %k" -#: ../src/goaidentity/goakerberosidentity.c:611 +#: ../src/goaidentity/goakerberosidentity.c:603 msgid "Could not find identity credentials in cache: %k" msgstr "Fant ikke påloggingsinformasjon for identiteten i buffer: %k" -#: ../src/goaidentity/goakerberosidentity.c:651 +#: ../src/goaidentity/goakerberosidentity.c:643 msgid "Could not sift through identity credentials in cache: %k" msgstr "" "Kunne ikke se se gjennom påloggingsinformasjon for identitet i buffer: %k" -#: ../src/goaidentity/goakerberosidentity.c:669 +#: ../src/goaidentity/goakerberosidentity.c:661 msgid "Could not finish up sifting through identity credentials in cache: %k" msgstr "" "Kunne ikke sluttføre gjennomgang av påloggingsinformasjon for identitet i " "buffer: %k" -#: ../src/goaidentity/goakerberosidentity.c:956 +#: ../src/goaidentity/goakerberosidentity.c:951 #, c-format msgid "No associated identification found" msgstr "Ingen assosiert identifikasjon funnet" -#: ../src/goaidentity/goakerberosidentity.c:1037 +#: ../src/goaidentity/goakerberosidentity.c:1032 msgid "Could not create credential cache: %k" msgstr "Kunne ikke lage buffer for påloggingsinformasjon: %k" -#: ../src/goaidentity/goakerberosidentity.c:1071 +#: ../src/goaidentity/goakerberosidentity.c:1066 msgid "Could not initialize credentials cache: %k" msgstr "Kunne ikke initiere buffer for påloggingsinformasjon: %k" -#: ../src/goaidentity/goakerberosidentity.c:1088 +#: ../src/goaidentity/goakerberosidentity.c:1083 msgid "Could not store new credentials in credentials cache: %k" msgstr "Klarte ikke å lagre ny påloggingsinformasjon i buffer: %k" -#: ../src/goaidentity/goakerberosidentity.c:1363 +#: ../src/goaidentity/goakerberosidentity.c:1358 #, c-format msgid "Could not renew identity: Not signed in" msgstr "Kunne ikke fornye identitet: Ikke logget inn" -#: ../src/goaidentity/goakerberosidentity.c:1375 +#: ../src/goaidentity/goakerberosidentity.c:1370 msgid "Could not renew identity: %k" msgstr "Kunne ikke fornye identitet: %k" -#: ../src/goaidentity/goakerberosidentity.c:1392 +#: ../src/goaidentity/goakerberosidentity.c:1387 msgid "Could not get new credentials to renew identity %s: %k" msgstr "" "Kunne ikke hente ny påloggingsinformasjon for å fornye identitet %s: %k" -#: ../src/goaidentity/goakerberosidentity.c:1434 +#: ../src/goaidentity/goakerberosidentity.c:1429 msgid "Could not erase identity: %k" msgstr "Kunne ikke slette identitet: %k" @@ -844,6 +845,6 @@ msgid "Could not find identity" msgstr "Fant ikke identitet" -#: ../src/goaidentity/goakerberosidentitymanager.c:843 +#: ../src/goaidentity/goakerberosidentitymanager.c:838 msgid "Could not create credential cache for identity" msgstr "Kunne ikke lage buffer for påloggingsinformasjon for identitet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-online-accounts-3.12.2/src/goabackend/goaewsclient.c new/gnome-online-accounts-3.12.3/src/goabackend/goaewsclient.c --- old/gnome-online-accounts-3.12.2/src/goabackend/goaewsclient.c 2014-05-13 15:48:12.000000000 +0200 +++ new/gnome-online-accounts-3.12.3/src/goabackend/goaewsclient.c 2014-06-05 13:54:43.000000000 +0200 @@ -77,6 +77,7 @@ SoupMessage *msgs[2]; SoupSession *session; gboolean accept_ssl_errors; + guint pending; gulong cancellable_id; xmlOutputBuffer *buf; } AutodiscoverData; @@ -200,10 +201,6 @@ xmlDoc *doc; xmlNode *node; - status = msg->status_code; - if (status == SOUP_STATUS_NONE) - return; - error = NULL; op_res = FALSE; size = sizeof (data->msgs) / sizeof (data->msgs[0]); @@ -213,13 +210,15 @@ if (data->msgs[idx] == msg) break; } - if (idx == size) + if (idx == size || data->pending == 0) return; data->msgs[idx] = NULL; + status = msg->status_code; /* status == SOUP_STATUS_CANCELLED, if we are being aborted by the - * GCancellable or due to an SSL error. + * GCancellable, an SSL error or another message that was + * successful. */ if (status == SOUP_STATUS_CANCELLED) goto out; @@ -294,7 +293,11 @@ if (ews_client_check_node (node, "Protocol")) { op_res = ews_client_autodiscover_parse_protocol (node); - break; + /* Since the server may send back multiple <Protocol> nodes + * don't break unless we found the one we want. + */ + if (op_res) + break; } } if (!op_res) @@ -314,35 +317,33 @@ * message, the callback (ie. this function) will be invoked before * soup_session_cancel_message returns. */ - soup_session_cancel_message (data->session, data->msgs[idx], SOUP_STATUS_NONE); - data->msgs[idx] = NULL; + soup_session_cancel_message (data->session, data->msgs[idx], SOUP_STATUS_CANCELLED); } } out: - /* error == NULL, if we are being aborted by the GCancellable or - * due to an SSL error. + /* error == NULL, if we are being aborted by the GCancellable, an + * SSL error or another message that was successful. */ if (!op_res) { - for (idx = 0; idx < size; idx++) - { - if (data->msgs[idx] != NULL) - { - /* There's another request outstanding. - * Hope that it has better luck. - */ - g_clear_error (&error); - return; - } - } + /* There's another request outstanding. + * Hope that it has better luck. + */ + if (data->pending > 1) + g_clear_error (&error); + if (error != NULL) g_simple_async_result_take_error (data->res, error); } - g_simple_async_result_set_op_res_gboolean (data->res, op_res); - g_simple_async_result_complete_in_idle (data->res); - g_idle_add (ews_client_autodiscover_data_free, data); + data->pending--; + if (data->pending == 0) + { + g_simple_async_result_set_op_res_gboolean (data->res, op_res); + g_simple_async_result_complete_in_idle (data->res); + g_idle_add (ews_client_autodiscover_data_free, data); + } } static xmlDoc * @@ -469,6 +470,7 @@ data->res = g_simple_async_result_new (G_OBJECT (client), callback, user_data, goa_ews_client_autodiscover); data->msgs[0] = ews_client_create_msg_for_url (url1, buf); data->msgs[1] = ews_client_create_msg_for_url (url2, buf); + data->pending = sizeof (data->msgs) / sizeof (data->msgs[0]); data->session = soup_session_async_new_with_options (SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE, SOUP_SESSION_SSL_STRICT, FALSE, SOUP_SESSION_USE_NTLM, TRUE, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-online-accounts-3.12.2/src/goabackend/goaflickrprovider.c new/gnome-online-accounts-3.12.3/src/goabackend/goaflickrprovider.c --- old/gnome-online-accounts-3.12.2/src/goabackend/goaflickrprovider.c 2014-05-13 15:48:12.000000000 +0200 +++ new/gnome-online-accounts-3.12.3/src/goabackend/goaflickrprovider.c 2014-06-05 13:54:44.000000000 +0200 @@ -107,19 +107,19 @@ static const gchar * get_request_uri (GoaOAuthProvider *provider) { - return "http://m.flickr.com/services/oauth/request_token"; + return "https://m.flickr.com/services/oauth/request_token"; } static const gchar * get_authorization_uri (GoaOAuthProvider *provider) { - return "http://m.flickr.com/services/oauth/authorize"; + return "https://m.flickr.com/services/oauth/authorize"; } static const gchar * get_token_uri (GoaOAuthProvider *provider) { - return "http://m.flickr.com/services/oauth/access_token"; + return "https://m.flickr.com/services/oauth/access_token"; } static const gchar * @@ -168,7 +168,7 @@ goa_oauth_provider_get_consumer_secret (provider), access_token, access_token_secret, - "http://api.flickr.com/services/rest", + "https://api.flickr.com/services/rest", FALSE); call = rest_proxy_new_call (proxy); rest_proxy_call_add_param (call, "method", "flickr.test.login"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-online-accounts-3.12.2/telepathy-account-widgets/Makefile.in new/gnome-online-accounts-3.12.3/telepathy-account-widgets/Makefile.in --- old/gnome-online-accounts-3.12.2/telepathy-account-widgets/Makefile.in 2014-05-13 16:22:01.000000000 +0200 +++ new/gnome-online-accounts-3.12.3/telepathy-account-widgets/Makefile.in 2014-06-05 14:01:31.000000000 +0200 @@ -83,7 +83,7 @@ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/config.h.in \ $(srcdir)/telepathy-account-widgets-uninstalled.pc.in COPYING \ - config.guess config.sub depcomp install-sh missing ltmain.sh + config.guess config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org