svnno****@sourc*****
svnno****@sourc*****
Fri Mar 23 11:37:05 JST 2007
Revision: 2969
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=2969
Author: ikezoe
Date: 2007-03-23 11:37:05 +0900 (Fri, 23 Mar 2007)
Log Message:
-----------
* src/prefs_ui/prefs_privacy.c: Use KZ_CONF_SET instead of
kz_embed_prefs_set_xx().
* src/embed/gecko/kz-gecko-single.cpp: Handle "Privacy::changed"
signal.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gecko/kz-gecko-single.cpp
kazehakase/trunk/src/prefs_ui/prefs_privacy.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-23 02:25:30 UTC (rev 2968)
+++ kazehakase/trunk/ChangeLog 2007-03-23 02:37:05 UTC (rev 2969)
@@ -1,3 +1,10 @@
+2007-03-23 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * src/prefs_ui/prefs_privacy.c: Use KZ_CONF_SET instead of
+ kz_embed_prefs_set_xx().
+ * src/embed/gecko/kz-gecko-single.cpp: Handle "Privacy::changed"
+ signal.
+
2007-03-23 Kouhei Sutou <kou****@cozmi*****>
* module/embed/gecko/Makefile.am (gecko_la_LIBADD): added
Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-single.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-single.cpp 2007-03-23 02:25:30 UTC (rev 2968)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-single.cpp 2007-03-23 02:37:05 UTC (rev 2969)
@@ -78,6 +78,11 @@
const gchar *key,
const gchar *old_value,
gpointer data);
+static void cb_privacy_profile_changed(KzProfile *profile,
+ const gchar *section,
+ const gchar *key,
+ const gchar *old_value,
+ gpointer data);
static KzGeckoSingle *the_kz_gecko_single = NULL;
@@ -145,6 +150,8 @@
G_CALLBACK(cb_font_profile_changed), NULL);
g_signal_connect(profile, "changed::Language",
G_CALLBACK(cb_lang_profile_changed), NULL);
+ g_signal_connect(profile, "changed::Privacy",
+ G_CALLBACK(cb_privacy_profile_changed), NULL);
mozilla_register_components();
}
@@ -452,6 +459,56 @@
}
}
+static void
+cb_privacy_profile_changed (KzProfile *profile,
+ const gchar *section,
+ const gchar *key,
+ const gchar *old_value,
+ gpointer data)
+{
+ gchar *converted_key;
+
+ switch (key[0])
+ {
+ case 'c':// cookie
+ if (!strcmp(key, "cookie_behaviour"))
+ {
+ gint value;
+ kz_profile_get_value(profile, "Privacy", key,
+ &value, sizeof(value),
+ KZ_PROFILE_VALUE_TYPE_INT);
+ mozilla_prefs_set_int("network.cookie.cookieBehavior", value);
+ }
+ else if (!strcmp(key, "cookie_lifetime_policy"))
+ {
+ gint value;
+ kz_profile_get_value(profile, "Privacy", key,
+ &value, sizeof(value),
+ KZ_PROFILE_VALUE_TYPE_INT);
+ mozilla_prefs_set_int("network.cookie.lifetimePolicy", value);
+ }
+ else if (!strcmp(key, "cookie_lifetime_days"))
+ {
+ gint value;
+ kz_profile_get_value(profile, "Privacy", key,
+ &value, sizeof(value),
+ KZ_PROFILE_VALUE_TYPE_INT);
+ mozilla_prefs_set_int("network.cookie.lifetime.days", value);
+ }
+ else if (!strcmp(key, "cookie_always_accept_session_cookies"))
+ {
+ gboolean value;
+ kz_profile_get_value(profile, "Privacy", key,
+ &value, sizeof(value),
+ KZ_PROFILE_VALUE_TYPE_INT);
+ mozilla_prefs_set_boolean("network.cookie.alwaysAcceptSessionCookies", value);
+ }
+ break;
+ default:
+ break;
+ }
+}
+
static void
destroy_browser_cb (GtkMozEmbed *embed, GtkWidget *transient_window)
{
Modified: kazehakase/trunk/src/prefs_ui/prefs_privacy.c
===================================================================
--- kazehakase/trunk/src/prefs_ui/prefs_privacy.c 2007-03-23 02:25:30 UTC (rev 2968)
+++ kazehakase/trunk/src/prefs_ui/prefs_privacy.c 2007-03-23 02:37:05 UTC (rev 2969)
@@ -326,13 +326,13 @@
gint behaviour = 0;
gint lifetime = 0;
gint span, length;
- KzEmbedPrefs *embed_prefs = NULL;
+ gint value;
gboolean except;
if (!prefsui->changed)
break;
- /* cokkie behaviour */
+ /* cookie behaviour */
group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(prefsui->cookie_behaviour));
length = g_slist_length(group);
@@ -345,10 +345,10 @@
break;
behaviour++;
}
- kz_embed_prefs_set_int(embed_prefs, "network.cookie.cookieBehavior",
- (length - 1) - behaviour);
+ value = (length -1) - behaviour;
+ KZ_CONF_SET("Privacy", "cookie_behaviour", value, INT);
- /* cokkie lifetime */
+ /* cookie lifetime */
group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(prefsui->cookie_lifetime));
length = g_slist_length(group);
@@ -361,21 +361,19 @@
break;
lifetime++;
}
- kz_embed_prefs_set_int(embed_prefs, "network.cookie.lifetimePolicy",
- (length - 1) - lifetime);
+ value = (length -1) - lifetime;
+ KZ_CONF_SET("Privacy", "cookie_lifetime_policy", value, INT);
/* cookie lifespan days */
adj = gtk_spin_button_get_adjustment
(GTK_SPIN_BUTTON(prefsui->span_spin));
span = gtk_adjustment_get_value(adj);
- kz_embed_prefs_set_int(embed_prefs, "network.cookie.lifetime.days",
- span);
+ KZ_CONF_SET("Privacy", "cookie_lifetime_days", span, INT);
/* except for session cookies */
except = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON(prefsui->except_check));
- kz_embed_prefs_set_boolean(embed_prefs, "network.cookie.alwaysAcceptSessionCookies",
- except);
+ KZ_CONF_SET("Privacy", "cookie_always_accept_session_cookies", except, BOOL);
prefsui->changed = FALSE;