svnno****@sourc*****
svnno****@sourc*****
Mon Jan 26 14:28:16 JST 2009
Revision: 3573
http://svn.sourceforge.jp/view?root=kazehakase&view=rev&rev=3573
Author: ikezoe
Date: 2009-01-26 14:28:16 +0900 (Mon, 26 Jan 2009)
Log Message:
-----------
* src/bookmarks/kz-bookmark.[ch], src/bookmarks/kz-bookmark-folder.c::
Remove KZ_BOOKMARK_FOLDER type. TODO Create KzBookmarkFolder object.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/bookmarks/kz-bookmark-file.c
kazehakase/trunk/src/bookmarks/kz-bookmark.c
kazehakase/trunk/src/bookmarks/kz-bookmark.h
kazehakase/trunk/test/test-bookmark-file.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-01-26 05:26:01 UTC (rev 3572)
+++ kazehakase/trunk/ChangeLog 2009-01-26 05:28:16 UTC (rev 3573)
@@ -1,6 +1,8 @@
2009-01-26 Hiroyuki Ikezoe <poinc****@ikezo*****>
* define KAZEHAKASE_CFLAGS.
+ * src/bookmarks/kz-bookmark.[ch], src/bookmarks/kz-bookmark-folder.c::
+ Remove KZ_BOOKMARK_FOLDER type. TODO Create KzBookmarkFolder object.
2009-01-25 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark-file.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark-file.c 2009-01-26 05:26:01 UTC (rev 3572)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark-file.c 2009-01-26 05:28:16 UTC (rev 3573)
@@ -151,7 +151,7 @@
_("Location of bookmark_file file itself"),
_("The location of the bookmark_file file itself"),
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property(
object_class,
@@ -513,7 +513,6 @@
location = location ? location : "";
bookmark_file = g_object_new(KZ_TYPE_BOOKMARK_FILE,
- "type", KZ_BOOKMARK_FOLDER,
"location", location,
"title", title,
"file-type", file_type,
@@ -540,7 +539,6 @@
}
bookmark_file = g_object_new(KZ_TYPE_BOOKMARK_FILE,
- "type", KZ_BOOKMARK_FOLDER,
"location", location,
"title", title,
"file-type", file_type,
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark.c 2009-01-26 05:26:01 UTC (rev 3572)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark.c 2009-01-26 05:28:16 UTC (rev 3573)
@@ -716,7 +716,7 @@
{
g_return_val_if_fail(KZ_IS_BOOKMARK(bookmark), FALSE);
- return (bookmark->type == KZ_BOOKMARK_FOLDER ||
+ return (KZ_IS_BOOKMARK_FILE(bookmark) ||
bookmark->type == KZ_BOOKMARK_PURE_FOLDER);
}
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark.h
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark.h 2009-01-26 05:26:01 UTC (rev 3572)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark.h 2009-01-26 05:28:16 UTC (rev 3573)
@@ -40,7 +40,6 @@
typedef enum {
KZ_BOOKMARK_NORMAL,
- KZ_BOOKMARK_FOLDER,
KZ_BOOKMARK_PURE_FOLDER,
KZ_BOOKMARK_N_TYPES
} KzBookmarkType;
Modified: kazehakase/trunk/test/test-bookmark-file.c
===================================================================
--- kazehakase/trunk/test/test-bookmark-file.c 2009-01-26 05:26:01 UTC (rev 3572)
+++ kazehakase/trunk/test/test-bookmark-file.c 2009-01-26 05:28:16 UTC (rev 3573)
@@ -33,6 +33,7 @@
file = kz_bookmark_file_new(file_path, "Bookmark file", "XBEL");
cut_assert(file);
cut_assert_true(KZ_IS_BOOKMARK_FILE(file));
+ cut_assert_true(kz_bookmark_is_folder(KZ_BOOKMARK(file)));
}
void