diff options
author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-12-09 10:30:32 +0000 |
---|---|---|
committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-12-09 10:30:32 +0000 |
commit | 24d1220da3bb3f6f246ea7afa0c29782709ccbd3 (patch) | |
tree | c1a77e5b673059bd57a81c30e54337ec0031b2cb | |
parent | 447bcaed412ca4ed652f0dce57c8af4b86ca1fb1 (diff) |
folder_find_item_from_identifier(): also return top folder.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@818 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | ChangeLog.ja | 2 | ||||
-rw-r--r-- | libsylph/folder.c | 11 |
3 files changed, 11 insertions, 4 deletions
@@ -1,6 +1,8 @@ 2005-12-09 * src/foldersel.c: also select top folder on FOLDER_SEL_ALL. + * libsylph/folder.c: folder_find_item_from_identifier(): also return + top folder. 2005-12-09 diff --git a/ChangeLog.ja b/ChangeLog.ja index 8c38033d..00ca7594 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -2,6 +2,8 @@ * src/foldersel.c: FOLDER_SEL_ALL でトップフォルダも選択するように した。 + * libsylph/folder.c: folder_find_item_from_identifier(): トップフォルダ + も返すようにした。 2005-12-09 diff --git a/libsylph/folder.c b/libsylph/folder.c index cb84c8ca..257f57c8 100644 --- a/libsylph/folder.c +++ b/libsylph/folder.c @@ -705,15 +705,18 @@ FolderItem *folder_find_item_from_identifier(const gchar *identifier) name = p; p = strchr(p, '/'); - if (!p) - return folder_find_item_from_path(identifier); - *p = '\0'; - p++; + if (p) { + *p = '\0'; + p++; + } folder = folder_find_from_name(name, type); if (!folder) return folder_find_item_from_path(identifier); + if (!p) + return FOLDER_ITEM(folder->node->data); + path = p; d[0] = (gpointer)path; |