[kazehakase-svn] [3724] * src/bookmarks/kz-xbel.c[h]: "insert-child" and " remove-child" is

Zurück zum Archiv-Index

svnno****@sourc***** svnno****@sourc*****
Tue Feb 17 10:42:21 JST 2009


Revision: 3724
          http://svn.sourceforge.jp/view?root=kazehakase&view=rev&rev=3724
Author:   ikezoe
Date:     2009-02-17 10:42:21 +0900 (Tue, 17 Feb 2009)

Log Message:
-----------
	* src/bookmarks/kz-xbel.c[h]: "insert-child" and "remove-child" is
	signals of KzBookmarkFolder.

Modified Paths:
--------------
    kazehakase/trunk/ChangeLog
    kazehakase/trunk/src/bookmarks/kz-xbel.c

Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog	2009-02-17 00:39:46 UTC (rev 3723)
+++ kazehakase/trunk/ChangeLog	2009-02-17 01:42:21 UTC (rev 3724)
@@ -2,6 +2,8 @@
 
 	* src/bookmarks/kz-bookmark-file.c: Use KzDownloader instead of GIO.
 	* src/net/kz-file.[ch]: Removed.
+	* src/bookmarks/kz-xbel.c[h]: "insert-child" and "remove-child" is
+	signals of KzBookmarkFolder.
 
 2009-02-16  Hiroyuki Ikezoe  <poinc****@ikezo*****>
 

Modified: kazehakase/trunk/src/bookmarks/kz-xbel.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-xbel.c	2009-02-17 00:39:46 UTC (rev 3723)
+++ kazehakase/trunk/src/bookmarks/kz-xbel.c	2009-02-17 01:42:21 UTC (rev 3724)
@@ -53,11 +53,13 @@
 					    gpointer     data);
 static void     kz_xbel_disconnect_signals (KzBookmark  *bookmark,
 					    gpointer     data);
-static void     cb_bookmark_insert_child   (KzBookmark  *bookmark,
+static void     cb_bookmark_folder_insert_child
+					   (KzBookmarkFolder *folder,
 					    KzBookmark  *child,
 					    KzBookmark  *sibling,
 					    gpointer     data);
-static void     cb_bookmark_remove_child   (KzBookmark  *bookmark,
+static void     cb_bookmark_folder_remove_child
+					   (KzBookmarkFolder *folder,
 					    KzBookmark  *child,
 					    gpointer     data);
 static void     cb_bookmark_notify         (GObject     *object,
@@ -147,9 +149,9 @@
 	g_signal_connect(bookmark, "notify",
 			 G_CALLBACK(kz_xbel_notify), xml);
 	g_signal_connect_after(bookmark, "insert-child",
-			       G_CALLBACK(cb_bookmark_insert_child), bookmark);
+			       G_CALLBACK(cb_bookmark_folder_insert_child), bookmark);
 	g_signal_connect_after(bookmark, "remove-child",
-			       G_CALLBACK(cb_bookmark_remove_child), bookmark);
+			       G_CALLBACK(cb_bookmark_folder_remove_child), bookmark);
 }
 
 
@@ -1178,10 +1180,10 @@
 	if (!kz_bookmark_is_folder(bookmark)) return;
 
 	g_signal_connect_after(bookmark, "insert-child",
-			       G_CALLBACK(cb_bookmark_insert_child),
+			       G_CALLBACK(cb_bookmark_folder_insert_child),
 			       data);
 	g_signal_connect_after(bookmark, "remove-child",
-			       G_CALLBACK(cb_bookmark_remove_child),
+			       G_CALLBACK(cb_bookmark_folder_remove_child),
 			       data);
 
 	/* for children */
@@ -1202,10 +1204,10 @@
 
 	g_signal_handlers_disconnect_by_func
 		(bookmark,
-		 G_CALLBACK(cb_bookmark_insert_child), data);
+		 G_CALLBACK(cb_bookmark_folder_insert_child), data);
 	g_signal_handlers_disconnect_by_func
 		(bookmark,
-		 G_CALLBACK(cb_bookmark_remove_child), data);
+		 G_CALLBACK(cb_bookmark_folder_remove_child), data);
 
 	/* for children */
 	kz_bookmark_folder_foreach_child(KZ_BOOKMARK_FOLDER(bookmark),
@@ -1214,13 +1216,13 @@
 
 
 static void
-cb_bookmark_insert_child (KzBookmark *bookmark,
-			  KzBookmark *child, KzBookmark *sibling,
-			  gpointer data)
+cb_bookmark_folder_insert_child (KzBookmarkFolder *folder,
+				 KzBookmark *child, KzBookmark *sibling,
+				 gpointer data)
 {
 	gboolean updated;
 
-	kz_xbel_insert_xml_node(child, bookmark, sibling);
+	kz_xbel_insert_xml_node(child, KZ_BOOKMARK(folder), sibling);
 	kz_xbel_connect_signals(child, data);
 
 	if (kz_bookmark_file_get_state(KZ_BOOKMARK_FILE(data)) !=
@@ -1231,7 +1233,7 @@
 
 
 static void
-cb_bookmark_remove_child (KzBookmark *bookmark, KzBookmark *child, gpointer data)
+cb_bookmark_folder_remove_child (KzBookmarkFolder *folder, KzBookmark *child, gpointer data)
 {
 	gboolean updated;
 




More information about the Kazehakase-cvs mailing list
Zurück zum Archiv-Index