svnno****@sourc*****
svnno****@sourc*****
Fri Mar 23 08:45:43 JST 2007
Revision: 2963
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=2963
Author: ikezoe
Date: 2007-03-23 08:45:42 +0900 (Fri, 23 Mar 2007)
Log Message:
-----------
* src/prefs_ui/prefs_general.c: Removed kz_embed_prefs codes.
* module/embed/gecko/mozilla.cpp,
module/embed/gecko/mozilla-prefs.cpp: Set User-Agent in mozilla.cpp.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gecko/mozilla-prefs.cpp
kazehakase/trunk/module/embed/gecko/mozilla.cpp
kazehakase/trunk/src/prefs_ui/prefs_general.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-22 11:45:39 UTC (rev 2962)
+++ kazehakase/trunk/ChangeLog 2007-03-22 23:45:42 UTC (rev 2963)
@@ -1,3 +1,9 @@
+2007-03-23 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * src/prefs_ui/prefs_general.c: Removed kz_embed_prefs codes.
+ * module/embed/gecko/mozilla.cpp,
+ module/embed/gecko/mozilla-prefs.cpp: Set User-Agent in mozilla.cpp.
+
2007-03-22 Kouhei Sutou <kou****@cozmi*****>
* src/kz-module.[ch]: moved to workaround for kz-gecko-embed.cpp
Modified: kazehakase/trunk/module/embed/gecko/mozilla-prefs.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/mozilla-prefs.cpp 2007-03-22 11:45:39 UTC (rev 2962)
+++ kazehakase/trunk/module/embed/gecko/mozilla-prefs.cpp 2007-03-22 23:45:42 UTC (rev 2963)
@@ -21,12 +21,10 @@
#include "mozilla-prefs.h"
-#include <sys/utsname.h>
#include <gtkmozembed.h>
#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
#undef MOZILLA_STRICT_API
-#include <nsBuildID.h>
#include <nsCOMPtr.h>
#include <nsIPrefService.h>
#include <nsISupportsPrimitives.h>
@@ -62,55 +60,15 @@
}
-static void
-build_user_agent (gchar *user_agent, gint size)
-{
- struct utsname name;
- gchar *system;
-
- if (uname (&name) >= 0)
- {
- system = g_strdup_printf ("%s %s",
- name.sysname,
- name.machine);
- }
- else
- {
- system = g_strdup ("Unknown");
- }
-
- g_snprintf(user_agent, size,
- "Mozilla/5.0 (X11; %s; U;) Gecko/%d Kazehakase/" VERSION,
- system,
- NS_BUILD_ID/100);
- g_free (system);
-}
-
-
void
mozilla_prefs_set (KzProfile *profile)
{
char *value;
- gchar user_agent[1024];
- gboolean override = FALSE, use_proxy = FALSE;
+ gboolean use_proxy = FALSE;
gchar proxy_name[1024];
gboolean conf_exist = FALSE, use_proxy_exist = FALSE;
KzProxyItem *item = NULL;
- // set user agent name
- kz_profile_get_value(profile, "Global", "override_user_agent",
- &override, sizeof(gboolean),
- KZ_PROFILE_VALUE_TYPE_BOOL);
- if (override)
- {
- override = kz_profile_get_value(profile, "Global", "user_agent",
- &user_agent, sizeof(user_agent),
- KZ_PROFILE_VALUE_TYPE_STRING);
- }
- if (!override)
- build_user_agent(user_agent, G_N_ELEMENTS(user_agent));
- mozilla_prefs_set_string ("general.useragent.override", user_agent);
-
if (!mozilla_prefs_get_string("kazehakase.font.language", &value))
{
mozilla_prefs_set_string("kazehakase.font.language",
Modified: kazehakase/trunk/module/embed/gecko/mozilla.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/mozilla.cpp 2007-03-22 11:45:39 UTC (rev 2962)
+++ kazehakase/trunk/module/embed/gecko/mozilla.cpp 2007-03-22 23:45:42 UTC (rev 2963)
@@ -37,6 +37,8 @@
#include <nsIPassword.h>
#endif
#include <nsIIDNService.h>
+#include <nsBuildID.h>
+#include <sys/utsname.h>
#include "mozilla.h"
#include "mozilla-prefs.h"
@@ -217,6 +219,51 @@
static void
+build_user_agent (gchar *user_agent, gint size)
+{
+ struct utsname name;
+ gchar *system;
+
+ if (uname (&name) >= 0)
+ {
+ system = g_strdup_printf ("%s %s",
+ name.sysname,
+ name.machine);
+ }
+ else
+ {
+ system = g_strdup ("Unknown");
+ }
+
+ g_snprintf(user_agent, size,
+ "Mozilla/5.0 (X11; %s; U;) Gecko/%d Kazehakase/" VERSION,
+ system,
+ NS_BUILD_ID/100);
+ g_free (system);
+}
+
+static void
+set_user_agent (KzProfile *profile)
+{
+ gchar tmp_string[1024];
+ gboolean value = FALSE;
+ kz_profile_get_value(profile, "Global", "override_user_agent",
+ &value, sizeof(gboolean),
+ KZ_PROFILE_VALUE_TYPE_BOOL);
+ if (value)
+ {
+ value = kz_profile_get_value(profile, "Global", "user_agent",
+ &tmp_string, G_N_ELEMENTS(tmp_string),
+ KZ_PROFILE_VALUE_TYPE_STRING);
+ }
+ else /* set default */
+ {
+ build_user_agent(tmp_string, G_N_ELEMENTS(tmp_string));
+ }
+ mozilla_prefs_set_string("general.useragent.override", tmp_string);
+}
+
+static void
cb_profile_changed (KzProfile *profile,
const gchar *section,
const gchar *key,
@@ -224,19 +271,16 @@
gpointer data)
{
gchar tmp_string[1024];
- gboolean use_proxy = FALSE;
+ gboolean value = FALSE;
switch (key[0])
{
-#if 0
case 'o': // override_user_agent
- if (strcmp(key, "override_user_agent") == 0 &&
- KZ_CONF_GET(section, key, tmp_string, STRING))
+ if (strcmp(key, "override_user_agent") == 0)
{
- kz_embed_prefs_set_string(embed_prefs, "general.useragent.override", tmp_string);
+ set_user_agent(profile);
}
break;
-#endif
case 'p':
if (strcmp(key, "proxy_name") == 0 &&
KZ_CONF_GET(section, key, tmp_string, STRING))
@@ -250,10 +294,14 @@
break;
case 'u': // user_agent or use_proxy
if (strcmp(key, "use_proxy") == 0 &&
- KZ_CONF_GET(section, key, use_proxy, BOOL))
+ KZ_CONF_GET(section, key, value, BOOL))
{
- mozilla_prefs_set_use_proxy(use_proxy);
+ mozilla_prefs_set_use_proxy(value);
}
+ else if (strcmp(key, "user_agent") == 0)
+ {
+ set_user_agent(profile);
+ }
break;
}
}
@@ -269,8 +317,9 @@
gtk_moz_embed_set_comp_path(MOZILLA_HOME);
gtk_moz_embed_push_startup();
-
+#warning FIXME!
mozilla_prefs_set(profile);
+ set_user_agent(profile);
//
// get the singleton object and hook up to its new window callback
Modified: kazehakase/trunk/src/prefs_ui/prefs_general.c
===================================================================
--- kazehakase/trunk/src/prefs_ui/prefs_general.c 2007-03-22 11:45:39 UTC (rev 2962)
+++ kazehakase/trunk/src/prefs_ui/prefs_general.c 2007-03-22 23:45:42 UTC (rev 2963)
@@ -24,7 +24,6 @@
#include "kazehakase.h"
#include "kz-window.h"
#include "kz-embed.h"
-#include "kz-embed-prefs.h"
#include "utils/gtk-utils.h"
#define DATA_KEY "KzPrefsGeneral::info"
@@ -323,7 +322,6 @@
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);
@@ -344,14 +342,6 @@
value = gtk_entry_get_text(GTK_ENTRY(prefsui->user_agent_entry));
KZ_CONF_SET_STR("Global", "user_agent", value);
- if (override)
- {
- kz_embed_prefs_set_string(embed_prefs, "general.useragent.override", value);
- }
- else
- {
- /* FIXME: set to the default user agent */
- }
#if 0
/* copy format */
value = gtk_entry_get_text(GTK_ENTRY(prefsui->copy_document_format));