svnno****@sourc*****
svnno****@sourc*****
Fri Feb 13 07:47:31 JST 2009
Revision: 3653
http://svn.sourceforge.jp/view?root=kazehakase&view=rev&rev=3653
Author: ikezoe
Date: 2009-02-13 07:47:31 +0900 (Fri, 13 Feb 2009)
Log Message:
-----------
2009-02-13 Hiroyuki Ikezoe <poinc****@ikezo*****>
* libegg/pixbufthumbail, src/*: Use latest EggPixbufThumbnail.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/Makefile.am
kazehakase/trunk/configure.ac
kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
kazehakase/trunk/src/Makefile.am
kazehakase/trunk/src/kz-app.c
kazehakase/trunk/src/kz-app.h
kazehakase/trunk/src/kz-embed.c
kazehakase/trunk/src/kz-embed.h
kazehakase/trunk/src/kz-popup-preview.c
kazehakase/trunk/src/kz-popup-tablist.c
kazehakase/trunk/src/kz-tab-label.c
kazehakase/trunk/src/kz-thumbnails-view.c
kazehakase/trunk/src/utils/utils.c
kazehakase/trunk/src/utils/utils.h
kazehakase/trunk/src/widget/kz-thumbnail.c
Added Paths:
-----------
kazehakase/trunk/libegg/Makefile.am
Property Changed:
----------------
kazehakase/trunk/libegg/
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-02-12 22:25:52 UTC (rev 3652)
+++ kazehakase/trunk/ChangeLog 2009-02-12 22:47:31 UTC (rev 3653)
@@ -1,3 +1,7 @@
+2009-02-13 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * libegg/pixbufthumbail, src/*: Use latest EggPixbufThumbnail.
+
2009-02-12 Hiroyuki Ikezoe <poinc****@ikezo*****>
* configure.ac: Require GtkIEEmbed-0.9.1.
Modified: kazehakase/trunk/Makefile.am
===================================================================
--- kazehakase/trunk/Makefile.am 2009-02-12 22:25:52 UTC (rev 3652)
+++ kazehakase/trunk/Makefile.am 2009-02-12 22:47:31 UTC (rev 3653)
@@ -2,7 +2,7 @@
ACLOCAL_AMFLAGS = -I macros
-SUBDIRS = po src module ext etc data doc test
+SUBDIRS = po libegg src module ext etc data doc test
EXTRA_DIST = autogen.sh \
README.ja \
Modified: kazehakase/trunk/configure.ac
===================================================================
--- kazehakase/trunk/configure.ac 2009-02-12 22:25:52 UTC (rev 3652)
+++ kazehakase/trunk/configure.ac 2009-02-12 22:47:31 UTC (rev 3653)
@@ -21,16 +21,20 @@
AC_MSG_CHECKING([for some Win32 platform])
case "$host" in
*-*-mingw*|*-*-cygwin*)
- platform_win32=yes
+ platform="win32"
;;
+ *-apple-darwin*)
+ platform="os x"
+ ;;
*)
- platform_win32=no
+ platform="unix"
;;
esac
-AC_MSG_RESULT([$platform_win32])
+AC_MSG_RESULT([$platform])
AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
-AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+AM_CONDITIONAL(PLATFORM_WIN32, test "$platform" = "win32")
+AM_CONDITIONAL(PLATFORM_OSX, test "$platform" = "os x")
AC_ENABLE_SHARED(yes)
AC_ENABLE_STATIC(no)
@@ -95,7 +99,7 @@
dnl **************************************************************
dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified
dnl in MODULES, pass to pkg-config
-AM_PATH_GTK_2_0(2.12.0, , ,[gthread])
+AM_PATH_GTK_2_0(2.14.0, , ,[gthread])
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
@@ -198,6 +202,11 @@
dnl Check for Session Management
dnl **************************************************************
+EGG_CFLAGS="$GTK_CFLAGS"
+EGG_LIBS="$GTK_LIBS"
+AC_SUBST(EGG_CFLAGS)
+AC_SUBST(EGG_LIBS)
+
AC_PATH_XTRA
SM_LIBS=""
@@ -620,6 +629,7 @@
KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DKZ_EMBED_MODULEDIR=\\\"\"\$(embeddir)\"\\\""
AC_SUBST(KAZEHAKASE_CFLAGS)
+
AC_SUBST([AM_CPPFLAGS])
AC_SUBST([AM_CFLAGS])
AC_SUBST([AM_CXXFLAGS])
@@ -639,9 +649,8 @@
src/prefs_ui/Makefile
src/sidebar/Makefile
src/widget/Makefile
-src/libegg/Makefile
-src/libegg/md5/Makefile
-src/libegg/pixbufthumbnail/Makefile
+libegg/Makefile
+libegg/pixbufthumbnail/Makefile
module/Makefile
module/embed/Makefile
module/embed/gecko/Makefile
Property changes on: kazehakase/trunk/libegg
___________________________________________________________________
Added: svn:ignore
+ Makefile
Makefile.in
Added: kazehakase/trunk/libegg/Makefile.am
===================================================================
--- kazehakase/trunk/libegg/Makefile.am (rev 0)
+++ kazehakase/trunk/libegg/Makefile.am 2009-02-12 22:47:31 UTC (rev 3653)
@@ -0,0 +1 @@
+SUBDIRS = pixbufthumbnail
Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2009-02-12 22:25:52 UTC (rev 3652)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2009-02-12 22:47:31 UTC (rev 3653)
@@ -294,7 +294,7 @@
static void print_preview (KzEmbed *kzembed);
static GList *get_printer_list (KzEmbed *kzembed);
static void create_thumbnail (KzEmbed *kzembed,
- EggPixbufThumbSize size);
+ EggPixbufThumbnailSize size);
static gboolean save_with_content (KzEmbed *kzembed,
const char *rawfilename);
static gboolean set_text_into_textarea(KzEmbed *kzembed,
@@ -2818,7 +2818,7 @@
static void
-create_thumbnail (KzEmbed *kzembed, EggPixbufThumbSize size)
+create_thumbnail (KzEmbed *kzembed, EggPixbufThumbnailSize size)
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
Modified: kazehakase/trunk/src/Makefile.am
===================================================================
--- kazehakase/trunk/src/Makefile.am 2009-02-12 22:25:52 UTC (rev 3652)
+++ kazehakase/trunk/src/Makefile.am 2009-02-12 22:47:31 UTC (rev 3653)
@@ -1,7 +1,7 @@
# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*-
SUBDIRS = missing utils net actions bookmarks dialogs \
- widget prefs_ui sidebar libegg
+ widget prefs_ui sidebar
libkazehakasedir = $(libdir)/$(PACKAGE)
libkazehakase_LTLIBRARIES = libkazehakase.la
@@ -14,13 +14,12 @@
INCLUDES = \
-I$(top_srcdir)/src/actions \
-I$(top_srcdir)/src/bookmarks \
- -I$(top_srcdir)/src/libegg/pixbufthumbnail \
- -I$(top_srcdir)/src/libegg/md5 \
+ -I$(top_srcdir)/libegg/pixbufthumbnail \
-I$(top_srcdir)/src/net \
-I$(top_srcdir)/src/sidebar \
-I$(top_srcdir)/src/utils \
-I$(top_srcdir)/src/widget \
- -I$(top_builddir)/src/libegg/pixbufthumbnail
+ -I$(top_builddir)/libegg/pixbufthumbnail
EXTRA_DIST = \
kz-marshalers.list
Modified: kazehakase/trunk/src/kz-app.c
===================================================================
--- kazehakase/trunk/src/kz-app.c 2009-02-12 22:25:52 UTC (rev 3652)
+++ kazehakase/trunk/src/kz-app.c 2009-02-12 22:47:31 UTC (rev 3653)
@@ -172,7 +172,7 @@
NULL, NULL,
_kz_marshal_VOID__STRING_ENUM,
G_TYPE_NONE, 2,
- G_TYPE_STRING, EGG_TYPE_PIXBUF_THUMB_SIZE);
+ G_TYPE_STRING, EGG_TYPE_PIXBUF_THUMBNAIL_SIZE);
g_object_class_install_property(
object_class,
@@ -980,7 +980,7 @@
GdkPixbuf *pixbuf,
const gchar *uri,
time_t mtime,
- EggPixbufThumbSize size)
+ EggPixbufThumbnailSize size)
{
GError *error = NULL;
@@ -990,8 +990,9 @@
if (uri[0] == '\0')
return FALSE;
- if (!egg_pixbuf_add_thumbnail_data(pixbuf, uri, mtime, size))
- return FALSE;
+ egg_pixbuf_set_thumbnail_uri(pixbuf, uri);
+ egg_pixbuf_set_thumbnail_mtime(pixbuf, mtime);
+ egg_pixbuf_set_thumbnail_size(pixbuf, size);
if (!egg_pixbuf_save_thumbnail(pixbuf, &error, NULL))
{
Modified: kazehakase/trunk/src/kz-app.h
===================================================================
--- kazehakase/trunk/src/kz-app.h 2009-02-12 22:25:52 UTC (rev 3652)
+++ kazehakase/trunk/src/kz-app.h 2009-02-12 22:47:31 UTC (rev 3653)
@@ -55,7 +55,7 @@
/* -- signals -- */
void (*thumbnail_created) (KzApp *app,
const gchar *uri,
- EggPixbufThumbSize size);
+ EggPixbufThumbnailSize size);
};
GType kz_app_get_type (void) G_GNUC_CONST;
@@ -125,7 +125,7 @@
GdkPixbuf *pixbuf,
const gchar *uri,
time_t mtime,
- EggPixbufThumbSize size);
+ EggPixbufThumbnailSize size);
G_END_DECLS
Modified: kazehakase/trunk/src/kz-embed.c
===================================================================
--- kazehakase/trunk/src/kz-embed.c 2009-02-12 22:25:52 UTC (rev 3652)
+++ kazehakase/trunk/src/kz-embed.c 2009-02-12 22:47:31 UTC (rev 3653)
@@ -985,7 +985,7 @@
void
-kz_embed_create_thumbnail (KzEmbed *kzembed, EggPixbufThumbSize size)
+kz_embed_create_thumbnail (KzEmbed *kzembed, EggPixbufThumbnailSize size)
{
g_return_if_fail(KZ_IS_EMBED(kzembed));
Modified: kazehakase/trunk/src/kz-embed.h
===================================================================
--- kazehakase/trunk/src/kz-embed.h 2009-02-12 22:25:52 UTC (rev 3652)
+++ kazehakase/trunk/src/kz-embed.h 2009-02-12 22:47:31 UTC (rev 3653)
@@ -190,7 +190,7 @@
void (*print_preview) (KzEmbed *kzembed);
GList *(*get_printer_list) (KzEmbed *kzembed);
void (*create_thumbnail) (KzEmbed *kzembed,
- EggPixbufThumbSize size);
+ EggPixbufThumbnailSize size);
gboolean (*save_with_content) (KzEmbed *kzembed,
@@ -409,7 +409,7 @@
void kz_embed_print_preview (KzEmbed *kzembed);
GList *kz_embed_get_printer_list (KzEmbed *kzembed);
void kz_embed_create_thumbnail (KzEmbed *kzembed,
- EggPixbufThumbSize size);
+ EggPixbufThumbnailSize size);
gboolean kz_embed_save_with_content (KzEmbed *kzembed,
Modified: kazehakase/trunk/src/kz-popup-preview.c
===================================================================
--- kazehakase/trunk/src/kz-popup-preview.c 2009-02-12 22:25:52 UTC (rev 3652)
+++ kazehakase/trunk/src/kz-popup-preview.c 2009-02-12 22:47:31 UTC (rev 3653)
@@ -554,12 +554,12 @@
if (!uri) return NULL;
- filename = egg_pixbuf_get_thumb_filename(uri,
- EGG_PIXBUF_THUMB_LARGE);
+ filename = egg_pixbuf_get_thumbnail_filename(uri,
+ EGG_PIXBUF_THUMBNAIL_LARGE);
if(filename)
{
orig_pixbuf = egg_pixbuf_get_thumbnail_for_file(filename,
- EGG_PIXBUF_THUMB_NORMAL,
+ EGG_PIXBUF_THUMBNAIL_NORMAL,
NULL);
g_free(filename);
}
Modified: kazehakase/trunk/src/kz-popup-tablist.c
===================================================================
--- kazehakase/trunk/src/kz-popup-tablist.c 2009-02-12 22:25:52 UTC (rev 3652)
+++ kazehakase/trunk/src/kz-popup-tablist.c 2009-02-12 22:47:31 UTC (rev 3653)
@@ -240,7 +240,7 @@
g_list_free(list);
gtk_window_get_size(GTK_WINDOW(priv->kz), &width, NULL);
- width = MIN(length * (EGG_PIXBUF_THUMB_NORMAL + 4), width);
+ width = MIN(length * (EGG_PIXBUF_THUMBNAIL_NORMAL + 4), width);
gtk_window_set_default_size(GTK_WINDOW(popup),
width, -1);
gtk_widget_show(GTK_WIDGET(popup));
Modified: kazehakase/trunk/src/kz-tab-label.c
===================================================================
--- kazehakase/trunk/src/kz-tab-label.c 2009-02-12 22:25:52 UTC (rev 3652)
+++ kazehakase/trunk/src/kz-tab-label.c 2009-02-12 22:47:31 UTC (rev 3653)
@@ -482,7 +482,7 @@
{
KzTabLabel *kztab;
KzEmbed *embed;
- EggPixbufThumbSize size = EGG_PIXBUF_THUMB_LARGE;
+ EggPixbufThumbnailSize size = EGG_PIXBUF_THUMBNAIL_LARGE;
const gchar *uri;
guint last_modified;
Modified: kazehakase/trunk/src/kz-thumbnails-view.c
===================================================================
--- kazehakase/trunk/src/kz-thumbnails-view.c 2009-02-12 22:25:52 UTC (rev 3652)
+++ kazehakase/trunk/src/kz-thumbnails-view.c 2009-02-12 22:47:31 UTC (rev 3653)
@@ -182,10 +182,10 @@
gint width;
width = GTK_WIDGET(view)->allocation.width;
- if (width < EGG_PIXBUF_THUMB_NORMAL)
+ if (width < EGG_PIXBUF_THUMBNAIL_NORMAL)
xnum = 1;
else
- xnum = (width / EGG_PIXBUF_THUMB_NORMAL);
+ xnum = (width / EGG_PIXBUF_THUMBNAIL_NORMAL);
ypos = pos / xnum;
xpos = pos % xnum;
gtk_table_attach(GTK_TABLE(view),
Modified: kazehakase/trunk/src/utils/utils.c
===================================================================
--- kazehakase/trunk/src/utils/utils.c 2009-02-12 22:25:52 UTC (rev 3652)
+++ kazehakase/trunk/src/utils/utils.c 2009-02-12 22:47:31 UTC (rev 3653)
@@ -760,13 +760,13 @@
}
GTime
-thumbnail_get_last_modified (const gchar *uri, EggPixbufThumbSize size)
+thumbnail_get_last_modified (const gchar *uri, EggPixbufThumbnailSize size)
{
gchar *thumb_filename;
struct stat st;
int ret;
- thumb_filename = egg_pixbuf_get_thumb_filename(uri, size);
+ thumb_filename = egg_pixbuf_get_thumbnail_filename(uri, size);
ret = g_stat(thumb_filename, &st);
g_free(thumb_filename);
Modified: kazehakase/trunk/src/utils/utils.h
===================================================================
--- kazehakase/trunk/src/utils/utils.h 2009-02-12 22:25:52 UTC (rev 3652)
+++ kazehakase/trunk/src/utils/utils.h 2009-02-12 22:47:31 UTC (rev 3653)
@@ -50,7 +50,7 @@
const gchar *encode,
gboolean urlencode);
-GTime thumbnail_get_last_modified (const gchar *uri, EggPixbufThumbSize size);
+GTime thumbnail_get_last_modified (const gchar *uri, EggPixbufThumbnailSize size);
GTime history_get_last_modified (const gchar *uri);
gchar *kz_utils_complement_scheme (const gchar *url);
Modified: kazehakase/trunk/src/widget/kz-thumbnail.c
===================================================================
--- kazehakase/trunk/src/widget/kz-thumbnail.c 2009-02-12 22:25:52 UTC (rev 3652)
+++ kazehakase/trunk/src/widget/kz-thumbnail.c 2009-02-12 22:47:31 UTC (rev 3653)
@@ -83,7 +83,7 @@
}
static void
-cb_thumbnail_created (KzApp *app, const gchar *uri, EggPixbufThumbSize size,
+cb_thumbnail_created (KzApp *app, const gchar *uri, EggPixbufThumbnailSize size,
gpointer data)
{
KzThumbnail *thumbnail = data;
@@ -91,7 +91,7 @@
g_return_if_fail(KZ_IS_THUMBNAIL(thumbnail));
- if (size != EGG_PIXBUF_THUMB_LARGE)
+ if (size != EGG_PIXBUF_THUMBNAIL_LARGE)
return;
priv = KZ_THUMBNAIL_GET_PRIVATE(thumbnail);
@@ -162,10 +162,10 @@
if (uri && uri[0] != '\0')
{
- filename = egg_pixbuf_get_thumb_filename(uri,
- EGG_PIXBUF_THUMB_LARGE);
+ filename = egg_pixbuf_get_thumbnail_filename(uri,
+ EGG_PIXBUF_THUMBNAIL_LARGE);
pixbuf = egg_pixbuf_get_thumbnail_for_file(filename,
- EGG_PIXBUF_THUMB_NORMAL,
+ EGG_PIXBUF_THUMBNAIL_NORMAL,
NULL);
g_free(filename);
}
@@ -180,10 +180,10 @@
NULL);
dummy = gdk_pixbuf_new_from_file(dummy_file_name, NULL);
g_free(dummy_file_name);
- pixbuf = egg_pixbuf_create_thumbnail(dummy,
- "no_thumbnail",
- 0,
- EGG_PIXBUF_THUMB_NORMAL);
+ pixbuf = egg_pixbuf_get_thumbnail_for_pixbuf(dummy,
+ "no_thumbnail",
+ 0,
+ EGG_PIXBUF_THUMBNAIL_NORMAL);
g_object_unref(dummy);
}