Hello community,
here is the log from the commit of package gnome-online-miners for
openSUSE:Factory checked in at 2013-08-30 16:28:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-16 12:24:15.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-online-miners.new/gnome-online-miners.changes
2013-08-30 16:28:06.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Aug 22 20:59:00 UTC 2013 - [email protected]
+
+- Update to version 3.9.90:
+ + Support ownCloud (bgo#706158).
+ + Bugs fixed: bgo#706126, bgo#706157.
+
+-------------------------------------------------------------------
Old:
----
gnome-online-miners-3.9.5.tar.xz
New:
----
gnome-online-miners-3.9.90.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-online-miners.spec ++++++
--- /var/tmp/diff_new_pack.FTjdft/_old 2013-08-30 16:28:06.000000000 +0200
+++ /var/tmp/diff_new_pack.FTjdft/_new 2013-08-30 16:28:06.000000000 +0200
@@ -18,7 +18,7 @@
Name: gnome-online-miners
-Version: 3.9.5
+Version: 3.9.90
Release: 0
Summary: Crawls through your online content
License: GPL-2.0+
@@ -38,7 +38,7 @@
%description
GNOME Online Miners provides a set of crawlers that go through
your online content and index them locally in Tracker. It has miners for
-Flickr, Google and SkyDrive.
+Flickr, Google, OwnCloud and SkyDrive.
%prep
%setup -q
@@ -63,6 +63,9 @@
# GData miner (Google docs)
%{_datadir}/dbus-1/services/org.gnome.OnlineMiners.GData.service
%{_libexecdir}/gom-gdata-miner
+# OwnCloud miner
+%{_datadir}/dbus-1/services/org.gnome.OnlineMiners.Owncloud.service
+%{_libexecdir}/gom-owncloud-miner
# Zapojit miner (microsoft skydrive)
%{_datadir}/dbus-1/services/org.gnome.OnlineMiners.Zpj.service
%{_libexecdir}/gom-zpj-miner
++++++ gnome-online-miners-3.9.5.tar.xz -> gnome-online-miners-3.9.90.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-online-miners-3.9.5/NEWS
new/gnome-online-miners-3.9.90/NEWS
--- old/gnome-online-miners-3.9.5/NEWS 2013-07-30 13:54:58.000000000 +0200
+++ new/gnome-online-miners-3.9.90/NEWS 2013-08-21 00:18:48.000000000 +0200
@@ -1,3 +1,13 @@
+Overview of changes in 3.9.90
+=============================
+
+* Support ownCloud (706158)
+
+* Bugs fixed:
+ 706126 miner-main: Fix and simplify reference counting
+ 706157 utils: Replace gom_filename_to_mime_type with g_content_type_guess
+
+
Overview of changes in 3.9.5
============================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-online-miners-3.9.5/configure
new/gnome-online-miners-3.9.90/configure
--- old/gnome-online-miners-3.9.5/configure 2013-07-30 13:56:23.000000000
+0200
+++ new/gnome-online-miners-3.9.90/configure 2013-08-21 00:19:30.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.5.
+# Generated by GNU Autoconf 2.69 for GNOME Online Miners 3.9.90.
#
# 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.5'
-PACKAGE_STRING='GNOME Online Miners 3.9.5'
+PACKAGE_VERSION='3.9.90'
+PACKAGE_STRING='GNOME Online Miners 3.9.90'
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.5 to adapt to many kinds of
systems.
+\`configure' configures GNOME Online Miners 3.9.90 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.5:";;
+ short | recursive ) echo "Configuration of GNOME Online Miners 3.9.90:";;
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.5
+GNOME Online Miners configure 3.9.90
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.5, which was
+It was created by GNOME Online Miners $as_me 3.9.90, 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.5'
+ VERSION='3.9.90'
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.5, which was
+This file was extended by GNOME Online Miners $as_me 3.9.90, 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.5
+GNOME Online Miners config.status 3.9.90
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.5/configure.ac
new/gnome-online-miners-3.9.90/configure.ac
--- old/gnome-online-miners-3.9.5/configure.ac 2013-07-30 13:52:49.000000000
+0200
+++ new/gnome-online-miners-3.9.90/configure.ac 2013-08-21 00:16:57.000000000
+0200
@@ -1,5 +1,5 @@
AC_INIT([GNOME Online Miners],
- [3.9.5],
+ [3.9.90],
[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.5/data/Makefile.am
new/gnome-online-miners-3.9.90/data/Makefile.am
--- old/gnome-online-miners-3.9.5/data/Makefile.am 2013-07-30
13:52:49.000000000 +0200
+++ new/gnome-online-miners-3.9.90/data/Makefile.am 2013-08-21
00:16:18.000000000 +0200
@@ -11,6 +11,11 @@
[ -d $(@D) ] || $(mkdir_p) $(@D) ; \
sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > [email protected] && mv
[email protected] $@
+org.gnome.OnlineMiners.Owncloud.service:
org.gnome.OnlineMiners.Owncloud.service.in Makefile
+ $(AM_V_GEN) \
+ [ -d $(@D) ] || $(mkdir_p) $(@D) ; \
+ sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > [email protected] && mv
[email protected] $@
+
org.gnome.OnlineMiners.Zpj.service: org.gnome.OnlineMiners.Zpj.service.in
Makefile
$(AM_V_GEN) \
[ -d $(@D) ] || $(mkdir_p) $(@D) ; \
@@ -19,6 +24,7 @@
service_in_files = \
org.gnome.OnlineMiners.Flickr.service.in \
org.gnome.OnlineMiners.GData.service.in \
+ org.gnome.OnlineMiners.Owncloud.service.in \
org.gnome.OnlineMiners.Zpj.service.in \
$(NULL)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-online-miners-3.9.5/data/Makefile.in
new/gnome-online-miners-3.9.90/data/Makefile.in
--- old/gnome-online-miners-3.9.5/data/Makefile.in 2013-07-30
13:56:23.000000000 +0200
+++ new/gnome-online-miners-3.9.90/data/Makefile.in 2013-08-21
00:19:31.000000000 +0200
@@ -281,6 +281,7 @@
service_in_files = \
org.gnome.OnlineMiners.Flickr.service.in \
org.gnome.OnlineMiners.GData.service.in \
+ org.gnome.OnlineMiners.Owncloud.service.in \
org.gnome.OnlineMiners.Zpj.service.in \
$(NULL)
@@ -517,6 +518,11 @@
$(AM_V_GEN) \
[ -d $(@D) ] || $(mkdir_p) $(@D) ; \
sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > [email protected] && mv
[email protected] $@
+
+org.gnome.OnlineMiners.Owncloud.service:
org.gnome.OnlineMiners.Owncloud.service.in Makefile
+ $(AM_V_GEN) \
+ [ -d $(@D) ] || $(mkdir_p) $(@D) ; \
+ sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > [email protected] && mv
[email protected] $@
org.gnome.OnlineMiners.Zpj.service: org.gnome.OnlineMiners.Zpj.service.in
Makefile
$(AM_V_GEN) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-online-miners-3.9.5/data/org.gnome.OnlineMiners.Owncloud.service.in
new/gnome-online-miners-3.9.90/data/org.gnome.OnlineMiners.Owncloud.service.in
---
old/gnome-online-miners-3.9.5/data/org.gnome.OnlineMiners.Owncloud.service.in
1970-01-01 01:00:00.000000000 +0100
+++
new/gnome-online-miners-3.9.90/data/org.gnome.OnlineMiners.Owncloud.service.in
2013-08-20 22:49:23.000000000 +0200
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.gnome.OnlineMiners.Owncloud
+Exec=@libexecdir@/gom-owncloud-miner
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-online-miners-3.9.5/src/Makefile.am
new/gnome-online-miners-3.9.90/src/Makefile.am
--- old/gnome-online-miners-3.9.5/src/Makefile.am 2013-07-30
13:52:49.000000000 +0200
+++ new/gnome-online-miners-3.9.90/src/Makefile.am 2013-08-21
00:16:18.000000000 +0200
@@ -33,6 +33,7 @@
libexec_PROGRAMS = \
gom-flickr-miner \
gom-gdata-miner \
+ gom-owncloud-miner \
gom-zpj-miner \
$(NULL)
@@ -85,6 +86,30 @@
$(GIO_LIBS) \
$(GLIB_LIBS) \
$(GOA_LIBS) \
+ $(TRACKER_LIBS) \
+ $(NULL)
+
+gom_owncloud_miner_SOURCES = \
+ gom-owncloud-miner-main.c \
+ gom-owncloud-miner.c \
+ gom-owncloud-miner.h \
+ $(NULL)
+
+gom_owncloud_miner_CPPFLAGS = \
+ -DG_LOG_DOMAIN=\"Gom\" \
+ -DG_DISABLE_DEPRECATED \
+ -I$(top_srcdir)/src \
+ $(GIO_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GOA_CFLAGS) \
+ $(TRACKER_CFLAGS) \
+ $(NULL)
+
+gom_owncloud_miner_LDADD = \
+ libgom-1.0.la \
+ $(GIO_LIBS) \
+ $(GLIB_LIBS) \
+ $(GOA_LIBS) \
$(TRACKER_LIBS) \
$(NULL)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-online-miners-3.9.5/src/Makefile.in
new/gnome-online-miners-3.9.90/src/Makefile.in
--- old/gnome-online-miners-3.9.5/src/Makefile.in 2013-07-30
13:56:23.000000000 +0200
+++ new/gnome-online-miners-3.9.90/src/Makefile.in 2013-08-21
00:19:31.000000000 +0200
@@ -80,7 +80,7 @@
build_triplet = @build@
host_triplet = @host@
libexec_PROGRAMS = gom-flickr-miner$(EXEEXT) gom-gdata-miner$(EXEEXT) \
- gom-zpj-miner$(EXEEXT)
+ gom-owncloud-miner$(EXEEXT) gom-zpj-miner$(EXEEXT)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/config/depcomp
@@ -153,6 +153,13 @@
gom_gdata_miner_DEPENDENCIES = libgom-1.0.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_gom_owncloud_miner_OBJECTS = \
+ gom_owncloud_miner-gom-owncloud-miner-main.$(OBJEXT) \
+ gom_owncloud_miner-gom-owncloud-miner.$(OBJEXT)
+gom_owncloud_miner_OBJECTS = $(am_gom_owncloud_miner_OBJECTS)
+gom_owncloud_miner_DEPENDENCIES = libgom-1.0.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_gom_zpj_miner_OBJECTS = gom_zpj_miner-gom-zpj-miner-main.$(OBJEXT) \
gom_zpj_miner-gom-zpj-miner.$(OBJEXT)
gom_zpj_miner_OBJECTS = $(am_gom_zpj_miner_OBJECTS)
@@ -194,9 +201,11 @@
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(libgom_1_0_la_SOURCES) $(gom_flickr_miner_SOURCES) \
- $(gom_gdata_miner_SOURCES) $(gom_zpj_miner_SOURCES)
+ $(gom_gdata_miner_SOURCES) $(gom_owncloud_miner_SOURCES) \
+ $(gom_zpj_miner_SOURCES)
DIST_SOURCES = $(libgom_1_0_la_SOURCES) $(gom_flickr_miner_SOURCES) \
- $(gom_gdata_miner_SOURCES) $(gom_zpj_miner_SOURCES)
+ $(gom_gdata_miner_SOURCES) $(gom_owncloud_miner_SOURCES) \
+ $(gom_zpj_miner_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -440,6 +449,30 @@
$(TRACKER_LIBS) \
$(NULL)
+gom_owncloud_miner_SOURCES = \
+ gom-owncloud-miner-main.c \
+ gom-owncloud-miner.c \
+ gom-owncloud-miner.h \
+ $(NULL)
+
+gom_owncloud_miner_CPPFLAGS = \
+ -DG_LOG_DOMAIN=\"Gom\" \
+ -DG_DISABLE_DEPRECATED \
+ -I$(top_srcdir)/src \
+ $(GIO_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GOA_CFLAGS) \
+ $(TRACKER_CFLAGS) \
+ $(NULL)
+
+gom_owncloud_miner_LDADD = \
+ libgom-1.0.la \
+ $(GIO_LIBS) \
+ $(GLIB_LIBS) \
+ $(GOA_LIBS) \
+ $(TRACKER_LIBS) \
+ $(NULL)
+
gom_zpj_miner_SOURCES = \
gom-zpj-miner-main.c \
gom-zpj-miner.c \
@@ -600,6 +633,10 @@
@rm -f gom-gdata-miner$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(gom_gdata_miner_OBJECTS) $(gom_gdata_miner_LDADD)
$(LIBS)
+gom-owncloud-miner$(EXEEXT): $(gom_owncloud_miner_OBJECTS)
$(gom_owncloud_miner_DEPENDENCIES) $(EXTRA_gom_owncloud_miner_DEPENDENCIES)
+ @rm -f gom-owncloud-miner$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gom_owncloud_miner_OBJECTS)
$(gom_owncloud_miner_LDADD) $(LIBS)
+
gom-zpj-miner$(EXEEXT): $(gom_zpj_miner_OBJECTS) $(gom_zpj_miner_DEPENDENCIES)
$(EXTRA_gom_zpj_miner_DEPENDENCIES)
@rm -f gom-zpj-miner$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(gom_zpj_miner_OBJECTS) $(gom_zpj_miner_LDADD)
$(LIBS)
@@ -614,6 +651,8 @@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gom_flickr_miner-gom-flickr-miner.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gom_gdata_miner-gom-gdata-miner-main.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gom_gdata_miner-gom-gdata-miner.Po@am__quote@
+@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gom_owncloud_miner-gom-owncloud-miner-main.Po@am__quote@
+@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gom_owncloud_miner-gom-owncloud-miner.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gom_zpj_miner-gom-zpj-miner-main.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gom_zpj_miner-gom-zpj-miner.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libgom_1_0_la-gom-miner.Plo@am__quote@
@@ -718,6 +757,34 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(gom_gdata_miner_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c
-o gom_gdata_miner-gom-gdata-miner.obj `if test -f 'gom-gdata-miner.c'; then
$(CYGPATH_W) 'gom-gdata-miner.c'; else $(CYGPATH_W)
'$(srcdir)/gom-gdata-miner.c'; fi`
+gom_owncloud_miner-gom-owncloud-miner-main.o: gom-owncloud-miner-main.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(gom_owncloud_miner_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
gom_owncloud_miner-gom-owncloud-miner-main.o -MD -MP -MF
$(DEPDIR)/gom_owncloud_miner-gom-owncloud-miner-main.Tpo -c -o
gom_owncloud_miner-gom-owncloud-miner-main.o `test -f
'gom-owncloud-miner-main.c' || echo '$(srcdir)/'`gom-owncloud-miner-main.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gom_owncloud_miner-gom-owncloud-miner-main.Tpo
$(DEPDIR)/gom_owncloud_miner-gom-owncloud-miner-main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@
$(AM_V_CC)source='gom-owncloud-miner-main.c'
object='gom_owncloud_miner-gom-owncloud-miner-main.o' libtool=no
@AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(gom_owncloud_miner_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-c -o gom_owncloud_miner-gom-owncloud-miner-main.o `test -f
'gom-owncloud-miner-main.c' || echo '$(srcdir)/'`gom-owncloud-miner-main.c
+
+gom_owncloud_miner-gom-owncloud-miner-main.obj: gom-owncloud-miner-main.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(gom_owncloud_miner_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
gom_owncloud_miner-gom-owncloud-miner-main.obj -MD -MP -MF
$(DEPDIR)/gom_owncloud_miner-gom-owncloud-miner-main.Tpo -c -o
gom_owncloud_miner-gom-owncloud-miner-main.obj `if test -f
'gom-owncloud-miner-main.c'; then $(CYGPATH_W) 'gom-owncloud-miner-main.c';
else $(CYGPATH_W) '$(srcdir)/gom-owncloud-miner-main.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gom_owncloud_miner-gom-owncloud-miner-main.Tpo
$(DEPDIR)/gom_owncloud_miner-gom-owncloud-miner-main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@
$(AM_V_CC)source='gom-owncloud-miner-main.c'
object='gom_owncloud_miner-gom-owncloud-miner-main.obj' libtool=no
@AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(gom_owncloud_miner_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-c -o gom_owncloud_miner-gom-owncloud-miner-main.obj `if test -f
'gom-owncloud-miner-main.c'; then $(CYGPATH_W) 'gom-owncloud-miner-main.c';
else $(CYGPATH_W) '$(srcdir)/gom-owncloud-miner-main.c'; fi`
+
+gom_owncloud_miner-gom-owncloud-miner.o: gom-owncloud-miner.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(gom_owncloud_miner_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
gom_owncloud_miner-gom-owncloud-miner.o -MD -MP -MF
$(DEPDIR)/gom_owncloud_miner-gom-owncloud-miner.Tpo -c -o
gom_owncloud_miner-gom-owncloud-miner.o `test -f 'gom-owncloud-miner.c' || echo
'$(srcdir)/'`gom-owncloud-miner.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gom_owncloud_miner-gom-owncloud-miner.Tpo
$(DEPDIR)/gom_owncloud_miner-gom-owncloud-miner.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gom-owncloud-miner.c'
object='gom_owncloud_miner-gom-owncloud-miner.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(gom_owncloud_miner_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-c -o gom_owncloud_miner-gom-owncloud-miner.o `test -f 'gom-owncloud-miner.c'
|| echo '$(srcdir)/'`gom-owncloud-miner.c
+
+gom_owncloud_miner-gom-owncloud-miner.obj: gom-owncloud-miner.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(gom_owncloud_miner_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
gom_owncloud_miner-gom-owncloud-miner.obj -MD -MP -MF
$(DEPDIR)/gom_owncloud_miner-gom-owncloud-miner.Tpo -c -o
gom_owncloud_miner-gom-owncloud-miner.obj `if test -f 'gom-owncloud-miner.c';
then $(CYGPATH_W) 'gom-owncloud-miner.c'; else $(CYGPATH_W)
'$(srcdir)/gom-owncloud-miner.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gom_owncloud_miner-gom-owncloud-miner.Tpo
$(DEPDIR)/gom_owncloud_miner-gom-owncloud-miner.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gom-owncloud-miner.c'
object='gom_owncloud_miner-gom-owncloud-miner.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(gom_owncloud_miner_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-c -o gom_owncloud_miner-gom-owncloud-miner.obj `if test -f
'gom-owncloud-miner.c'; then $(CYGPATH_W) 'gom-owncloud-miner.c'; else
$(CYGPATH_W) '$(srcdir)/gom-owncloud-miner.c'; fi`
+
gom_zpj_miner-gom-zpj-miner-main.o: gom-zpj-miner-main.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(gom_zpj_miner_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
gom_zpj_miner-gom-zpj-miner-main.o -MD -MP -MF
$(DEPDIR)/gom_zpj_miner-gom-zpj-miner-main.Tpo -c -o
gom_zpj_miner-gom-zpj-miner-main.o `test -f 'gom-zpj-miner-main.c' || echo
'$(srcdir)/'`gom-zpj-miner-main.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gom_zpj_miner-gom-zpj-miner-main.Tpo
$(DEPDIR)/gom_zpj_miner-gom-zpj-miner-main.Po
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-online-miners-3.9.5/src/gom-gdata-miner.h
new/gnome-online-miners-3.9.90/src/gom-gdata-miner.h
--- old/gnome-online-miners-3.9.5/src/gom-gdata-miner.h 2013-06-20
18:47:03.000000000 +0200
+++ new/gnome-online-miners-3.9.90/src/gom-gdata-miner.h 2013-08-20
22:49:23.000000000 +0200
@@ -53,12 +53,9 @@
typedef struct _GomGDataMiner GomGDataMiner;
typedef struct _GomGDataMinerClass GomGDataMinerClass;
-typedef struct _GomGDataMinerPrivate GomGDataMinerPrivate;
struct _GomGDataMiner {
GomMiner parent;
-
- GomGDataMinerPrivate *priv;
};
struct _GomGDataMinerClass {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-online-miners-3.9.5/src/gom-miner-main.c
new/gnome-online-miners-3.9.90/src/gom-miner-main.c
--- old/gnome-online-miners-3.9.5/src/gom-miner-main.c 2013-07-26
17:52:59.000000000 +0200
+++ new/gnome-online-miners-3.9.90/src/gom-miner-main.c 2013-08-20
22:49:23.000000000 +0200
@@ -117,6 +117,8 @@
{
g_dbus_method_invocation_return_value (invocation, NULL);
}
+
+ g_object_unref (invocation);
}
static void
@@ -132,9 +134,7 @@
cancellable = g_cancellable_new ();
gom_miner_refresh_db_async (miner, cancellable,
- miner_refresh_db_ready_cb, invocation);
-
- g_object_unref (miner);
+ miner_refresh_db_ready_cb, g_object_ref
(invocation));
}
static void
@@ -148,7 +148,7 @@
gpointer user_data)
{
if (g_strcmp0 (method_name, "RefreshDB") == 0)
- handle_refresh_db (g_object_ref (invocation));
+ handle_refresh_db (invocation);
else
g_assert_not_reached ();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-online-miners-3.9.5/src/gom-owncloud-miner-main.c
new/gnome-online-miners-3.9.90/src/gom-owncloud-miner-main.c
--- old/gnome-online-miners-3.9.5/src/gom-owncloud-miner-main.c 1970-01-01
01:00:00.000000000 +0100
+++ new/gnome-online-miners-3.9.90/src/gom-owncloud-miner-main.c
2013-08-20 22:49:23.000000000 +0200
@@ -0,0 +1,33 @@
+/*
+ * GNOME Online Miners - crawls through your online content
+ * Copyright (c) 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * Author: Debarshi Ray <[email protected]>
+ *
+ */
+
+#include "config.h"
+
+#define INSIDE_MINER
+#define MINER_NAME "OWNCLOUD"
+#define MINER_TYPE GOM_TYPE_OWNCLOUD_MINER
+#define MINER_BUS_NAME "org.gnome.OnlineMiners.Owncloud"
+#define MINER_OBJECT_PATH "/org/gnome/OnlineMiners/Owncloud"
+
+#include "gom-owncloud-miner.h"
+#include "gom-miner-main.c"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-online-miners-3.9.5/src/gom-owncloud-miner.c
new/gnome-online-miners-3.9.90/src/gom-owncloud-miner.c
--- old/gnome-online-miners-3.9.5/src/gom-owncloud-miner.c 1970-01-01
01:00:00.000000000 +0100
+++ new/gnome-online-miners-3.9.90/src/gom-owncloud-miner.c 2013-08-20
22:49:23.000000000 +0200
@@ -0,0 +1,448 @@
+/*
+ * GNOME Online Miners - crawls through your online content
+ * Copyright (c) 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * Author: Debarshi Ray <[email protected]>
+ *
+ */
+
+#include "config.h"
+
+#include <goa/goa.h>
+
+#include "gom-owncloud-miner.h"
+#include "gom-utils.h"
+
+#define MINER_IDENTIFIER
"gd:owncloud:miner:8a409711-8fea-4eda-a417-f140ffc6d8f3"
+
+G_DEFINE_TYPE (GomOwncloudMiner, gom_owncloud_miner, GOM_TYPE_MINER)
+
+struct _GomOwncloudMinerPrivate {
+ GVolumeMonitor *monitor;
+};
+
+#define FILE_ATTRIBUTES \
+ G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "," \
+ G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME "," \
+ G_FILE_ATTRIBUTE_STANDARD_NAME "," \
+ G_FILE_ATTRIBUTE_STANDARD_TYPE "," \
+ G_FILE_ATTRIBUTE_TIME_MODIFIED
+
+/* GVfs marks regular files on remote shares as UNKNOWN */
+#define FILE_TYPE_NETWORK G_FILE_TYPE_UNKNOWN
+
+typedef struct {
+ GError **error;
+ GMainLoop *loop;
+ GomAccountMinerJob *job;
+} SyncData;
+
+static gboolean
+account_miner_job_process_file (GomAccountMinerJob *job,
+ GFile *file,
+ GFileInfo *info,
+ GFile *parent,
+ GError **error)
+{
+ GChecksum *checksum = NULL;
+ GDateTime *modification_time;
+ GFileType type;
+ GTimeVal tv;
+ gboolean mtime_changed;
+ gboolean resource_exists;
+ const gchar *class;
+ const gchar *display_name;
+ const gchar *id;
+ const gchar *name;
+ gchar *identifier = NULL;
+ gchar *resource = NULL;
+ gchar *uri = NULL;
+ gint64 new_mtime;
+
+ type = g_file_info_get_file_type (info);
+ uri = g_file_get_uri (file);
+
+ checksum = g_checksum_new (G_CHECKSUM_MD5);
+ g_checksum_update (checksum, uri, -1);
+ id = g_checksum_get_string (checksum);
+ identifier = g_strdup_printf ("%sowncloud:%s", (type ==
G_FILE_TYPE_DIRECTORY ? "gd:collection:" : ""), id);
+ g_checksum_reset (checksum);
+
+ /* remove from the list of the previous resources */
+ g_hash_table_remove (job->previous_resources, identifier);
+
+ name = g_file_info_get_name (info);
+ if (type == FILE_TYPE_NETWORK)
+ class = gom_filename_to_rdf_type (name);
+ else
+ class = "nfo:DataContainer";
+
+ if (class == NULL)
+ goto out;
+
+ resource = gom_tracker_sparql_connection_ensure_resource
+ (job->connection,
+ job->cancellable, error,
+ &resource_exists,
+ job->datasource_urn, identifier,
+ "nfo:RemoteDataObject", class, NULL);
+
+ if (*error != NULL)
+ goto out;
+
+ gom_tracker_update_datasource (job->connection, job->datasource_urn,
+ resource_exists, identifier, resource,
+ job->cancellable, error);
+
+ if (*error != NULL)
+ goto out;
+
+ g_file_info_get_modification_time (info, &tv);
+ modification_time = g_date_time_new_from_timeval_local (&tv);
+ new_mtime = g_date_time_to_unix (modification_time);
+ mtime_changed = gom_tracker_update_mtime (job->connection, new_mtime,
+ resource_exists, identifier,
resource,
+ job->cancellable, error);
+
+ if (*error != NULL)
+ goto out;
+
+ /* avoid updating the DB if the entry already exists and has not
+ * been modified since our last run.
+ */
+ if (!mtime_changed)
+ goto out;
+
+ /* the resource changed - just set all the properties again */
+ gom_tracker_sparql_connection_insert_or_replace_triple
+ (job->connection,
+ job->cancellable, error,
+ job->datasource_urn, resource,
+ "nie:url", uri);
+
+ if (*error != NULL)
+ goto out;
+
+ if (type == FILE_TYPE_NETWORK)
+ {
+ const gchar *mime;
+ const gchar *parent_id;
+ gchar *parent_identifier;
+ gchar *parent_resource_urn;
+ gchar *parent_uri;
+
+ if (parent != NULL)
+ {
+ parent_uri = g_file_get_uri (parent);
+ g_checksum_update (checksum, parent_uri, -1);
+ parent_id = g_checksum_get_string (checksum);
+ parent_identifier = g_strconcat ("gd:collection:owncloud:",
parent_id, NULL);
+ parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+ (job->connection, job->cancellable, error,
+ NULL,
+ job->datasource_urn, parent_identifier,
+ "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+ g_checksum_reset (checksum);
+ g_free (parent_identifier);
+ g_free (parent_uri);
+
+ if (*error != NULL)
+ goto out;
+
+ gom_tracker_sparql_connection_insert_or_replace_triple
+ (job->connection,
+ job->cancellable, error,
+ job->datasource_urn, resource,
+ "nie:isPartOf", parent_resource_urn);
+ g_free (parent_resource_urn);
+
+ if (*error != NULL)
+ goto out;
+ }
+
+ mime = g_file_info_get_content_type (info);
+ if (mime != NULL)
+ {
+ gom_tracker_sparql_connection_insert_or_replace_triple
+ (job->connection,
+ job->cancellable, error,
+ job->datasource_urn, resource,
+ "nie:mimeType", mime);
+
+ if (*error != NULL)
+ goto out;
+ }
+ }
+
+ display_name = g_file_info_get_display_name (info);
+ gom_tracker_sparql_connection_insert_or_replace_triple
+ (job->connection,
+ job->cancellable, error,
+ job->datasource_urn, resource,
+ "nfo:fileName", display_name);
+
+ if (*error != NULL)
+ goto out;
+
+ out:
+ if (checksum != NULL)
+ g_checksum_free (checksum);
+ g_free (identifier);
+ g_free (resource);
+ g_free (uri);
+
+ if (*error != NULL)
+ return FALSE;
+
+ return TRUE;
+}
+
+static void
+account_miner_job_traverse_dir (GomAccountMinerJob *job,
+ GFile *dir,
+ gboolean is_root,
+ GError **error)
+{
+ GError *local_error = NULL;
+ GFileEnumerator *enumerator;
+ GFileInfo *info;
+ gchar *dir_uri;
+
+ dir_uri = g_file_get_uri (dir);
+ enumerator = g_file_enumerate_children (dir,
+ FILE_ATTRIBUTES,
+ G_FILE_QUERY_INFO_NONE,
+ job->cancellable,
+ &local_error);
+ if (local_error != NULL)
+ goto out;
+
+ while ((info = g_file_enumerator_next_file (enumerator, job->cancellable,
&local_error)) != NULL)
+ {
+ GFile *child;
+ GFileType type;
+ const gchar *name;
+ gchar *uri;
+
+ type = g_file_info_get_file_type (info);
+ name = g_file_info_get_name (info);
+ child = g_file_get_child (dir, name);
+
+ if (type == FILE_TYPE_NETWORK || type == G_FILE_TYPE_DIRECTORY)
+ {
+ account_miner_job_process_file (job, child, info, is_root ? NULL :
dir, &local_error);
+ if (local_error != NULL)
+ {
+ uri = g_file_get_uri (child);
+ g_warning ("Unable to process %s: %s", uri,
local_error->message);
+ g_free (uri);
+ g_clear_error (&local_error);
+ }
+ }
+
+ if (type == G_FILE_TYPE_DIRECTORY)
+ {
+ account_miner_job_traverse_dir (job, child, FALSE, &local_error);
+ if (local_error != NULL)
+ {
+ uri = g_file_get_uri (child);
+ g_warning ("Unable to traverse %s: %s", uri,
local_error->message);
+ g_free (uri);
+ g_clear_error (&local_error);
+ }
+ }
+
+ g_object_unref (child);
+ g_object_unref (info);
+ }
+
+ if (local_error != NULL)
+ goto out;
+
+ out:
+ if (local_error != NULL)
+ g_propagate_error (error, local_error);
+
+ g_clear_object (&enumerator);
+ g_free (dir_uri);
+}
+
+static gboolean
+is_matching_volume (GVolume *volume, GoaObject *object)
+{
+ GoaAccount *account;
+ GoaFiles *files;
+ gboolean retval = FALSE;
+ const gchar *presentation_identity;
+ const gchar *uri;
+ gchar *name;
+ gchar *uuid;
+
+ account = goa_object_peek_account (object);
+ presentation_identity = goa_account_get_presentation_identity (account);
+
+ files = goa_object_peek_files (object);
+ uri = goa_files_get_uri (files);
+
+ name = g_volume_get_name (volume);
+ uuid = g_volume_get_uuid (volume);
+
+ if (g_strcmp0 (name, presentation_identity) == 0 && g_strcmp0 (uuid, uri) ==
0)
+ retval = TRUE;
+
+ g_free (name);
+ g_free (uuid);
+ return retval;
+}
+
+static void
+volume_added_cb (GVolumeMonitor *monitor, GVolume *volume, gpointer user_data)
+{
+ SyncData *data = (SyncData *) user_data;
+
+ if (!is_matching_volume (volume, GOA_OBJECT (data->job->service)))
+ return;
+
+ g_object_set_data_full (data->job->service, "volume", g_object_ref (volume),
g_object_unref);
+ g_main_loop_quit (data->loop);
+}
+
+static void
+volume_mount_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
+{
+ GVolume *volume = G_VOLUME (source_object);
+ SyncData *data = (SyncData *) user_data;
+
+ g_volume_mount_finish (volume, res, data->error);
+ g_main_loop_quit (data->loop);
+}
+
+static void
+query_owncloud (GomAccountMinerJob *job,
+ GError **error)
+{
+ GomOwncloudMiner *self = GOM_OWNCLOUD_MINER (job->miner);
+ GomOwncloudMinerPrivate *priv = self->priv;
+ GFile *root;
+ GList *l;
+ GList *volumes;
+ GMainContext *context;
+ GMount *mount;
+ GVolume *volume;
+ SyncData data;
+ gboolean found = FALSE;
+
+ data.job = job;
+ volumes = g_volume_monitor_get_volumes (priv->monitor);
+
+ /* find the volume corresponding to this GoaObject */
+ for (l = volumes; l != NULL && !found; l = l->next)
+ {
+ GVolume *volume = G_VOLUME (l->data);
+
+ if (is_matching_volume (volume, GOA_OBJECT (job->service)))
+ {
+ g_object_set_data_full (job->service, "volume", g_object_ref
(volume), g_object_unref);
+ found = TRUE;
+ }
+ }
+
+ /* wait for GVfs to add the volume, if it hasn't already */
+ if (!found)
+ {
+ 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_main_loop_run (data.loop);
+ g_main_loop_unref (data.loop);
+ }
+
+ /* mount the volume if needed */
+ volume = G_VOLUME (g_object_get_data (job->service, "volume"));
+ mount = g_volume_get_mount (volume);
+ if (mount == NULL)
+ {
+ data.error = error;
+
+ context = g_main_context_new ();
+ g_main_context_push_thread_default (context);
+ data.loop = g_main_loop_new (context, FALSE);
+
+ g_volume_mount (volume, G_MOUNT_MOUNT_NONE, NULL, job->cancellable,
volume_mount_cb, &data);
+ g_main_loop_run (data.loop);
+
+ g_main_loop_unref (data.loop);
+ g_main_context_pop_thread_default (context);
+ g_main_context_unref (context);
+
+ if (*error != NULL)
+ return;
+
+ mount = g_volume_get_mount (volume);
+ }
+
+ root = g_mount_get_root (mount);
+ account_miner_job_traverse_dir (job, root, TRUE, error);
+
+ g_object_unref (root);
+ g_object_unref (mount);
+ g_list_free_full (volumes, g_object_unref);
+}
+
+static GObject *
+create_service (GomMiner *self,
+ GoaObject *object)
+{
+ return g_object_ref (object);
+}
+
+static void
+gom_owncloud_miner_dispose (GObject *object)
+{
+ GomOwncloudMiner *self = GOM_OWNCLOUD_MINER (object);
+
+ g_clear_object (&self->priv->monitor);
+
+ G_OBJECT_CLASS (gom_owncloud_miner_parent_class)->dispose (object);
+}
+
+static void
+gom_owncloud_miner_init (GomOwncloudMiner *self)
+{
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GOM_TYPE_OWNCLOUD_MINER,
GomOwncloudMinerPrivate);
+ self->priv->monitor = g_volume_monitor_get ();
+}
+
+static void
+gom_owncloud_miner_class_init (GomOwncloudMinerClass *klass)
+{
+ GObjectClass *oclass = G_OBJECT_CLASS (klass);
+ GomMinerClass *miner_class = GOM_MINER_CLASS (klass);
+
+ oclass->dispose = gom_owncloud_miner_dispose;
+
+ miner_class->goa_provider_type = "owncloud";
+ miner_class->miner_identifier = MINER_IDENTIFIER;
+ miner_class->version = 1;
+
+ miner_class->create_service = create_service;
+ miner_class->query = query_owncloud;
+
+ g_type_class_add_private (klass, sizeof (GomOwncloudMinerPrivate));
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-online-miners-3.9.5/src/gom-owncloud-miner.h
new/gnome-online-miners-3.9.90/src/gom-owncloud-miner.h
--- old/gnome-online-miners-3.9.5/src/gom-owncloud-miner.h 1970-01-01
01:00:00.000000000 +0100
+++ new/gnome-online-miners-3.9.90/src/gom-owncloud-miner.h 2013-08-20
22:49:23.000000000 +0200
@@ -0,0 +1,72 @@
+/*
+ * GNOME Online Miners - crawls through your online content
+ * Copyright (c) 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * Author: Debarshi Ray <[email protected]>
+ *
+ */
+
+#ifndef __GOM_OWNCLOUD_MINER_H__
+#define __GOM_OWNCLOUD_MINER_H__
+
+#include <gio/gio.h>
+#include "gom-miner.h"
+
+G_BEGIN_DECLS
+
+#define GOM_TYPE_OWNCLOUD_MINER gom_owncloud_miner_get_type()
+
+#define GOM_OWNCLOUD_MINER(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ GOM_TYPE_OWNCLOUD_MINER, GomOwncloudMiner))
+
+#define GOM_OWNCLOUD_MINER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), \
+ GOM_TYPE_OWNCLOUD_MINER, GomOwncloudMinerClass))
+
+#define GOM_IS_OWNCLOUD_MINER(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+ GOM_TYPE_OWNCLOUD_MINER))
+
+#define GOM_IS_OWNCLOUD_MINER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+ GOM_TYPE_OWNCLOUD_MINER))
+
+#define GOM_OWNCLOUD_MINER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+ GOM_TYPE_OWNCLOUD_MINER, GomOwncloudMinerClass))
+
+typedef struct _GomOwncloudMiner GomOwncloudMiner;
+typedef struct _GomOwncloudMinerClass GomOwncloudMinerClass;
+typedef struct _GomOwncloudMinerPrivate GomOwncloudMinerPrivate;
+
+struct _GomOwncloudMiner {
+ GomMiner parent;
+
+ GomOwncloudMinerPrivate *priv;
+};
+
+struct _GomOwncloudMinerClass {
+ GomMinerClass parent_class;
+};
+
+GType gom_owncloud_miner_get_type(void);
+
+G_END_DECLS
+
+#endif /* __GOM_OWNCLOUD_MINER_H__ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-online-miners-3.9.5/src/gom-utils.c
new/gnome-online-miners-3.9.90/src/gom-utils.c
--- old/gnome-online-miners-3.9.5/src/gom-utils.c 2013-07-01
15:55:36.000000000 +0200
+++ new/gnome-online-miners-3.9.90/src/gom-utils.c 2013-08-20
22:49:23.000000000 +0200
@@ -51,22 +51,6 @@
return end;
}
-const char *
-gom_filename_to_mime_type (const gchar *filename_with_extension)
-{
- const gchar *extension;
- const gchar *type = NULL;
-
- g_return_val_if_fail (filename_with_extension != NULL, NULL);
-
- extension = gom_filename_get_extension_offset (filename_with_extension);
-
- if (g_strcmp0 (extension, ".pdf") == 0)
- type = "application/pdf";
-
- return type;
-}
-
const gchar *
gom_filename_to_rdf_type (const gchar *filename_with_extension)
{
@@ -86,10 +70,12 @@
|| g_strcmp0 (extension, ".dot") == 0
|| g_strcmp0 (extension, ".dotx") == 0
|| g_strcmp0 (extension, ".epub") == 0
+ || g_strcmp0 (extension, ".odt") == 0
|| g_strcmp0 (extension, ".pdf") == 0)
type = "nfo:PaginatedTextDocument";
- else if (g_strcmp0 (extension, ".pot") == 0
+ else if (g_strcmp0 (extension, ".odp") == 0
+ || g_strcmp0 (extension, ".pot") == 0
|| g_strcmp0 (extension, ".potm") == 0
|| g_strcmp0 (extension, ".potx") == 0
|| g_strcmp0 (extension, ".pps") == 0
@@ -103,7 +89,8 @@
else if (g_strcmp0 (extension, ".txt") == 0)
type = "nfo:PlainTextDocument";
- else if (g_strcmp0 (extension, ".xls") == 0
+ else if (g_strcmp0 (extension, ".ods") == 0
+ || g_strcmp0 (extension, ".xls") == 0
|| g_strcmp0 (extension, ".xlsb") == 0
|| g_strcmp0 (extension, ".xlsm") == 0
|| g_strcmp0 (extension, ".xlsx") == 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-online-miners-3.9.5/src/gom-utils.h
new/gnome-online-miners-3.9.90/src/gom-utils.h
--- old/gnome-online-miners-3.9.5/src/gom-utils.h 2013-06-20
15:43:24.000000000 +0200
+++ new/gnome-online-miners-3.9.90/src/gom-utils.h 2013-08-20
22:49:23.000000000 +0200
@@ -28,8 +28,6 @@
G_BEGIN_DECLS
-const gchar *gom_filename_to_mime_type (const gchar *filename_with_extension);
-
const gchar *gom_filename_to_rdf_type (const gchar *filename_with_extension);
gchar *gom_iso8601_from_timestamp (gint64 timestamp);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-online-miners-3.9.5/src/gom-zpj-miner.c
new/gnome-online-miners-3.9.90/src/gom-zpj-miner.c
--- old/gnome-online-miners-3.9.5/src/gom-zpj-miner.c 2013-07-19
14:21:04.000000000 +0200
+++ new/gnome-online-miners-3.9.90/src/gom-zpj-miner.c 2013-08-20
22:49:23.000000000 +0200
@@ -107,7 +107,8 @@
if (ZPJ_IS_SKYDRIVE_FILE (entry))
{
gchar *parent_resource_urn, *parent_identifier;
- const gchar *parent_id, *mime;
+ gchar *mime;
+ const gchar *parent_id;
parent_id = zpj_skydrive_entry_get_parent_id (entry);
parent_identifier = g_strconcat ("gd:collection:windows-live:skydrive:",
parent_id, NULL);
@@ -131,7 +132,7 @@
if (*error != NULL)
goto out;
- mime = gom_filename_to_mime_type (name);
+ mime = g_content_type_guess (name, NULL, 0, NULL);
if (mime != NULL)
{
gom_tracker_sparql_connection_insert_or_replace_triple
@@ -139,6 +140,7 @@
job->cancellable, error,
job->datasource_urn, resource,
"nie:mimeType", mime);
+ g_free (mime);
if (*error != NULL)
goto out;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-online-miners-3.9.5/src/gom-zpj-miner.h
new/gnome-online-miners-3.9.90/src/gom-zpj-miner.h
--- old/gnome-online-miners-3.9.5/src/gom-zpj-miner.h 2013-06-20
18:54:39.000000000 +0200
+++ new/gnome-online-miners-3.9.90/src/gom-zpj-miner.h 2013-08-20
22:49:23.000000000 +0200
@@ -53,12 +53,9 @@
typedef struct _GomZpjMiner GomZpjMiner;
typedef struct _GomZpjMinerClass GomZpjMinerClass;
-typedef struct _GomZpjMinerPrivate GomZpjMinerPrivate;
struct _GomZpjMiner {
GomMiner parent;
-
- GomZpjMinerPrivate *priv;
};
struct _GomZpjMinerClass {
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
