libzeitgeist

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

  1. folder
  2. Merge into trunk
Proposed by Siegfried Gevatter
Status: Merged
Approved by: Michal Hruby
Approved revision: 213
Merged at revision: 213
Proposed branch: lp:~rainct/libzeitgeist/folder
Merge into: lp:libzeitgeist
Diff against target: 21 lines (+4/-0)
1 file modified
src/zeitgeist-mimetypes.c (+4/-0)
To merge this branch: bzr merge lp:~rainct/libzeitgeist/folder
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
Review via email: mp+90102@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

Looks fine.

review: Approve
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

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).

Revision history for this message
Michal Hruby (mhr3) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/zeitgeist-mimetypes.c'
2--- src/zeitgeist-mimetypes.c 2011-03-07 14:19:39 +0000
3+++ src/zeitgeist-mimetypes.c 2012-01-25 13:08:23 +0000
4@@ -335,6 +335,7 @@
5 zeitgeist_register_mimetype ("text/x-m4", ZEITGEIST_NFO_SOURCE_CODE);
6 zeitgeist_register_mimetype ("text/x-tcl", ZEITGEIST_NFO_SOURCE_CODE);
7 zeitgeist_register_mimetype ("application/ecmascript", ZEITGEIST_NFO_SOURCE_CODE);
8+ zeitgeist_register_mimetype ("inode/directory", ZEITGEIST_NFO_FOLDER);
9 zeitgeist_register_mimetype ("application/msword", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
10 zeitgeist_register_mimetype_regex ("application/vnd.oasis.opendocument.text.*", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
11 zeitgeist_register_mimetype_regex ("application/vnd.oasis.opendocument.presentation.*", ZEITGEIST_NFO_PRESENTATION);
12@@ -363,6 +364,9 @@
13 zeitgeist_register_uri_scheme ("ssh://", ZEITGEIST_NFO_REMOTE_DATA_OBJECT);
14 zeitgeist_register_uri_scheme ("sftp://", ZEITGEIST_NFO_REMOTE_DATA_OBJECT);
15 zeitgeist_register_uri_scheme ("ftp://", ZEITGEIST_NFO_REMOTE_DATA_OBJECT);
16+ zeitgeist_register_uri_scheme ("dav://", ZEITGEIST_NFO_REMOTE_DATA_OBJECT);
17+ zeitgeist_register_uri_scheme ("davs://", ZEITGEIST_NFO_REMOTE_DATA_OBJECT);
18+ zeitgeist_register_uri_scheme ("smb://", ZEITGEIST_NFO_REMOTE_DATA_OBJECT);
19
20 schemes_loaded = TRUE;
21 }

Subscribers

People subscribed via source and target branches