Hiroyuki Ikezoe
ikezo****@users*****
Sun Dec 31 10:59:41 JST 2006
Index: kazehakase/src/bookmarks/kz-bookmark-item.c
diff -u kazehakase/src/bookmarks/kz-bookmark-item.c:1.22 kazehakase/src/bookmarks/kz-bookmark-item.c:1.23
--- kazehakase/src/bookmarks/kz-bookmark-item.c:1.22 Sat Dec 2 18:22:27 2006
+++ kazehakase/src/bookmarks/kz-bookmark-item.c Sun Dec 31 10:59:41 2006
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: kz-bookmark-item.c,v 1.22 2006/12/02 09:22:27 ikezoe Exp $
+ * $Id: kz-bookmark-item.c,v 1.23 2006/12/31 01:59:41 ikezoe Exp $
*/
#include "kz-bookmark-item.h"
@@ -233,16 +233,13 @@
}
else
{
- KzFavicon *kzfav;
+ KzFavicon *kzfav = KZ_GET_FAVICON;
GtkWidget *favicon = NULL;
/* favicon */
- /* kzfav = item->kz->kzfav; */
- kzfav = kz_favicon_get_instance();
favicon = kz_favicon_get_widget(kzfav,
kz_bookmark_get_link(item->bookmark),
KZ_ICON_SIZE_BOOKMARK_MENU);
- g_object_unref(kzfav);
if (favicon)
{
item->image = image = favicon;
Index: kazehakase/src/bookmarks/kz-bookmark-menu-item.c
diff -u kazehakase/src/bookmarks/kz-bookmark-menu-item.c:1.9 kazehakase/src/bookmarks/kz-bookmark-menu-item.c:1.10
--- kazehakase/src/bookmarks/kz-bookmark-menu-item.c:1.9 Sat Dec 2 18:22:27 2006
+++ kazehakase/src/bookmarks/kz-bookmark-menu-item.c Sun Dec 31 10:59:41 2006
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: kz-bookmark-menu-item.c,v 1.9 2006/12/02 09:22:27 ikezoe Exp $
+ * $Id: kz-bookmark-menu-item.c,v 1.10 2006/12/31 01:59:41 ikezoe Exp $
*/
#include "kz-bookmark-menu-item.h"
@@ -123,12 +123,10 @@
#endif
/* favicon */
- /* kzfav = parent->kz->kzfav; */
- kzfav = kz_favicon_get_instance();
+ kzfav = KZ_GET_FAVICON;
image = kz_favicon_get_widget(kzfav,
kz_bookmark_get_link(bookmark),
KZ_ICON_SIZE_BOOKMARK_MENU);
- g_object_unref(kzfav);
if (image)
{
gtk_widget_show(image);
Index: kazehakase/src/bookmarks/kz-bookmark-tab-menu.c
diff -u kazehakase/src/bookmarks/kz-bookmark-tab-menu.c:1.9 kazehakase/src/bookmarks/kz-bookmark-tab-menu.c:1.10
--- kazehakase/src/bookmarks/kz-bookmark-tab-menu.c:1.9 Sun Dec 31 09:39:02 2006
+++ kazehakase/src/bookmarks/kz-bookmark-tab-menu.c Sun Dec 31 10:59:41 2006
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: kz-bookmark-tab-menu.c,v 1.9 2006/12/31 00:39:02 ikezoe Exp $
+ * $Id: kz-bookmark-tab-menu.c,v 1.10 2006/12/31 01:59:41 ikezoe Exp $
*/
#include "kz-bookmark-tab-menu.h"
@@ -66,7 +66,7 @@
KzBookmark *cur_page;
gint cur_pos;
GList *pages;
- KzFavicon *kzfav = kz->kzfav;
+ KzFavicon *kzfav = KZ_GET_FAVICON;
g_return_val_if_fail(KZ_IS_BOOKMARK(bookmark), NULL);
g_return_val_if_fail(kz_bookmark_is_folder(bookmark), NULL);
Index: kazehakase/src/bookmarks/kz-bookmarks-view.c
diff -u kazehakase/src/bookmarks/kz-bookmarks-view.c:1.33 kazehakase/src/bookmarks/kz-bookmarks-view.c:1.34
--- kazehakase/src/bookmarks/kz-bookmarks-view.c:1.33 Sun Dec 31 09:39:02 2006
+++ kazehakase/src/bookmarks/kz-bookmarks-view.c Sun Dec 31 10:59:41 2006
@@ -17,13 +17,14 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: kz-bookmarks-view.c,v 1.33 2006/12/31 00:39:02 ikezoe Exp $
+ * $Id: kz-bookmarks-view.c,v 1.34 2006/12/31 01:59:41 ikezoe Exp $
*/
#include "kz-bookmarks-view.h"
#include <glib/gi18n.h>
#include <string.h>
+#include "kazehakase.h"
#include "kz-bookmark-file.h"
#include "kz-smart-bookmark.h"
#include "kz-favicon.h"
@@ -530,7 +531,7 @@
}
else
{
- KzFavicon *kz_favicon = kz_favicon_get_instance();
+ KzFavicon *kz_favicon = KZ_GET_FAVICON;
favicon = kz_favicon_get_pixbuf(kz_favicon, uri,
GTK_ICON_SIZE_MENU);
@@ -547,7 +548,6 @@
NULL);
g_object_unref(image);
}
- g_object_unref(kz_favicon);
}
if (priv->editable)