svnno****@sourc*****
svnno****@sourc*****
Fri Feb 13 10:48:22 JST 2009
Revision: 3664
http://svn.sourceforge.jp/view?root=kazehakase&view=rev&rev=3664
Author: ikezoe
Date: 2009-02-13 10:48:22 +0900 (Fri, 13 Feb 2009)
Log Message:
-----------
* src/bookmarks/kz-bookmark-folder.[ch],
src/bookmarks/kz-w3mbookmark.c, src/bookmarks/kz-actions-bookmark.c,
src/bookmarks/kz-root-bookmark.c, src/bookmarks/kz-ns-bookmark.c,
src/bookmarks/kz-xbel.c, src/kz-embed.c src/kz-window.c:
kz_bookmark_folder_new() now needs its title.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/bookmarks/kz-actions-bookmark.c
kazehakase/trunk/src/bookmarks/kz-bookmark-folder.c
kazehakase/trunk/src/bookmarks/kz-bookmark-folder.h
kazehakase/trunk/src/bookmarks/kz-nsbookmark.c
kazehakase/trunk/src/bookmarks/kz-root-bookmark.c
kazehakase/trunk/src/bookmarks/kz-w3mbookmark.c
kazehakase/trunk/src/bookmarks/kz-xbel.c
kazehakase/trunk/src/kz-embed.c
kazehakase/trunk/src/kz-tab-label.c
kazehakase/trunk/src/kz-window.c
kazehakase/trunk/src/widget/Makefile.am
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-02-13 01:11:36 UTC (rev 3663)
+++ kazehakase/trunk/ChangeLog 2009-02-13 01:48:22 UTC (rev 3664)
@@ -11,6 +11,11 @@
* src/kz-thumbails-view.[ch], src/kz-popup-tablist.c,
src/sidebar/kz-thumbnails-sidebar.c: Use KzBookmarkFolder instead of
KzBookmark.
+ * src/bookmarks/kz-bookmark-folder.[ch],
+ src/bookmarks/kz-w3mbookmark.c, src/bookmarks/kz-actions-bookmark.c,
+ src/bookmarks/kz-root-bookmark.c, src/bookmarks/kz-ns-bookmark.c,
+ src/bookmarks/kz-xbel.c, src/kz-embed.c src/kz-window.c:
+ kz_bookmark_folder_new() now needs its title.
2009-02-12 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/src/bookmarks/kz-actions-bookmark.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-actions-bookmark.c 2009-02-13 01:11:36 UTC (rev 3663)
+++ kazehakase/trunk/src/bookmarks/kz-actions-bookmark.c 2009-02-13 01:48:22 UTC (rev 3664)
@@ -142,8 +142,7 @@
g_return_if_fail(GTK_IS_ACTION(action));
g_return_if_fail(KZ_IS_BOOKMARK_EDITOR(editor));
- folder = kz_bookmark_folder_new();
- kz_bookmark_set_title(folder, _("New folder"));
+ folder = kz_bookmark_folder_new(_("New folder"));
insert_bookmark_item(editor, folder);
g_object_unref(folder);
}
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark-folder.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark-folder.c 2009-02-13 01:11:36 UTC (rev 3663)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark-folder.c 2009-02-13 01:48:22 UTC (rev 3664)
@@ -269,9 +269,11 @@
KzBookmark *
-kz_bookmark_folder_new (void)
+kz_bookmark_folder_new (const gchar *title)
{
- return KZ_BOOKMARK(g_object_new(KZ_TYPE_BOOKMARK_FOLDER, NULL));
+ return KZ_BOOKMARK(g_object_new(KZ_TYPE_BOOKMARK_FOLDER,
+ "title", title,
+ NULL));
}
gboolean
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark-folder.h
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark-folder.h 2009-02-13 01:11:36 UTC (rev 3663)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark-folder.h 2009-02-13 01:48:22 UTC (rev 3664)
@@ -67,7 +67,7 @@
GType kz_bookmark_folder_get_type (void) G_GNUC_CONST;
/* boomark item creating functions */
-KzBookmark *kz_bookmark_folder_new (void);
+KzBookmark *kz_bookmark_folder_new (const gchar *title);
gboolean kz_bookmark_folder_get_folded (KzBookmarkFolder *folder);
void kz_bookmark_folder_set_folded (KzBookmarkFolder *folder,
Modified: kazehakase/trunk/src/bookmarks/kz-nsbookmark.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-nsbookmark.c 2009-02-13 01:11:36 UTC (rev 3663)
+++ kazehakase/trunk/src/bookmarks/kz-nsbookmark.c 2009-02-13 01:48:22 UTC (rev 3664)
@@ -113,15 +113,13 @@
if (!strncasecmp(pos, "<H3", 3))
{
gchar *folder_title;
- KzBookmark *folder = kz_bookmark_folder_new();
+ KzBookmark *folder;
/* folder title */
folder_title = xml_get_content(pos);
+ folder = kz_bookmark_folder_new(folder_title);
if (folder_title)
- {
- kz_bookmark_set_title(folder, folder_title);
g_free(folder_title);
- }
pos += 3;
pos = kz_nsbookmark_parse_bookmark(folder, pos);
Modified: kazehakase/trunk/src/bookmarks/kz-root-bookmark.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-root-bookmark.c 2009-02-13 01:11:36 UTC (rev 3663)
+++ kazehakase/trunk/src/bookmarks/kz-root-bookmark.c 2009-02-13 01:48:22 UTC (rev 3664)
@@ -45,16 +45,14 @@
{
root->menu = KZ_BOOKMARK(kz_bookmark_file_new(NULL, NULL, NULL));
root->clip = KZ_BOOKMARK(kz_bookmark_file_new(NULL, NULL, NULL));
- root->bookmark_bars = kz_bookmark_folder_new();
+ root->bookmark_bars = kz_bookmark_folder_new("Bookmark Bars");
root->history = kz_history_new(NULL);
- root->tab_groups = kz_bookmark_folder_new();
+ root->tab_groups = kz_bookmark_folder_new("Tab Groups");
root->smarts = NULL;
root->current_session = NULL;
kz_bookmark_set_title(root->menu, "Bookmark Menu");
- kz_bookmark_set_title(root->bookmark_bars, "Bookmark Bars");
kz_bookmark_set_title(KZ_BOOKMARK(root->history), "History");
- kz_bookmark_set_title(root->tab_groups, "Tab Groups");
}
Modified: kazehakase/trunk/src/bookmarks/kz-w3mbookmark.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-w3mbookmark.c 2009-02-13 01:11:36 UTC (rev 3663)
+++ kazehakase/trunk/src/bookmarks/kz-w3mbookmark.c 2009-02-13 01:48:22 UTC (rev 3664)
@@ -128,15 +128,13 @@
if (!strncasecmp(pos, "<h2", 3))
{
gchar *folder_title;
- KzBookmark *folder = kz_bookmark_folder_new();
+ KzBookmark *folder;
/* folder title */
folder_title = xml_get_content(pos);
+ folder = kz_bookmark_folder_new(folder_title);
if (folder_title)
- {
- kz_bookmark_set_title(folder, folder_title);
g_free(folder_title);
- }
pos += 3;
pos = kz_w3mbookmark_parse_bookmark(folder, pos);
@@ -148,17 +146,12 @@
gchar *uri, *title;
KzBookmark *child = kz_bookmark_new();
uri = xml_get_attr(pos, "href");
+ title = xml_get_content(pos);
+ child = kz_bookmark_new_with_attrs(title, uri, NULL);
if (uri)
- {
- kz_bookmark_set_link(child, uri);
g_free(uri);
- }
- title = xml_get_content(pos);
if (title)
- {
- kz_bookmark_set_title(child, title);
g_free(title);
- }
kz_bookmark_folder_append(KZ_BOOKMARK_FOLDER(bookmark), child);
g_object_unref(child);
Modified: kazehakase/trunk/src/bookmarks/kz-xbel.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-xbel.c 2009-02-13 01:11:36 UTC (rev 3663)
+++ kazehakase/trunk/src/bookmarks/kz-xbel.c 2009-02-13 01:48:22 UTC (rev 3664)
@@ -591,7 +591,7 @@
}
else
{
- folder = kz_bookmark_folder_new();
+ folder = kz_bookmark_folder_new(NULL);
}
folded_str = kz_xml_node_get_attr(node, "folded");
Modified: kazehakase/trunk/src/kz-embed.c
===================================================================
--- kazehakase/trunk/src/kz-embed.c 2009-02-13 01:11:36 UTC (rev 3663)
+++ kazehakase/trunk/src/kz-embed.c 2009-02-13 01:48:22 UTC (rev 3664)
@@ -652,7 +652,7 @@
if (!KZ_EMBED_GET_IFACE(dest_embed)->set_history)
return;
- history = KZ_BOOKMARK_FOLDER(kz_bookmark_folder_new());
+ history = KZ_BOOKMARK_FOLDER(kz_bookmark_folder_new(NULL));
kz_embed_get_history(src_embed, history);
kz_embed_set_history(dest_embed, history);
g_object_unref(history);
Modified: kazehakase/trunk/src/kz-tab-label.c
===================================================================
--- kazehakase/trunk/src/kz-tab-label.c 2009-02-13 01:11:36 UTC (rev 3663)
+++ kazehakase/trunk/src/kz-tab-label.c 2009-02-13 01:48:22 UTC (rev 3664)
@@ -223,8 +223,7 @@
kztab->circle = NULL;
kztab->mask = NULL;
- kztab->history = KZ_BOOKMARK_FOLDER(kz_bookmark_folder_new());
- kz_bookmark_set_title(KZ_BOOKMARK(kztab->history), _("Tab"));
+ kztab->history = KZ_BOOKMARK_FOLDER(kz_bookmark_folder_new(_("Tab")));
hbox = gtk_hbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(kztab->eventbox), hbox);
Modified: kazehakase/trunk/src/kz-window.c
===================================================================
--- kazehakase/trunk/src/kz-window.c 2009-02-13 01:11:36 UTC (rev 3663)
+++ kazehakase/trunk/src/kz-window.c 2009-02-13 01:48:22 UTC (rev 3664)
@@ -436,9 +436,9 @@
priv->sidebar_was_shown = FALSE;
- kz->tabs = KZ_BOOKMARK_FOLDER(kz_bookmark_folder_new());
- kz->closed_tabs = KZ_BOOKMARK_FOLDER(kz_bookmark_folder_new());
- kz->history_search = kz_bookmark_folder_new();
+ kz->tabs = KZ_BOOKMARK_FOLDER(kz_bookmark_folder_new("Window"));
+ kz->closed_tabs = KZ_BOOKMARK_FOLDER(kz_bookmark_folder_new("Closed tabs"));
+ kz->history_search = kz_bookmark_folder_new(NULL);
kz_ext_setup(kz);
@@ -598,8 +598,6 @@
NULL);
gtk_key_theme_changed_cb(settings, 0, 0);
- kz_bookmark_set_title(KZ_BOOKMARK(kz->tabs), "Window");
-
kz_window_restore_state(kz);
}
Modified: kazehakase/trunk/src/widget/Makefile.am
===================================================================
--- kazehakase/trunk/src/widget/Makefile.am 2009-02-13 01:11:36 UTC (rev 3663)
+++ kazehakase/trunk/src/widget/Makefile.am 2009-02-13 01:48:22 UTC (rev 3664)
@@ -13,10 +13,11 @@
-DG_LOG_DOMAIN=\"Kazehakase-Widget\"
libkzwidget_public_h_sources = \
- kz-dlist.h \
- kz-entry.h \
- kz-paned.h \
- kz-thumbnail.h
+ kz-dlist.h \
+ kz-entry.h \
+ kz-paned.h \
+ kz-thumbnail.h \
+ kz-bin.h
enum_source_prefix = kz-widget-enum-types
@@ -26,12 +27,13 @@
enum_sources_h = \
$(libkzwidget_public_h_sources)
-libkzwidget_la_SOURCES = \
- kz-dlist.c \
- kz-entry.c \
- kz-paned.c \
- kz-thumbnail.c \
- $(enum_sources) \
+libkzwidget_la_SOURCES = \
+ kz-dlist.c \
+ kz-entry.c \
+ kz-paned.c \
+ kz-thumbnail.c \
+ kz-bin.c \
+ $(enum_sources) \
$(libkzwidget_public_h_sources)
libkzwidget_la_LIBADD = \