svnno****@sourc*****
svnno****@sourc*****
Fri Feb 13 10:09:11 JST 2009
Revision: 3662
http://svn.sourceforge.jp/view?root=kazehakase&view=rev&rev=3662
Author: ikezoe
Date: 2009-02-13 10:09:11 +0900 (Fri, 13 Feb 2009)
Log Message:
-----------
* src/kz-thumbails-view.[ch], src/kz-popup-tablist.c,
src/sidebar/kz-thumbnails-sidebar.c: Use KzBookmarkFolder instead of
KzBookmark.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/kz-popup-tablist.c
kazehakase/trunk/src/kz-thumbnails-view.c
kazehakase/trunk/src/kz-thumbnails-view.h
kazehakase/trunk/src/sidebar/kz-thumbnails-sidebar.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-02-13 00:49:51 UTC (rev 3661)
+++ kazehakase/trunk/ChangeLog 2009-02-13 01:09:11 UTC (rev 3662)
@@ -8,6 +8,9 @@
gtk_notebook_get_nth_page.
* rgettext.mk.in: Moved to top directory since po/rgettext.mk.in is
not included dist files.
+ * src/kz-thumbails-view.[ch], src/kz-popup-tablist.c,
+ src/sidebar/kz-thumbnails-sidebar.c: Use KzBookmarkFolder instead of
+ KzBookmark.
2009-02-12 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/src/kz-popup-tablist.c
===================================================================
--- kazehakase/trunk/src/kz-popup-tablist.c 2009-02-13 00:49:51 UTC (rev 3661)
+++ kazehakase/trunk/src/kz-popup-tablist.c 2009-02-13 01:09:11 UTC (rev 3662)
@@ -225,7 +225,7 @@
gtk_container_add(GTK_CONTAINER(priv->popup_frame), view);
kz_thumbnails_view_set_folder(KZ_THUMBNAILS_VIEW(view),
- tabs);
+ KZ_BOOKMARK_FOLDER(tabs));
g_signal_connect(view,
"activate",
Modified: kazehakase/trunk/src/kz-thumbnails-view.c
===================================================================
--- kazehakase/trunk/src/kz-thumbnails-view.c 2009-02-13 00:49:51 UTC (rev 3661)
+++ kazehakase/trunk/src/kz-thumbnails-view.c 2009-02-13 01:09:11 UTC (rev 3662)
@@ -31,7 +31,7 @@
typedef struct _KzThumbnailsViewPrivate KzThumbnailsViewPrivate;
struct _KzThumbnailsViewPrivate
{
- KzBookmark *folder;
+ KzBookmarkFolder *folder;
GList *children;
KzThumbnailsViewMode mode;
};
@@ -51,13 +51,13 @@
static void kz_thumbnails_view_redraw (KzThumbnailsView *view);
-static void connect_bookmark_signals (KzThumbnailsView *view,
- KzBookmark *bookmark);
-static void disconnect_bookmark_signals (KzThumbnailsView *view,
- KzBookmark *bookmark);
+static void connect_bookmark_folder_signals (KzThumbnailsView *view,
+ KzBookmarkFolder *folder);
+static void disconnect_bookmark_folder_signals (KzThumbnailsView *view,
+ KzBookmarkFolder *folder);
static void insert_bookmark (KzThumbnailsView *view,
- KzBookmark *bookmark,
+ KzBookmarkFolder *folder,
KzBookmark *child,
KzBookmark *sibling);
@@ -124,7 +124,7 @@
if (priv->folder)
{
- disconnect_bookmark_signals(view, priv->folder);
+ disconnect_bookmark_folder_signals(view, priv->folder);
g_object_unref(priv->folder);
priv->folder = NULL;
}
@@ -255,7 +255,7 @@
void
kz_thumbnails_view_set_folder (KzThumbnailsView *view,
- KzBookmark *folder)
+ KzBookmarkFolder *folder)
{
KzThumbnailsViewPrivate *priv;
@@ -266,7 +266,7 @@
if (priv->folder)
{
- disconnect_bookmark_signals(view, priv->folder);
+ disconnect_bookmark_folder_signals(view, priv->folder);
g_object_unref(priv->folder);
priv->folder = NULL;
@@ -279,9 +279,9 @@
if (!folder) return;
priv->folder = g_object_ref(folder);
- connect_bookmark_signals(view, priv->folder);
+ connect_bookmark_folder_signals(view, priv->folder);
- kz_bookmark_folder_foreach_child(KZ_BOOKMARK_FOLDER(folder),
+ kz_bookmark_folder_foreach_child(folder,
(GFunc)each_bookmark, view);
}
@@ -365,7 +365,7 @@
static void
insert_bookmark (KzThumbnailsView *view,
- KzBookmark *bookmark,
+ KzBookmarkFolder *folder,
KzBookmark *child,
KzBookmark *sibling)
{
@@ -387,7 +387,7 @@
G_CALLBACK(cb_thumbnail_leave_notify), NULL);
if (sibling)
- pos = kz_bookmark_folder_get_child_index(KZ_BOOKMARK_FOLDER(bookmark), sibling);
+ pos = kz_bookmark_folder_get_child_index(folder, sibling);
if (pos >= 0)
{
@@ -424,19 +424,19 @@
static void
-cb_bookmark_insert_child (KzBookmark *bookmark,
- KzBookmark *child,
- KzBookmark *sibling,
- KzThumbnailsView *view)
+cb_bookmark_folder_insert_child (KzBookmarkFolder *folder,
+ KzBookmark *child,
+ KzBookmark *sibling,
+ KzThumbnailsView *view)
{
- insert_bookmark(view, bookmark, child, sibling);
+ insert_bookmark(view, folder, child, sibling);
}
static void
-cb_bookmark_remove_child (KzBookmark *bookmark,
- KzBookmark *child,
- KzThumbnailsView *view)
+cb_bookmark_folder_remove_child (KzBookmarkFolder *folder,
+ KzBookmark *child,
+ KzThumbnailsView *view)
{
GtkWidget *thumbnail;
KzThumbnailsViewPrivate *priv = KZ_THUMBNAILS_VIEW_GET_PRIVATE(view);
@@ -456,30 +456,30 @@
static void
-connect_bookmark_signals (KzThumbnailsView *view,
- KzBookmark *bookmark)
+connect_bookmark_folder_signals (KzThumbnailsView *view,
+ KzBookmarkFolder *folder)
{
- g_return_if_fail(KZ_IS_BOOKMARK(bookmark));
+ g_return_if_fail(KZ_IS_BOOKMARK_FOLDER(folder));
- g_signal_connect(bookmark, "insert-child",
- G_CALLBACK(cb_bookmark_insert_child), view);
- g_signal_connect(bookmark, "remove-child",
- G_CALLBACK(cb_bookmark_remove_child), view);
+ g_signal_connect(folder, "insert-child",
+ G_CALLBACK(cb_bookmark_folder_insert_child), view);
+ g_signal_connect(folder, "remove-child",
+ G_CALLBACK(cb_bookmark_folder_remove_child), view);
}
static void
-disconnect_bookmark_signals (KzThumbnailsView *view,
- KzBookmark *bookmark)
+disconnect_bookmark_folder_signals (KzThumbnailsView *view,
+ KzBookmarkFolder *folder)
{
- g_return_if_fail(KZ_IS_BOOKMARK(bookmark));
+ g_return_if_fail(KZ_IS_BOOKMARK_FOLDER(folder));
g_signal_handlers_disconnect_by_func
- (bookmark,
- G_CALLBACK(cb_bookmark_insert_child), view);
+ (folder,
+ G_CALLBACK(cb_bookmark_folder_insert_child), view);
g_signal_handlers_disconnect_by_func
- (bookmark,
- G_CALLBACK(cb_bookmark_remove_child), view);
+ (folder,
+ G_CALLBACK(cb_bookmark_folder_remove_child), view);
}
Modified: kazehakase/trunk/src/kz-thumbnails-view.h
===================================================================
--- kazehakase/trunk/src/kz-thumbnails-view.h 2009-02-13 00:49:51 UTC (rev 3661)
+++ kazehakase/trunk/src/kz-thumbnails-view.h 2009-02-13 01:09:11 UTC (rev 3662)
@@ -24,7 +24,7 @@
#define __KZ_THUMBNAILS_VIEW_H__
#include <gtk/gtk.h>
-#include "kz-bookmark.h"
+#include "kz-bookmark-folder.h"
G_BEGIN_DECLS
@@ -64,7 +64,7 @@
GType kz_thumbnails_view_get_type (void) G_GNUC_CONST;
GtkWidget *kz_thumbnails_view_new (void);
void kz_thumbnails_view_set_folder (KzThumbnailsView *view,
- KzBookmark *folder);
+ KzBookmarkFolder *folder);
void kz_thumbnails_view_set_mode (KzThumbnailsView *view,
KzThumbnailsViewMode mode);
G_END_DECLS
Modified: kazehakase/trunk/src/sidebar/kz-thumbnails-sidebar.c
===================================================================
--- kazehakase/trunk/src/sidebar/kz-thumbnails-sidebar.c 2009-02-13 00:49:51 UTC (rev 3661)
+++ kazehakase/trunk/src/sidebar/kz-thumbnails-sidebar.c 2009-02-13 01:09:11 UTC (rev 3662)
@@ -235,10 +235,10 @@
* create a new bookmark folder which included each current page of
* closed tab.
*/
- proxy = kz_proxy_folder_new(KZ_BOOKMARK_FOLDER(sidebar->kz->closed_tabs));
+ proxy = kz_proxy_folder_new(sidebar->kz->closed_tabs);
kz_thumbnails_view_set_folder(KZ_THUMBNAILS_VIEW(tsidebar->view),
- proxy);
+ KZ_BOOKMARK_FOLDER(proxy));
g_object_unref(proxy);
return GTK_WIDGET(tsidebar);