Hello community, here is the log from the commit of package gnome-online-miners for openSUSE:Factory checked in at 2013-09-23 09:09:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-online-miners (Old) and /work/SRC/openSUSE:Factory/.gnome-online-miners.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-online-miners" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-online-miners/gnome-online-miners.changes 2013-08-30 16:28:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-online-miners.new/gnome-online-miners.changes 2013-09-23 09:09:30.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 17 18:19:33 UTC 2013 - dims...@opensuse.org + +- Update to version 3.9.92: + + gdata (google docs): Empty collections (bgo#694003). + +------------------------------------------------------------------- Old: ---- gnome-online-miners-3.9.90.tar.xz New: ---- gnome-online-miners-3.9.92.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-online-miners.spec ++++++ --- /var/tmp/diff_new_pack.FirKgQ/_old 2013-09-23 09:09:32.000000000 +0200 +++ /var/tmp/diff_new_pack.FirKgQ/_new 2013-09-23 09:09:32.000000000 +0200 @@ -18,7 +18,7 @@ Name: gnome-online-miners -Version: 3.9.90 +Version: 3.9.92 Release: 0 Summary: Crawls through your online content License: GPL-2.0+ ++++++ gnome-online-miners-3.9.90.tar.xz -> gnome-online-miners-3.9.92.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-online-miners-3.9.90/NEWS new/gnome-online-miners-3.9.92/NEWS --- old/gnome-online-miners-3.9.90/NEWS 2013-08-21 00:18:48.000000000 +0200 +++ new/gnome-online-miners-3.9.92/NEWS 2013-09-17 12:14:58.000000000 +0200 @@ -1,3 +1,18 @@ +Overview of changes in 3.9.92 +============================= + +* Bugs fixed: + 694003 gdata: Empty collections + + +Overview of changes in 3.9.91 +============================= + +* Bugs fixed: + 707142 owncloud: Fix typo + 707143 flickr: Wait for the GOA source to be added + + Overview of changes in 3.9.90 ============================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-online-miners-3.9.90/configure new/gnome-online-miners-3.9.92/configure --- old/gnome-online-miners-3.9.90/configure 2013-08-21 00:19:30.000000000 +0200 +++ new/gnome-online-miners-3.9.92/configure 2013-09-17 12:19:52.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 Miners 3.9.90. +# Generated by GNU Autoconf 2.69 for GNOME Online Miners 3.9.92. # # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-online-miners>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='GNOME Online Miners' PACKAGE_TARNAME='gnome-online-miners' -PACKAGE_VERSION='3.9.90' -PACKAGE_STRING='GNOME Online Miners 3.9.90' +PACKAGE_VERSION='3.9.92' +PACKAGE_STRING='GNOME Online Miners 3.9.92' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-online-miners' PACKAGE_URL='' @@ -1355,7 +1355,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 Miners 3.9.90 to adapt to many kinds of systems. +\`configure' configures GNOME Online Miners 3.9.92 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1426,7 +1426,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNOME Online Miners 3.9.90:";; + short | recursive ) echo "Configuration of GNOME Online Miners 3.9.92:";; esac cat <<\_ACEOF @@ -1563,7 +1563,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNOME Online Miners configure 3.9.90 +GNOME Online Miners configure 3.9.92 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1841,7 +1841,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 Miners $as_me 3.9.90, which was +It was created by GNOME Online Miners $as_me 3.9.92, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2712,7 +2712,7 @@ # Define the identity of the package. PACKAGE='gnome-online-miners' - VERSION='3.9.90' + VERSION='3.9.92' cat >>confdefs.h <<_ACEOF @@ -13048,7 +13048,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 Miners $as_me 3.9.90, which was +This file was extended by GNOME Online Miners $as_me 3.9.92, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13114,7 +13114,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 Miners config.status 3.9.90 +GNOME Online Miners config.status 3.9.92 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-miners-3.9.90/configure.ac new/gnome-online-miners-3.9.92/configure.ac --- old/gnome-online-miners-3.9.90/configure.ac 2013-08-21 00:16:57.000000000 +0200 +++ new/gnome-online-miners-3.9.92/configure.ac 2013-09-17 12:13:17.000000000 +0200 @@ -1,5 +1,5 @@ AC_INIT([GNOME Online Miners], - [3.9.90], + [3.9.92], [https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-online-miners], [gnome-online-miners], []) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-online-miners-3.9.90/src/gom-flickr-miner.c new/gnome-online-miners-3.9.92/src/gom-flickr-miner.c --- old/gnome-online-miners-3.9.90/src/gom-flickr-miner.c 2013-07-26 17:52:59.000000000 +0200 +++ new/gnome-online-miners-3.9.92/src/gom-flickr-miner.c 2013-09-06 18:37:38.000000000 +0200 @@ -50,6 +50,8 @@ FlickrEntry *parent_entry; GMainLoop *loop; GomAccountMinerJob *job; + GrlSource *source; + const gchar *source_id; } SyncData; static void account_miner_job_browse_container (GomAccountMinerJob *job, FlickrEntry *entry); @@ -437,6 +439,23 @@ } } +static void +source_added_cb (GrlRegistry *registry, GrlSource *source, gpointer user_data) +{ + SyncData *data = (SyncData *) user_data; + gchar *source_id; + + g_object_get (source, "source-id", &source_id, NULL); + if (g_strcmp0 (source_id, data->source_id) != 0) + goto out; + + data->source = g_object_ref (source); + g_main_loop_quit (data->loop); + + out: + g_free (source_id); +} + static GObject * create_service (GomMiner *self, GoaObject *object) @@ -456,12 +475,29 @@ g_debug ("Looking for source %s", source_id); source = grl_registry_lookup_source (registry, source_id); - g_free (source_id); if (source == NULL) - return NULL; + { + GMainContext *context; + SyncData data; + + context = g_main_context_get_thread_default (); + data.loop = g_main_loop_new (context, FALSE); + data.source_id = source_id; + + g_signal_connect (registry, "source-added", G_CALLBACK (source_added_cb), &data); + g_main_loop_run (data.loop); + g_main_loop_unref (data.loop); + + /* we steal the ref from data */ + source = data.source; + } + else + { + /* freeing job calls unref upon this object */ + g_object_ref (source); + } - /* freeing job calls unref upon this object */ - g_object_ref (source); + g_free (source_id); return G_OBJECT (source); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-online-miners-3.9.90/src/gom-gdata-miner.c new/gnome-online-miners-3.9.92/src/gom-gdata-miner.c --- old/gnome-online-miners-3.9.90/src/gom-gdata-miner.c 2013-07-19 14:21:04.000000000 +0200 +++ new/gnome-online-miners-3.9.92/src/gom-gdata-miner.c 2013-09-10 12:05:53.000000000 +0200 @@ -1,6 +1,6 @@ /* * GNOME Online Miners - crawls through your online content - * Copyright (c) 2011 Red Hat, Inc. + * Copyright (c) 2011, 2012, 2013 Red Hat, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -41,7 +41,7 @@ { GDataEntry *entry = GDATA_ENTRY (doc_entry); gchar *resource = NULL; - gchar *date, *resource_url, *identifier; + gchar *date, *identifier; const gchar *class = NULL; const gchar *mimetype_override = NULL; gboolean mtime_changed, resource_exists; @@ -62,19 +62,13 @@ if (GDATA_IS_DOCUMENTS_FOLDER (doc_entry)) { - identifier = g_strdup_printf ("gd:collection:%s", gdata_entry_get_id (entry)); - resource_url = NULL; - } - else - { - gchar *entry_path; + GDataLink *link; - identifier = g_strdup (gdata_entry_get_id (entry)); - entry_path = gdata_documents_entry_get_path (doc_entry); - resource_url = g_strdup_printf ("google:docs:%s", entry_path); - - g_free (entry_path); + link = gdata_entry_look_up_link (entry, GDATA_LINK_SELF); + identifier = g_strdup_printf ("gd:collection:%s", gdata_link_get_uri (link)); } + else + identifier = g_strdup (gdata_entry_get_id (entry)); /* remove from the list of the previous resources */ g_hash_table_remove (job->previous_resources, identifier); @@ -96,7 +90,7 @@ (job->connection, job->cancellable, error, &resource_exists, - resource_url, identifier, + job->datasource_urn, identifier, "nfo:RemoteDataObject", class, NULL); if (*error != NULL) @@ -130,7 +124,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (job->connection, job->cancellable, error, - identifier, resource, + job->datasource_urn, resource, "nie:url", alternate_uri); if (*error != NULL) @@ -145,7 +139,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (job->connection, job->cancellable, error, - identifier, resource, + job->datasource_urn, resource, "nie:mimeType", mimetype_override); if (*error != NULL) @@ -162,7 +156,8 @@ parent_resource_urn = gom_tracker_sparql_connection_ensure_resource (job->connection, job->cancellable, error, - NULL, parent_resource_id, + NULL, + job->datasource_urn, parent_resource_id, "nfo:RemoteDataObject", "nfo:DataContainer", NULL); g_free (parent_resource_id); @@ -172,7 +167,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (job->connection, job->cancellable, error, - identifier, resource, + job->datasource_urn, resource, "nie:isPartOf", parent_resource_urn); g_free (parent_resource_urn); @@ -202,7 +197,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (job->connection, job->cancellable, error, - identifier, resource, + job->datasource_urn, resource, "nie:description", gdata_entry_get_summary (entry)); if (*error != NULL) @@ -211,7 +206,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (job->connection, job->cancellable, error, - identifier, resource, + job->datasource_urn, resource, "nie:title", gdata_entry_get_title (entry)); if (*error != NULL) @@ -235,7 +230,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (job->connection, job->cancellable, error, - identifier, resource, + job->datasource_urn, resource, "nco:creator", contact_resource); if (*error != NULL) @@ -277,7 +272,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (job->connection, job->cancellable, error, - identifier, resource, + job->datasource_urn, resource, "nco:contributor", contact_resource); g_free (contact_resource); @@ -290,7 +285,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (job->connection, job->cancellable, error, - identifier, resource, + job->datasource_urn, resource, "nie:contentCreated", date); g_free (date); @@ -299,7 +294,6 @@ out: g_clear_object (&access_rules); - g_free (resource_url); g_free (resource); g_free (identifier); @@ -373,7 +367,7 @@ miner_class->goa_provider_type = "google"; miner_class->miner_identifier = MINER_IDENTIFIER; - miner_class->version = 2; + miner_class->version = 3; miner_class->create_service = create_service; miner_class->query = query_gdata; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-online-miners-3.9.90/src/gom-owncloud-miner.c new/gnome-online-miners-3.9.92/src/gom-owncloud-miner.c --- old/gnome-online-miners-3.9.90/src/gom-owncloud-miner.c 2013-08-20 22:49:23.000000000 +0200 +++ new/gnome-online-miners-3.9.92/src/gom-owncloud-miner.c 2013-08-30 19:24:03.000000000 +0200 @@ -368,7 +368,7 @@ context = g_main_context_get_thread_default (); data.loop = g_main_loop_new (context, FALSE); - g_signal_connect_object (priv->monitor, "volume-added", G_CALLBACK (volume_added_cb), &data, 0); + g_signal_connect (priv->monitor, "volume-added", G_CALLBACK (volume_added_cb), &data); g_main_loop_run (data.loop); g_main_loop_unref (data.loop); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org