Merge lp:~rainct/libzeitgeist/folder into lp:libzeitgeist

[Siegfried Gevatter]

GtkRecentManager does also log folder selections. This gives them a proper interpretation when zeitgeist-datahub picks them up.

[Michal Hruby (mhr3)]

Looks fine.

review: Approve

[Mikkel Kamstrup Erlandsen (kamstrup)]

Michal; can you check with didrocks if libzeitgeist is under automagic merge? I don't think it is (and I don't think it should be either).

[Michal Hruby (mhr3)]

Yea, it's not, pushed the good ol' way... :)

=== modified file 'src/zeitgeist-mimetypes.c'
--- src/zeitgeist-mimetypes.c	2011-03-07 14:19:39 +0000
+++ src/zeitgeist-mimetypes.c	2012-01-25 13:08:23 +0000
@@ -335,6 +335,7 @@
   zeitgeist_register_mimetype ("text/x-m4", ZEITGEIST_NFO_SOURCE_CODE);
   zeitgeist_register_mimetype ("text/x-tcl", ZEITGEIST_NFO_SOURCE_CODE);
   zeitgeist_register_mimetype ("application/ecmascript", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("inode/directory", ZEITGEIST_NFO_FOLDER);
   zeitgeist_register_mimetype ("application/msword", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
   zeitgeist_register_mimetype_regex ("application/vnd.oasis.opendocument.text.*", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
   zeitgeist_register_mimetype_regex ("application/vnd.oasis.opendocument.presentation.*", ZEITGEIST_NFO_PRESENTATION);
@@ -363,6 +364,9 @@
   zeitgeist_register_uri_scheme ("ssh://", ZEITGEIST_NFO_REMOTE_DATA_OBJECT);
   zeitgeist_register_uri_scheme ("sftp://", ZEITGEIST_NFO_REMOTE_DATA_OBJECT);
   zeitgeist_register_uri_scheme ("ftp://", ZEITGEIST_NFO_REMOTE_DATA_OBJECT);
+  zeitgeist_register_uri_scheme ("dav://", ZEITGEIST_NFO_REMOTE_DATA_OBJECT);
+  zeitgeist_register_uri_scheme ("davs://", ZEITGEIST_NFO_REMOTE_DATA_OBJECT);
+  zeitgeist_register_uri_scheme ("smb://", ZEITGEIST_NFO_REMOTE_DATA_OBJECT);
 
   schemes_loaded = TRUE;
 }