Hello community,
here is the log from the commit of package zeitgeist-datahub for
openSUSE:Factory checked in at 2012-03-29 14:09:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zeitgeist-datahub (Old)
and /work/SRC/openSUSE:Factory/.zeitgeist-datahub.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zeitgeist-datahub", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/zeitgeist-datahub/zeitgeist-datahub.changes
2012-02-21 12:27:19.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.zeitgeist-datahub.new/zeitgeist-datahub.changes
2012-03-29 14:10:00.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Mar 21 07:48:29 UTC 2012 - vu...@opensuse.org
+
+- Update to version 0.8.2:
+ + Download monitor:
+ - don't log *.part files
+ - ignore hidden and backup files
+
+-------------------------------------------------------------------
Old:
----
zeitgeist-datahub-0.8.1.tar.gz
New:
----
zeitgeist-datahub-0.8.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zeitgeist-datahub.spec ++++++
--- /var/tmp/diff_new_pack.xt00NX/_old 2012-03-29 14:10:01.000000000 +0200
+++ /var/tmp/diff_new_pack.xt00NX/_new 2012-03-29 14:10:01.000000000 +0200
@@ -18,7 +18,7 @@
Name: zeitgeist-datahub
-Version: 0.8.1
+Version: 0.8.2
Release: 0
Summary: Passive logging daemon for Zeitgeist
License: GPL-3.0+
++++++ zeitgeist-datahub-0.8.1.tar.gz -> zeitgeist-datahub-0.8.2.tar.gz ++++++
++++ 2128 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/zeitgeist-datahub-0.8.1/INSTALL new/zeitgeist-datahub-0.8.2/INSTALL
--- old/zeitgeist-datahub-0.8.1/INSTALL 2012-02-06 16:06:59.000000000 +0100
+++ new/zeitgeist-datahub-0.8.2/INSTALL 2012-03-07 12:13:41.000000000 +0100
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+ HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved. Use GNU `make'
+instead.
+
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/zeitgeist-datahub-0.8.1/NEWS new/zeitgeist-datahub-0.8.2/NEWS
--- old/zeitgeist-datahub-0.8.1/NEWS 2012-02-13 14:46:21.000000000 +0100
+++ new/zeitgeist-datahub-0.8.2/NEWS 2012-03-20 13:40:42.000000000 +0100
@@ -1,6 +1,13 @@
Zeitgeist-datahub 0.8.2
=======================
+* Download monitor: don't log *.part files (Siegfried Gevatter)
+
+* Download monitor: ignore hidden and backup files
+
+Zeitgeist-datahub 0.8.1
+=======================
+
* Avoid triplication of events when logging items from GtkRecentManager
(Siegfried Gevatter)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/zeitgeist-datahub-0.8.1/configure.ac
new/zeitgeist-datahub-0.8.2/configure.ac
--- old/zeitgeist-datahub-0.8.1/configure.ac 2012-02-13 14:48:22.000000000
+0100
+++ new/zeitgeist-datahub-0.8.2/configure.ac 2012-03-20 13:41:08.000000000
+0100
@@ -1,4 +1,4 @@
-AC_INIT([zeitgeist-datahub], [0.8.1])
+AC_INIT([zeitgeist-datahub], [0.8.2])
#AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([.])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/zeitgeist-datahub-0.8.1/missing new/zeitgeist-datahub-0.8.2/missing
--- old/zeitgeist-datahub-0.8.1/missing 2012-02-06 16:06:59.000000000 +0100
+++ new/zeitgeist-datahub-0.8.2/missing 2012-03-07 12:13:40.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@
help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@
# Not GNU programs, they don't have --version.
;;
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
@@ -226,7 +216,7 @@
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@
\`Flex' from any GNU archive site."
rm -f lex.yy.c
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@
touch $file
;;
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and is $msg.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/zeitgeist-datahub-0.8.1/po/Makefile.in.in
new/zeitgeist-datahub-0.8.2/po/Makefile.in.in
--- old/zeitgeist-datahub-0.8.1/po/Makefile.in.in 2012-02-06
16:06:57.000000000 +0100
+++ new/zeitgeist-datahub-0.8.2/po/Makefile.in.in 2012-03-07
12:13:37.000000000 +0100
@@ -49,8 +49,8 @@
XGETTEXT = @XGETTEXT@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT="$(XGETTEXT)"
srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT="$(XGETTEXT)"
srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)"
srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)"
srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
ALL_LINGUAS = @ALL_LINGUAS@
@@ -73,15 +73,20 @@
.SUFFIXES:
.SUFFIXES: .po .pox .gmo .mo .msg .cat
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
+INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
+INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@;
+
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
.po.mo:
- $(MSGFMT) -o $@ $<
+ $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
.po.gmo:
- file=`echo $* | sed 's,.*/,,'`.gmo \
+ $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) -o $$file $<
.po.cat:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/zeitgeist-datahub-0.8.1/src/downloads-directory-provider.c
new/zeitgeist-datahub-0.8.2/src/downloads-directory-provider.c
--- old/zeitgeist-datahub-0.8.1/src/downloads-directory-provider.c
2012-02-13 14:40:10.000000000 +0100
+++ new/zeitgeist-datahub-0.8.2/src/downloads-directory-provider.c
2012-03-09 13:18:49.000000000 +0100
@@ -127,56 +127,68 @@
GFile* other_file;
GFileMonitorEvent event_type;
GFileMonitorEvent _tmp0_;
- GFileInfo* subject_info;
GFile* _tmp1_;
- GFileInfo* _tmp2_;
- GFileInfo* _tmp3_;
- GError* err;
- GFile* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
- GError* _tmp7_;
- const gchar* _tmp8_;
- GFile* _tmp9_;
- gchar* _tmp10_;
+ gchar* _tmp2_;
gchar* uri;
+ gboolean _tmp3_;
+ const gchar* _tmp4_;
+ gboolean _tmp5_;
+ const gchar* _tmp6_;
+ gboolean _tmp7_;
+ gboolean _tmp8_;
+ GFileInfo* subject_info;
+ GFile* _tmp9_;
+ GFileInfo* _tmp10_;
GFileInfo* _tmp11_;
- const gchar* _tmp12_;
- gchar* _tmp13_;
- gchar* mimetype;
- const gchar* _tmp14_;
- gchar* _tmp15_;
- gchar* origin;
- GFile* _tmp16_;
- gchar* _tmp17_;
- gchar* _tmp18_;
+ gboolean _tmp12_;
+ GFileInfo* _tmp13_;
+ gboolean _tmp14_;
+ GFileInfo* _tmp15_;
+ gboolean _tmp16_;
+ gboolean _tmp17_;
+ GError* err;
+ GFile* _tmp18_;
gchar* _tmp19_;
gchar* _tmp20_;
- gchar* basename;
- const gchar* _tmp21_;
+ GError* _tmp21_;
const gchar* _tmp22_;
- const gchar* _tmp23_;
+ GFileInfo* _tmp23_;
const gchar* _tmp24_;
- const gchar* _tmp25_;
+ gchar* _tmp25_;
+ gchar* mimetype;
const gchar* _tmp26_;
- const gchar* _tmp27_;
- const gchar* _tmp28_;
- ZeitgeistSubject* _tmp29_;
- ZeitgeistSubject* _tmp30_;
- ZeitgeistSubject* subject;
+ gchar* _tmp27_;
+ gchar* origin;
+ GFile* _tmp28_;
+ gchar* _tmp29_;
+ gchar* _tmp30_;
gchar* _tmp31_;
+ gchar* _tmp32_;
+ gchar* basename;
+ const gchar* _tmp33_;
+ const gchar* _tmp34_;
+ const gchar* _tmp35_;
+ const gchar* _tmp36_;
+ const gchar* _tmp37_;
+ const gchar* _tmp38_;
+ const gchar* _tmp39_;
+ const gchar* _tmp40_;
+ ZeitgeistSubject* _tmp41_;
+ ZeitgeistSubject* _tmp42_;
+ ZeitgeistSubject* subject;
+ gchar* _tmp43_;
gchar* actor;
- const gchar* _tmp32_;
- ZeitgeistSubject* _tmp33_;
- ZeitgeistEvent* _tmp34_;
- ZeitgeistEvent* _tmp35_;
+ const gchar* _tmp44_;
+ ZeitgeistSubject* _tmp45_;
+ ZeitgeistEvent* _tmp46_;
+ ZeitgeistEvent* _tmp47_;
ZeitgeistEvent* event;
- ZeitgeistEvent* _tmp36_;
- GPtrArray* _tmp37_;
+ ZeitgeistEvent* _tmp48_;
+ GPtrArray* _tmp49_;
GPtrArray* events;
- GPtrArray* _tmp38_;
- ZeitgeistEvent* _tmp39_;
- GPtrArray* _tmp40_;
+ GPtrArray* _tmp50_;
+ ZeitgeistEvent* _tmp51_;
+ GPtrArray* _tmp52_;
GError * _inner_error_;
};
@@ -196,6 +208,7 @@
DOWNLOADS_DIRECTORY_MONITOR_ENABLED,
DOWNLOADS_DIRECTORY_MONITOR_REGISTER
};
+#define DOWNLOADS_DIRECTORY_MONITOR_ATTRIBUTES
G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE ","
G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN "," G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP ","
DownloadsDirectoryMonitor* downloads_directory_monitor_new (DataHub* datahub,
GError** error);
DownloadsDirectoryMonitor* downloads_directory_monitor_construct (GType
object_type, DataHub* datahub, GError** error);
static void downloads_directory_monitor_real_start (DataProvider* base);
@@ -367,36 +380,86 @@
g_object_unref (_data_->_async_result);
return FALSE;
}
+ _data_->_tmp1_ = _data_->file;
+ _data_->_tmp2_ = NULL;
+ _data_->_tmp2_ = g_file_get_uri (_data_->_tmp1_);
+ _data_->uri = _data_->_tmp2_;
+ _data_->_tmp4_ = _data_->uri;
+ _data_->_tmp5_ = FALSE;
+ _data_->_tmp5_ = g_str_has_suffix (_data_->_tmp4_, ".part");
+ if (_data_->_tmp5_) {
+ _data_->_tmp3_ = TRUE;
+ } else {
+ _data_->_tmp6_ = _data_->uri;
+ _data_->_tmp7_ = FALSE;
+ _data_->_tmp7_ = g_str_has_suffix (_data_->_tmp6_,
".crdownload");
+ _data_->_tmp3_ = _data_->_tmp7_;
+ }
+ _data_->_tmp8_ = _data_->_tmp3_;
+ if (_data_->_tmp8_) {
+ _g_free0 (_data_->uri);
+ if (_data_->_state_ == 0) {
+ g_simple_async_result_complete_in_idle
(_data_->_async_result);
+ } else {
+ g_simple_async_result_complete (_data_->_async_result);
+ }
+ g_object_unref (_data_->_async_result);
+ return FALSE;
+ }
{
- _data_->_tmp1_ = _data_->file;
+ _data_->_tmp9_ = _data_->file;
_data_->_state_ = 1;
- g_file_query_info_async (_data_->_tmp1_,
G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE,
G_PRIORITY_DEFAULT, NULL, downloads_directory_monitor_process_event_ready,
_data_);
+ g_file_query_info_async (_data_->_tmp9_,
DOWNLOADS_DIRECTORY_MONITOR_ATTRIBUTES, G_FILE_QUERY_INFO_NONE,
G_PRIORITY_DEFAULT, NULL, downloads_directory_monitor_process_event_ready,
_data_);
return FALSE;
_state_1:
- _data_->_tmp2_ = NULL;
- _data_->_tmp2_ = g_file_query_info_finish (_data_->_tmp1_,
_data_->_res_, &_data_->_inner_error_);
- _data_->_tmp3_ = _data_->_tmp2_;
+ _data_->_tmp10_ = NULL;
+ _data_->_tmp10_ = g_file_query_info_finish (_data_->_tmp9_,
_data_->_res_, &_data_->_inner_error_);
+ _data_->_tmp11_ = _data_->_tmp10_;
if (_data_->_inner_error_ != NULL) {
goto __catch1_g_error;
}
_g_object_unref0 (_data_->subject_info);
- _data_->subject_info = _data_->_tmp3_;
+ _data_->subject_info = _data_->_tmp11_;
+ _data_->_tmp13_ = _data_->subject_info;
+ _data_->_tmp14_ = FALSE;
+ _data_->_tmp14_ = g_file_info_get_is_hidden (_data_->_tmp13_);
+ if (_data_->_tmp14_) {
+ _data_->_tmp12_ = TRUE;
+ } else {
+ _data_->_tmp15_ = _data_->subject_info;
+ _data_->_tmp16_ = FALSE;
+ _data_->_tmp16_ = g_file_info_get_is_backup
(_data_->_tmp15_);
+ _data_->_tmp12_ = _data_->_tmp16_;
+ }
+ _data_->_tmp17_ = _data_->_tmp12_;
+ if (_data_->_tmp17_) {
+ _g_object_unref0 (_data_->subject_info);
+ _g_free0 (_data_->uri);
+ if (_data_->_state_ == 0) {
+ g_simple_async_result_complete_in_idle
(_data_->_async_result);
+ } else {
+ g_simple_async_result_complete
(_data_->_async_result);
+ }
+ g_object_unref (_data_->_async_result);
+ return FALSE;
+ }
}
goto __finally1;
__catch1_g_error:
{
_data_->err = _data_->_inner_error_;
_data_->_inner_error_ = NULL;
- _data_->_tmp4_ = _data_->file;
- _data_->_tmp5_ = NULL;
- _data_->_tmp5_ = g_file_get_path (_data_->_tmp4_);
- _data_->_tmp6_ = _data_->_tmp5_;
- _data_->_tmp7_ = _data_->err;
- _data_->_tmp8_ = _data_->_tmp7_->message;
- g_warning ("downloads-directory-provider.vala:101: Couldn't
process %s: %s", _data_->_tmp6_, _data_->_tmp8_);
- _g_free0 (_data_->_tmp6_);
+ _data_->_tmp18_ = _data_->file;
+ _data_->_tmp19_ = NULL;
+ _data_->_tmp19_ = g_file_get_path (_data_->_tmp18_);
+ _data_->_tmp20_ = _data_->_tmp19_;
+ _data_->_tmp21_ = _data_->err;
+ _data_->_tmp22_ = _data_->_tmp21_->message;
+ g_warning ("downloads-directory-provider.vala:113: Couldn't
process %s: %s", _data_->_tmp20_, _data_->_tmp22_);
+ _g_free0 (_data_->_tmp20_);
_g_error_free0 (_data_->err);
_g_object_unref0 (_data_->subject_info);
+ _g_free0 (_data_->uri);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle
(_data_->_async_result);
} else {
@@ -408,62 +471,59 @@
__finally1:
if (_data_->_inner_error_ != NULL) {
_g_object_unref0 (_data_->subject_info);
+ _g_free0 (_data_->uri);
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)",
__FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string
(_data_->_inner_error_->domain), _data_->_inner_error_->code);
g_clear_error (&_data_->_inner_error_);
return FALSE;
}
- _data_->_tmp9_ = _data_->file;
- _data_->_tmp10_ = NULL;
- _data_->_tmp10_ = g_file_get_uri (_data_->_tmp9_);
- _data_->uri = _data_->_tmp10_;
- _data_->_tmp11_ = _data_->subject_info;
- _data_->_tmp12_ = NULL;
- _data_->_tmp12_ = g_file_info_get_attribute_string (_data_->_tmp11_,
G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
- _data_->_tmp13_ = g_strdup (_data_->_tmp12_);
- _data_->mimetype = _data_->_tmp13_;
- _data_->_tmp14_ = _data_->uri;
- _data_->_tmp15_ = NULL;
- _data_->_tmp15_ = g_path_get_dirname (_data_->_tmp14_);
- _data_->origin = _data_->_tmp15_;
- _data_->_tmp16_ = _data_->file;
- _data_->_tmp17_ = NULL;
- _data_->_tmp17_ = g_file_get_path (_data_->_tmp16_);
- _data_->_tmp18_ = _data_->_tmp17_;
- _data_->_tmp19_ = NULL;
- _data_->_tmp19_ = g_path_get_basename (_data_->_tmp18_);
- _data_->_tmp20_ = _data_->_tmp19_;
- _g_free0 (_data_->_tmp18_);
- _data_->basename = _data_->_tmp20_;
- _data_->_tmp21_ = _data_->uri;
- _data_->_tmp22_ = _data_->mimetype;
- _data_->_tmp23_ = NULL;
- _data_->_tmp23_ = zeitgeist_interpretation_for_mimetype
(_data_->_tmp22_);
- _data_->_tmp24_ = _data_->uri;
- _data_->_tmp25_ = NULL;
- _data_->_tmp25_ = zeitgeist_manifestation_for_uri (_data_->_tmp24_);
- _data_->_tmp26_ = _data_->mimetype;
- _data_->_tmp27_ = _data_->origin;
- _data_->_tmp28_ = _data_->basename;
- _data_->_tmp29_ = zeitgeist_subject_new_full (_data_->_tmp21_,
_data_->_tmp23_, _data_->_tmp25_, _data_->_tmp26_, _data_->_tmp27_,
_data_->_tmp28_, "");
- _data_->_tmp30_ = g_object_ref_sink (_data_->_tmp29_);
- _data_->subject = _data_->_tmp30_;
- _data_->_tmp31_ = g_strdup ("");
- _data_->actor = _data_->_tmp31_;
- _data_->_tmp32_ = _data_->actor;
- _data_->_tmp33_ = _data_->subject;
- _data_->_tmp34_ = zeitgeist_event_new_full (ZEITGEIST_ZG_CREATE_EVENT,
ZEITGEIST_ZG_WORLD_ACTIVITY, _data_->_tmp32_, _data_->_tmp33_, NULL, NULL);
- _data_->_tmp35_ = g_object_ref_sink (_data_->_tmp34_);
- _data_->event = _data_->_tmp35_;
- _data_->_tmp36_ = _data_->event;
- if (_data_->_tmp36_ != NULL) {
- _data_->_tmp37_ = g_ptr_array_new_with_free_func
(_g_object_unref0_);
- _data_->events = _data_->_tmp37_;
- _data_->_tmp38_ = _data_->events;
- _data_->_tmp39_ = _data_->event;
+ _data_->_tmp23_ = _data_->subject_info;
+ _data_->_tmp24_ = NULL;
+ _data_->_tmp24_ = g_file_info_get_attribute_string (_data_->_tmp23_,
G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
+ _data_->_tmp25_ = g_strdup (_data_->_tmp24_);
+ _data_->mimetype = _data_->_tmp25_;
+ _data_->_tmp26_ = _data_->uri;
+ _data_->_tmp27_ = NULL;
+ _data_->_tmp27_ = g_path_get_dirname (_data_->_tmp26_);
+ _data_->origin = _data_->_tmp27_;
+ _data_->_tmp28_ = _data_->file;
+ _data_->_tmp29_ = NULL;
+ _data_->_tmp29_ = g_file_get_path (_data_->_tmp28_);
+ _data_->_tmp30_ = _data_->_tmp29_;
+ _data_->_tmp31_ = NULL;
+ _data_->_tmp31_ = g_path_get_basename (_data_->_tmp30_);
+ _data_->_tmp32_ = _data_->_tmp31_;
+ _g_free0 (_data_->_tmp30_);
+ _data_->basename = _data_->_tmp32_;
+ _data_->_tmp33_ = _data_->uri;
+ _data_->_tmp34_ = _data_->mimetype;
+ _data_->_tmp35_ = NULL;
+ _data_->_tmp35_ = zeitgeist_interpretation_for_mimetype
(_data_->_tmp34_);
+ _data_->_tmp36_ = _data_->uri;
+ _data_->_tmp37_ = NULL;
+ _data_->_tmp37_ = zeitgeist_manifestation_for_uri (_data_->_tmp36_);
+ _data_->_tmp38_ = _data_->mimetype;
+ _data_->_tmp39_ = _data_->origin;
+ _data_->_tmp40_ = _data_->basename;
+ _data_->_tmp41_ = zeitgeist_subject_new_full (_data_->_tmp33_,
_data_->_tmp35_, _data_->_tmp37_, _data_->_tmp38_, _data_->_tmp39_,
_data_->_tmp40_, "");
+ _data_->_tmp42_ = g_object_ref_sink (_data_->_tmp41_);
+ _data_->subject = _data_->_tmp42_;
+ _data_->_tmp43_ = g_strdup ("");
+ _data_->actor = _data_->_tmp43_;
+ _data_->_tmp44_ = _data_->actor;
+ _data_->_tmp45_ = _data_->subject;
+ _data_->_tmp46_ = zeitgeist_event_new_full (ZEITGEIST_ZG_CREATE_EVENT,
ZEITGEIST_ZG_WORLD_ACTIVITY, _data_->_tmp44_, _data_->_tmp45_, NULL, NULL);
+ _data_->_tmp47_ = g_object_ref_sink (_data_->_tmp46_);
+ _data_->event = _data_->_tmp47_;
+ _data_->_tmp48_ = _data_->event;
+ if (_data_->_tmp48_ != NULL) {
+ _data_->_tmp49_ = g_ptr_array_new_with_free_func
(_g_object_unref0_);
+ _data_->events = _data_->_tmp49_;
+ _data_->_tmp50_ = _data_->events;
+ _data_->_tmp51_ = _data_->event;
_data_->event = NULL;
- g_ptr_array_add (_data_->_tmp38_, _data_->_tmp39_);
- _data_->_tmp40_ = _data_->events;
- g_signal_emit_by_name ((DataProvider*) _data_->self,
"items-available", _data_->_tmp40_);
+ g_ptr_array_add (_data_->_tmp50_, _data_->_tmp51_);
+ _data_->_tmp52_ = _data_->events;
+ g_signal_emit_by_name ((DataProvider*) _data_->self,
"items-available", _data_->_tmp52_);
_g_ptr_array_unref0 (_data_->events);
}
_g_object_unref0 (_data_->event);
@@ -472,8 +532,8 @@
_g_free0 (_data_->basename);
_g_free0 (_data_->origin);
_g_free0 (_data_->mimetype);
- _g_free0 (_data_->uri);
_g_object_unref0 (_data_->subject_info);
+ _g_free0 (_data_->uri);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/zeitgeist-datahub-0.8.1/src/downloads-directory-provider.vala
new/zeitgeist-datahub-0.8.2/src/downloads-directory-provider.vala
--- old/zeitgeist-datahub-0.8.1/src/downloads-directory-provider.vala
2012-02-06 16:05:34.000000000 +0100
+++ new/zeitgeist-datahub-0.8.2/src/downloads-directory-provider.vala
2012-03-09 13:18:42.000000000 +0100
@@ -78,6 +78,11 @@
}
}
+ private const string ATTRIBUTES =
+ FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE + "," +
+ FILE_ATTRIBUTE_STANDARD_IS_HIDDEN + "," +
+ FILE_ATTRIBUTE_STANDARD_IS_BACKUP + ",";
+
private async void process_event (GLib.File file, GLib.File? other_file,
GLib.FileMonitorEvent event_type)
{
@@ -90,11 +95,18 @@
return;
}
+ // Skip temporary files (eg. in-progress Downloads)
+ string uri = file.get_uri ();
+ if (uri.has_suffix (".part") || uri.has_suffix (".crdownload"))
+ return;
+
GLib.FileInfo subject_info;
try
{
- subject_info = yield file.query_info_async (
- FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE,
GLib.FileQueryInfoFlags.NONE);
+ subject_info = yield file.query_info_async (ATTRIBUTES,
+
GLib.FileQueryInfoFlags.NONE);
+ if (subject_info.get_is_hidden () || subject_info.get_is_backup ())
+ return;
}
catch (GLib.Error err)
{
@@ -102,7 +114,6 @@
return;
}
- string uri = file.get_uri ();
string mimetype = subject_info.get_attribute_string (
FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
string origin = Path.get_dirname (uri);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/zeitgeist-datahub-0.8.1/src/zeitgeist_datahub_vala.stamp
new/zeitgeist-datahub-0.8.2/src/zeitgeist_datahub_vala.stamp
--- old/zeitgeist-datahub-0.8.1/src/zeitgeist_datahub_vala.stamp
2012-02-13 14:40:10.000000000 +0100
+++ new/zeitgeist-datahub-0.8.2/src/zeitgeist_datahub_vala.stamp
2012-03-09 13:18:48.000000000 +0100
@@ -0,0 +1 @@
+stamp
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
