svnno****@sourc*****
svnno****@sourc*****
Wed Mar 21 10:03:35 JST 2007
Revision: 2934
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=2934
Author: ikezoe
Date: 2007-03-21 10:03:34 +0900 (Wed, 21 Mar 2007)
Log Message:
-----------
* src/mozilla/*: Removed.
* src/Makefile.am, src/dialogs/Makefile.am, src/prefs_ui/Makefile.am:
Removed mozilla directory.
* module/embed/gecko/mozilla.cpp,
module/embed/gecko/mozilla-prefs.cpp: Came from src/mozilla/.
* src/dialogs/kz-password-manager-dialog.c, src/prefs_ui/prefs_font.c,
src/prefs_ui/prefs_general.c, src/prefs_ui/prefs_privacy.c,
src/prefs_uit/prefs_lang.c: Use kz_embed_prefs_xx() instead of
mozilla_xx().
TODO: We need an abstract layer of KzProfile to handle cookies or
passwords or something.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/Makefile.am
kazehakase/trunk/src/dialogs/Makefile.am
kazehakase/trunk/src/dialogs/kz-password-manager-dialog.c
kazehakase/trunk/src/prefs_ui/Makefile.am
kazehakase/trunk/src/prefs_ui/prefs_font.c
kazehakase/trunk/src/prefs_ui/prefs_general.c
kazehakase/trunk/src/prefs_ui/prefs_lang.c
kazehakase/trunk/src/prefs_ui/prefs_privacy.c
Added Paths:
-----------
kazehakase/trunk/module/embed/gecko/mozilla-prefs.h
kazehakase/trunk/module/embed/gecko/mozilla.h
Removed Paths:
-------------
kazehakase/trunk/src/mozilla/
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-21 00:54:58 UTC (rev 2933)
+++ kazehakase/trunk/ChangeLog 2007-03-21 01:03:34 UTC (rev 2934)
@@ -1,5 +1,19 @@
2007-03-21 Hiroyuki Ikezoe <poinc****@ikezo*****>
+ * src/mozilla/*: Removed.
+ * src/Makefile.am, src/dialogs/Makefile.am, src/prefs_ui/Makefile.am:
+ Removed mozilla directory.
+ * module/embed/gecko/mozilla.cpp,
+ module/embed/gecko/mozilla-prefs.cpp: Came from src/mozilla/.
+ * src/dialogs/kz-password-manager-dialog.c, src/prefs_ui/prefs_font.c,
+ src/prefs_ui/prefs_general.c, src/prefs_ui/prefs_privacy.c,
+ src/prefs_uit/prefs_lang.c: Use kz_embed_prefs_xx() instead of
+ mozilla_xx().
+ TODO: We need an abstract layer of KzProfile to handle cookies or
+ passwords or something.
+
+2007-03-21 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
* src/kz-embed-prefs.[ch]: get_string returns gboolean.
* src/kz-window.c: Use kz_embed_new() instead of kz_moz_embed_new().
* src/kz-embed-module-impl.h: KZ_EMBED_MODULE_IMPL_INIT needs KzApp.
Copied: kazehakase/trunk/module/embed/gecko/mozilla-prefs.h (from rev 2928, kazehakase/trunk/src/mozilla/mozilla-prefs.h)
Copied: kazehakase/trunk/module/embed/gecko/mozilla.h (from rev 2928, kazehakase/trunk/src/mozilla/mozilla.h)
Modified: kazehakase/trunk/src/Makefile.am
===================================================================
--- kazehakase/trunk/src/Makefile.am 2007-03-21 00:54:58 UTC (rev 2933)
+++ kazehakase/trunk/src/Makefile.am 2007-03-21 01:03:34 UTC (rev 2934)
@@ -2,7 +2,7 @@
SUBDIRS = utils net actions bookmarks dialogs \
widget prefs_ui sidebar libegg \
- mozilla khtml
+ khtml
libkazehakasedir = $(libdir)/$(PACKAGE)
libkazehakase_LTLIBRARIES = libkazehakase.la
@@ -21,15 +21,9 @@
-DG_LOG_DOMAIN=\"Kazehakase\" \
-DG_DISABLE_DEPRECATED=1
-if WITH_GECKO
-KZ_GECKO_CFLAGS = $(MOZILLA_COMPONENT_CFLAGS) \
- -I$(top_srcdir)/src/mozilla
-endif
-
INCLUDES = \
$(GTK_CFLAGS) \
$(LIBGNUTLS_CFLAGS) \
- $(KZ_GECKO_CFLAGS) \
-I$(top_srcdir)/src/actions \
-I$(top_srcdir)/src/bookmarks \
-I$(top_srcdir)/src/libegg/pixbufthumbnail \
@@ -53,19 +47,10 @@
kazehakase_LDADD = libkazehakase.la
-if WITH_GECKO
-kazehakase_LDFLAGS = -R$(MOZILLA_HOME)
-endif
-
if ENABLE_GTK_WEBCORE
LIBKZWEBCORE=$(top_builddir)/src/khtml/libkzkhtml.la
endif
-if WITH_GECKO
-LIBKZGECKO=$(top_builddir)/src/mozilla/libkzmozilla.la \
- $(MOZILLA_COMPONENT_LIBS)
-endif
-
libkazehakase_public_h_sources = \
kazehakase.h \
kz-app.h \
@@ -146,10 +131,6 @@
nodist_libkazehakase_la_SOURCES = $(marshal_sources)
-if WITH_GECKO
-libkazehakase_la_LDFLAGS = -R$(MOZILLA_HOME)
-endif
-
libkazehakase_la_LIBADD = \
$(INTLLIBS) \
$(GTK_LIBS) \
@@ -157,7 +138,6 @@
$(LIBGNUTLS_LIBS) \
$(top_builddir)/src/utils/libkzutils.la \
$(top_builddir)/src/actions/libkzactions.la \
- $(LIBKZGECKO) \
$(LIBKZWEBCORE) \
$(top_builddir)/src/sidebar/libkzsidebar.la \
$(top_builddir)/src/bookmarks/libkzbookmarks.la \
Modified: kazehakase/trunk/src/dialogs/Makefile.am
===================================================================
--- kazehakase/trunk/src/dialogs/Makefile.am 2007-03-21 00:54:58 UTC (rev 2933)
+++ kazehakase/trunk/src/dialogs/Makefile.am 2007-03-21 01:03:34 UTC (rev 2934)
@@ -4,11 +4,9 @@
INCLUDES = \
$(GTK_CFLAGS) \
- $(MOZILLA_COMPONENT_CFLAGS) \
-I$(top_srcdir)/src/actions \
-I$(top_srcdir)/src/bookmarks \
-I$(top_srcdir)/src/gtk24backports \
- -I$(top_srcdir)/src/mozilla \
-I$(top_srcdir)/src/utils \
-I$(top_srcdir)/src/widget \
-I$(top_srcdir)/src
Modified: kazehakase/trunk/src/dialogs/kz-password-manager-dialog.c
===================================================================
--- kazehakase/trunk/src/dialogs/kz-password-manager-dialog.c 2007-03-21 00:54:58 UTC (rev 2933)
+++ kazehakase/trunk/src/dialogs/kz-password-manager-dialog.c 2007-03-21 01:03:34 UTC (rev 2934)
@@ -25,7 +25,7 @@
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
-#include "mozilla.h"
+#include "kz-embed-prefs.h"
#include "kz-icons.h"
enum {
@@ -181,6 +181,7 @@
GObjectClass *klass = G_OBJECT_CLASS(kz_password_manager_dialog_parent_class);
GList *list = NULL, *node;
gboolean result;
+ KzEmbedPrefs *embed_prefs = NULL;
object = klass->constructor(type, n_props, props);
@@ -191,7 +192,8 @@
gtk_window_set_transient_for(GTK_WINDOW(password_manager),
GTK_WINDOW(password_manager->kz));
- result = mozilla_get_passwords(&list);
+#warning FIXME! KzProfile shoulw handles password.
+ result = kz_embed_prefs_get_passwords(embed_prefs, &list);
if (!result || !list) return object;
for (node = list; node; node = g_list_next(node))
@@ -318,6 +320,7 @@
GtkTreeSelection *selection;
GtkTreeModel *model = NULL;
GList *list, *node, *pass = NULL;
+ KzEmbedPrefs *embed_prefs = NULL;
g_return_if_fail(KZ_IS_PASSWORD_MANAGER_DIALOG(password_manager));
@@ -348,7 +351,8 @@
gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
gtk_tree_path_free(path);
}
- mozilla_remove_passwords(pass);
+#warning FIXME! KzProfile shoulw handles password.
+ kz_embed_prefs_remove_passwords(embed_prefs, pass);
g_list_free(list);
g_list_free(pass);
Modified: kazehakase/trunk/src/prefs_ui/Makefile.am
===================================================================
--- kazehakase/trunk/src/prefs_ui/Makefile.am 2007-03-21 00:54:58 UTC (rev 2933)
+++ kazehakase/trunk/src/prefs_ui/Makefile.am 2007-03-21 01:03:34 UTC (rev 2934)
@@ -3,11 +3,9 @@
noinst_LTLIBRARIES = libkzprefsui.la
INCLUDES = \
- $(MOZILLA_COMPONENT_CFLAGS) \
$(GTK_CFLAGS) \
-I$(top_srcdir)/src/utils \
-I$(top_srcdir)/src/widget \
- -I$(top_srcdir)/src/mozilla \
-I$(top_srcdir)/src/bookmarks \
-I$(top_srcdir)/src
Modified: kazehakase/trunk/src/prefs_ui/prefs_font.c
===================================================================
--- kazehakase/trunk/src/prefs_ui/prefs_font.c 2007-03-21 00:54:58 UTC (rev 2933)
+++ kazehakase/trunk/src/prefs_ui/prefs_font.c 2007-03-21 01:03:34 UTC (rev 2934)
@@ -22,7 +22,7 @@
#include <string.h>
#include <glib/gi18n.h>
-#include "mozilla-prefs.h"
+#include "kz-embed-prefs.h"
#include "kazehakase.h"
#include "gtk-utils.h"
@@ -216,12 +216,13 @@
gchar *default_font = NULL;
GtkListStore *store;
gint select = 0, i = 0;
+ KzEmbedPrefs *embed_prefs = NULL;
/* remove old list */
store = GTK_LIST_STORE(gtk_combo_box_get_model(combo));
gtk_list_store_clear(store);
- mozilla_prefs_get_font_list(lang, type,
+ kz_embed_prefs_get_font_list(embed_prefs, lang, type,
&fonts, &all_fonts,
&default_font);
@@ -272,6 +273,7 @@
gchar key[256];
gint keysize = G_N_ELEMENTS(key);
gint use_size;
+ KzEmbedPrefs *embed_prefs = NULL;
g_return_if_fail(GTK_IS_SPIN_BUTTON(spin));
g_return_if_fail(type && *type);
@@ -281,7 +283,7 @@
if (size)
use_size = size;
- else if (!mozilla_prefs_get_int(key, &use_size))
+ else if (!kz_embed_prefs_get_int(embed_prefs, key, &use_size))
use_size = 0;
if (use_size)
@@ -514,6 +516,7 @@
GtkWidget *main_vbox, *vbox, *hbox;
GtkWidget *frame, *table, *label, *option_menu, *combo, *spin;
gchar *str = NULL;
+ KzEmbedPrefs *embed_prefs = NULL;
prefsui->prefs_list = NULL;
prefsui->freeze = FALSE;
@@ -750,7 +753,7 @@
gtk_label_set_mnemonic_widget(GTK_LABEL(label), spin);
- mozilla_prefs_get_string("font.default", &str);
+ kz_embed_prefs_get_string(embed_prefs, "font.default", &str);
GTKUTIL_SET_DEFAULT_HISTORY(prefsui->propotional_menu,
str,
font_styles, n_font_styles, style);
@@ -759,7 +762,7 @@
g_free(str);
str =NULL;
}
- mozilla_prefs_get_string("font.language.group", &str);
+ kz_embed_prefs_get_string(embed_prefs, "font.language.group", &str);
GTKUTIL_SET_DEFAULT_HISTORY(prefsui->lang_option_menu,
str,
fonts_language, n_fonts_languages, code);
@@ -780,6 +783,7 @@
{
GList *node;
guint i;
+ KzEmbedPrefs *embed_prefs = NULL;
g_return_if_fail(prefsui);
@@ -796,55 +800,55 @@
{
g_snprintf(key, keysize, "font.name.serif.%s",
pref->lang);
- mozilla_prefs_set_string(key, pref->serif);
+ kz_embed_prefs_set_string(embed_prefs, key, pref->serif);
}
if (pref->sans_serif)
{
g_snprintf(key, keysize, "font.name.sans-serif.%s",
pref->lang);
- mozilla_prefs_set_string(key, pref->sans_serif);
+ kz_embed_prefs_set_string(embed_prefs, key, pref->sans_serif);
}
if (pref->monospace)
{
g_snprintf(key, keysize, "font.name.monospace.%s",
pref->lang);
- mozilla_prefs_set_string(key, pref->monospace);
+ kz_embed_prefs_set_string(embed_prefs, key, pref->monospace);
}
if (pref->variable_size)
{
g_snprintf(key, keysize, "font.size.variable.%s",
pref->lang);
- mozilla_prefs_set_int(key, pref->variable_size);
+ kz_embed_prefs_set_int(embed_prefs, key, pref->variable_size);
}
if (pref->fixed_size)
{
g_snprintf(key, keysize, "font.size.fixed.%s",
pref->lang);
- mozilla_prefs_set_int(key, pref->fixed_size);
+ kz_embed_prefs_set_int(embed_prefs, key, pref->fixed_size);
}
if (pref->min_size)
{
g_snprintf(key, keysize, "font.min-size.variable.%s",
pref->lang);
- mozilla_prefs_set_int(key, pref->min_size);
+ kz_embed_prefs_set_int(embed_prefs, key, pref->min_size);
g_snprintf(key, keysize, "font.min-size.fixed.%s",
pref->lang);
- mozilla_prefs_set_int(key, pref->min_size);
+ kz_embed_prefs_set_int(embed_prefs, key, pref->min_size);
}
}
i = gtk_combo_box_get_active(prefsui->propotional_menu);
if (i >= 0 && i < n_font_styles)
- mozilla_prefs_set_string("font.default", font_styles[i].style);
+ kz_embed_prefs_set_string(embed_prefs, "font.default", font_styles[i].style);
i = gtk_combo_box_get_active(prefsui->lang_option_menu);
if (i >= 0 && i < n_fonts_languages)
- mozilla_prefs_set_string("font.language.group",
+ kz_embed_prefs_set_string(embed_prefs, "font.language.group",
fonts_language[i].code);
}
Modified: kazehakase/trunk/src/prefs_ui/prefs_general.c
===================================================================
--- kazehakase/trunk/src/prefs_ui/prefs_general.c 2007-03-21 00:54:58 UTC (rev 2933)
+++ kazehakase/trunk/src/prefs_ui/prefs_general.c 2007-03-21 01:03:34 UTC (rev 2934)
@@ -24,7 +24,7 @@
#include "kazehakase.h"
#include "kz-window.h"
#include "kz-embed.h"
-#include "mozilla-prefs.h"
+#include "kz-embed-prefs.h"
#include "utils/gtk-utils.h"
#define DATA_KEY "KzPrefsGeneral::info"
@@ -323,6 +323,7 @@
prefs_general_response (GtkWidget *widget, gint response)
{
KzPrefsGeneral *prefsui = g_object_get_data(G_OBJECT(widget), DATA_KEY);
+ KzEmbedPrefs *embed_prefs = NULL;
g_return_if_fail(prefsui);
@@ -345,7 +346,7 @@
KZ_CONF_SET_STR("Global", "user_agent", value);
if (override)
{
- mozilla_prefs_set_string("general.useragent.override", value);
+ kz_embed_prefs_set_string(embed_prefs, "general.useragent.override", value);
}
else
{
Modified: kazehakase/trunk/src/prefs_ui/prefs_lang.c
===================================================================
--- kazehakase/trunk/src/prefs_ui/prefs_lang.c 2007-03-21 00:54:58 UTC (rev 2933)
+++ kazehakase/trunk/src/prefs_ui/prefs_lang.c 2007-03-21 01:03:34 UTC (rev 2934)
@@ -25,7 +25,7 @@
#include "kazehakase.h"
#include "kz-dlist.h"
-#include "mozilla-prefs.h"
+#include "kz-embed-prefs.h"
#include "gtk-utils.h"
#define DATA_KEY "KzPrefsLang::info"
@@ -79,6 +79,7 @@
GtkWidget *label, *table, *option_menu, *frame,*dlist;
gchar *str, **langs;
guint i;
+ KzEmbedPrefs *embed_prefs = NULL;
prefsui->enabled_list_updated = FALSE;
@@ -130,7 +131,7 @@
GTKUTIL_CREATE_MENU(option_menu, languages, n_languages, name);
- mozilla_prefs_get_string("intl.charset.default", &str);
+ kz_embed_prefs_get_string(embed_prefs, "intl.charset.default", &str);
GTKUTIL_SET_DEFAULT_HISTORY(option_menu, str,
languages, n_languages, code);
if (str)
@@ -163,7 +164,7 @@
n_encoding_autodetectors,
title);
- mozilla_prefs_get_string("intl.charset.detector", &str);
+ kz_embed_prefs_get_string(embed_prefs, "intl.charset.detector", &str);
GTKUTIL_SET_DEFAULT_HISTORY(option_menu, str,
encoding_autodetectors, n_encoding_autodetectors,
name);
@@ -193,7 +194,7 @@
kz_dlist_append_available_item(KZ_DLIST(dlist), name, code);
}
- mozilla_prefs_get_string("intl.accept_languages", &str);
+ kz_embed_prefs_get_string(embed_prefs, "intl.accept_languages", &str);
langs = g_strsplit(str, ",", -1);
g_free(str);
if (langs)
@@ -216,6 +217,7 @@
prefs_lang_apply (KzPrefsLang *prefsui)
{
guint i, j;
+ KzEmbedPrefs *embed_prefs = NULL;
g_return_if_fail(prefsui);
@@ -223,12 +225,12 @@
j = gtk_combo_box_get_active(GTK_COMBO_BOX(prefsui->option_menu_autodetect));
if (i >= 0 && i < n_languages)
{
- mozilla_prefs_set_string("intl.charset.default",
+ kz_embed_prefs_set_string(embed_prefs, "intl.charset.default",
languages[i].code);
}
if (j >= 0 && j < n_encoding_autodetectors)
{
- if (mozilla_prefs_set_string("intl.charset.detector",
+ if (kz_embed_prefs_set_string(embed_prefs, "intl.charset.detector",
encoding_autodetectors[j].name));
}
@@ -250,7 +252,7 @@
g_free(tmp);
g_free(lang);
}
- mozilla_prefs_set_string("intl.accept_languages", langs);
+ kz_embed_prefs_set_string(embed_prefs, "intl.accept_languages", langs);
g_free(langs);
prefsui->enabled_list_updated = FALSE;
}
Modified: kazehakase/trunk/src/prefs_ui/prefs_privacy.c
===================================================================
--- kazehakase/trunk/src/prefs_ui/prefs_privacy.c 2007-03-21 00:54:58 UTC (rev 2933)
+++ kazehakase/trunk/src/prefs_ui/prefs_privacy.c 2007-03-21 01:03:34 UTC (rev 2934)
@@ -21,8 +21,8 @@
#include "prefs_privacy.h"
#include <glib/gi18n.h>
-#include "mozilla-prefs.h"
#include "kazehakase.h"
+#include "kz-embed-prefs.h"
#include "kz-window.h"
#define DATA_KEY "KzPrefsPrivacy::info"
@@ -117,6 +117,7 @@
GtkAdjustment *adj;
gint behaviour, lifetime, span;
gboolean except;
+ KzEmbedPrefs *embed_prefs = NULL;
main_vbox = gtk_vbox_new(FALSE, 0);
prefsui->main_vbox = main_vbox;
@@ -155,7 +156,7 @@
GTK_RADIO_BUTTON(radio1),
_("_Block cookies"));
- mozilla_prefs_get_int("network.cookie.cookieBehavior", &behaviour);
+ kz_embed_prefs_get_int(embed_prefs, "network.cookie.cookieBehavior", &behaviour);
switch (behaviour)
{
case 0:
@@ -214,7 +215,7 @@
gtk_box_pack_start(GTK_BOX(hbox), radio2, FALSE, FALSE, 0);
prefsui->except_check = check =
gtk_check_button_new_with_mnemonic(_("e_xcept for session cookies"));
- mozilla_prefs_get_boolean("network.cookie.alwaysAcceptSessionCookies", &except);
+ kz_embed_prefs_get_boolean(embed_prefs, "network.cookie.alwaysAcceptSessionCookies", &except);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), except);
gtk_box_pack_start(GTK_BOX(hbox), check, FALSE, FALSE, 2);
gtk_widget_set_sensitive(check, FALSE);
@@ -233,7 +234,7 @@
prefsui->span_spin = spin
= gtk_spin_button_new_with_range(0, 1000, 1);
adj = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(spin));
- mozilla_prefs_get_int("network.cookie.lifetime.days", &span);
+ kz_embed_prefs_get_int(embed_prefs, "network.cookie.lifetime.days", &span);
gtk_adjustment_set_value(adj, span);
gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 2);
gtk_widget_set_sensitive(spin, FALSE);
@@ -253,7 +254,7 @@
g_signal_connect(radio4, "toggled",
G_CALLBACK(cb_lifespan_span_changed), prefsui);
- mozilla_prefs_get_int("network.cookie.lifetimePolicy", &lifetime);
+ kz_embed_prefs_get_int(embed_prefs, "network.cookie.lifetimePolicy", &lifetime);
switch (lifetime)
{
case 0:
@@ -325,6 +326,7 @@
gint behaviour = 0;
gint lifetime = 0;
gint span, length;
+ KzEmbedPrefs *embed_prefs = NULL;
gboolean except;
if (!prefsui->changed)
@@ -343,7 +345,7 @@
break;
behaviour++;
}
- mozilla_prefs_set_int("network.cookie.cookieBehavior",
+ kz_embed_prefs_set_int(embed_prefs, "network.cookie.cookieBehavior",
(length - 1) - behaviour);
/* cokkie lifetime */
@@ -359,20 +361,20 @@
break;
lifetime++;
}
- mozilla_prefs_set_int("network.cookie.lifetimePolicy",
+ kz_embed_prefs_set_int(embed_prefs, "network.cookie.lifetimePolicy",
(length - 1) - lifetime);
/* cookie lifespan days */
adj = gtk_spin_button_get_adjustment
(GTK_SPIN_BUTTON(prefsui->span_spin));
span = gtk_adjustment_get_value(adj);
- mozilla_prefs_set_int("network.cookie.lifetime.days",
+ kz_embed_prefs_set_int(embed_prefs, "network.cookie.lifetime.days",
span);
/* except for session cookies */
except = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON(prefsui->except_check));
- mozilla_prefs_set_boolean("network.cookie.alwaysAcceptSessionCookies",
+ kz_embed_prefs_set_boolean(embed_prefs, "network.cookie.alwaysAcceptSessionCookies",
except);
prefsui->changed = FALSE;