svnno****@sourc*****
svnno****@sourc*****
Tue Mar 27 12:17:20 JST 2007
Revision: 3042
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3042
Author: kous
Date: 2007-03-27 12:17:20 +0900 (Tue, 27 Mar 2007)
Log Message:
-----------
* src/kz-popup-preview.c (kz_popup_preview_get_image): used
KZ_GET_POPUP_DIR.
* src/kazehakase.h (IMAGE_DIR): removed.
* src/kz-app.c (kz_app_init_path): fixed history and popup path.
* src/widget/kz-thusrc/widget/kz-thumbnail.c: removed KZ_DATADIR.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/kazehakase.h
kazehakase/trunk/src/kz-app.c
kazehakase/trunk/src/kz-popup-preview.c
kazehakase/trunk/src/widget/Makefile.am
kazehakase/trunk/src/widget/kz-thumbnail.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-27 02:46:06 UTC (rev 3041)
+++ kazehakase/trunk/ChangeLog 2007-03-27 03:17:20 UTC (rev 3042)
@@ -1,5 +1,14 @@
2007-03-27 Kouhei Sutou <kou****@cozmi*****>
+ * src/kz-popup-preview.c (kz_popup_preview_get_image): used
+ KZ_GET_POPUP_DIR.
+
+ * src/kazehakase.h (IMAGE_DIR): removed.
+
+ * src/kz-app.c (kz_app_init_path): fixed history and popup path.
+
+ * src/widget/kz-thusrc/widget/kz-thumbnail.c: removed KZ_DATADIR.
+
* src/kz-app.c (kz_app_init_path): fixed a user_dir bug.
* ext/ruby/kz-rb-ext.[ch], ext/ruby/Makefile.am: used KZ_GET_XXX
@@ -8,8 +17,8 @@
* src/kz-app.[ch], src/kazehakase.h, src/Makefile.am: added
user_dir, system_data_dir, system_ruby_ext_dir.
- * data/ext/ruby/kz/ruby-dialog.rb (Kz::RubyDialog): followed the
- above changes.
+ * data/ext/ruby/kz/ruby-dialog.rb (Kz::RubyDialog): used
+ Kz::USER_DIR instead of Kz::CONFIG_DIR.
2007-03-27 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/src/kazehakase.h
===================================================================
--- kazehakase/trunk/src/kazehakase.h 2007-03-27 02:46:06 UTC (rev 3041)
+++ kazehakase/trunk/src/kazehakase.h 2007-03-27 03:17:20 UTC (rev 3042)
@@ -35,7 +35,6 @@
#define KZ_THUMB_HEIGHT 200
#define HISTORY_DIR G_DIR_SEPARATOR_S"."PACKAGE G_DIR_SEPARATOR_S"history"G_DIR_SEPARATOR_S
-#define IMAGE_DIR G_DIR_SEPARATOR_S"."PACKAGE G_DIR_SEPARATOR_S"popup"G_DIR_SEPARATOR_S
extern KzApp *kz_app;
Modified: kazehakase/trunk/src/kz-app.c
===================================================================
--- kazehakase/trunk/src/kz-app.c 2007-03-27 02:46:06 UTC (rev 3041)
+++ kazehakase/trunk/src/kz-app.c 2007-03-27 03:17:20 UTC (rev 3042)
@@ -246,12 +246,13 @@
priv->user_dir = g_build_filename(g_get_home_dir(),
"."PACKAGE,
NULL);
- priv->history_dir = g_build_filename(priv->user_dir, HISTORY_DIR,
+ priv->history_dir = g_build_filename(priv->user_dir,
+ "history",
NULL);
priv->history_time_stamp = g_build_filename(priv->history_dir,
"time-stamp",
NULL);
- priv->popup_dir = g_build_filename(priv->user_dir, IMAGE_DIR, NULL);
+ priv->popup_dir = g_build_filename(priv->user_dir, "popup", NULL);
priv->system_data_dir = g_strdup(KZ_DATADIR);
priv->system_ruby_ext_dir = g_strdup(KZ_RUBY_EXTDIR);
Modified: kazehakase/trunk/src/kz-popup-preview.c
===================================================================
--- kazehakase/trunk/src/kz-popup-preview.c 2007-03-27 02:46:06 UTC (rev 3041)
+++ kazehakase/trunk/src/kz-popup-preview.c 2007-03-27 03:17:20 UTC (rev 3042)
@@ -495,9 +495,7 @@
tmp_name = egg_str_get_md5_str(uri);
image_name = g_strconcat(tmp_name, ".png", NULL);
- popup_file_name = g_build_filename(g_get_home_dir(),
- "."PACKAGE,
- "popup",
+ popup_file_name = g_build_filename(KZ_GET_POPUP_DIR,
image_name,
NULL);
g_free(tmp_name);
Modified: kazehakase/trunk/src/widget/Makefile.am
===================================================================
--- kazehakase/trunk/src/widget/Makefile.am 2007-03-27 02:46:06 UTC (rev 3041)
+++ kazehakase/trunk/src/widget/Makefile.am 2007-03-27 03:17:20 UTC (rev 3042)
@@ -2,13 +2,14 @@
noinst_LTLIBRARIES = libkzwidget.la
-INCLUDES = \
- $(GTK_CFLAGS) \
- -I$(top_srcdir)/src/libegg/pixbufthumbnail \
+INCLUDES = \
+ $(GTK_CFLAGS) \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/bookmarks \
+ -I$(top_srcdir)/src/libegg/pixbufthumbnail \
-I$(top_srcdir)/src/utils
-AM_CPPFLAGS= \
- -DKZ_DATADIR=\""$(datadir)/$(PACKAGE)"\"
+AM_CPPFLAGS= \
-DG_LOG_DOMAIN=\"Kazehakase-Widget\"
libkzwidget_public_h_sources = \
Modified: kazehakase/trunk/src/widget/kz-thumbnail.c
===================================================================
--- kazehakase/trunk/src/widget/kz-thumbnail.c 2007-03-27 02:46:06 UTC (rev 3041)
+++ kazehakase/trunk/src/widget/kz-thumbnail.c 2007-03-27 03:17:20 UTC (rev 3042)
@@ -19,6 +19,7 @@
*/
#include "kz-thumbnail.h"
+#include "kazehakase.h"
#include <string.h>
#include <glib/gi18n.h>
@@ -64,7 +65,7 @@
}
void
-kz_thumbnail_set_thumbnail_from_uri (KzThumbnail *thumbnail,
+kz_thumbnail_set_thumbnail_from_uri (KzThumbnail *thumbnail,
const gchar *uri)
{
GdkPixbuf *pixbuf = NULL;
@@ -72,7 +73,7 @@
if (uri && strlen(uri))
{
- filename = egg_pixbuf_get_thumb_filename(uri,
+ filename = egg_pixbuf_get_thumb_filename(uri,
EGG_PIXBUF_THUMB_LARGE);
pixbuf = egg_pixbuf_get_thumbnail_for_file(filename,
EGG_PIXBUF_THUMB_NORMAL,
@@ -82,9 +83,14 @@
if (!pixbuf) /* dummy pixbuf */
{
+ gchar *dummy_file_name;
GdkPixbuf *dummy;
- dummy = gdk_pixbuf_new_from_file(KZ_DATADIR"/kz-no-thumbnail.png",
- NULL);
+
+ dummy_file_name = g_build_filename(KZ_GET_SYSTEM_DATA_DIR,
+ "kz-no-thumbnail.png",
+ 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,