svnno****@sourc*****
svnno****@sourc*****
Sun Jan 6 18:26:30 JST 2008
Revision: 3349
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3349
Author: kous
Date: 2008-01-06 18:26:29 +0900 (Sun, 06 Jan 2008)
Log Message:
-----------
* module/embed/gecko/kz-gecko-single.cpp: used
general.useragent.extra.XXX instead of general.useragent.override.
* module/embed/gecko/mozilla-prefs.{cpp,h} (mozilla_prefs_clear): added.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gecko/kz-gecko-single.cpp
kazehakase/trunk/module/embed/gecko/mozilla-prefs.cpp
kazehakase/trunk/module/embed/gecko/mozilla-prefs.h
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2008-01-05 12:26:33 UTC (rev 3348)
+++ kazehakase/trunk/ChangeLog 2008-01-06 09:26:29 UTC (rev 3349)
@@ -1,3 +1,11 @@
+2008-01-06 Kouhei Sutou <kou****@cozmi*****>
+
+ * module/embed/gecko/kz-gecko-single.cpp: used
+ general.useragent.extra.XXX instead of general.useragent.override.
+
+ * module/embed/gecko/mozilla-prefs.{cpp,h} (mozilla_prefs_clear):
+ added.
+
2008-01-05 Kouhei Sutou <kou****@cozmi*****>
* module/embed/gecko/kz-mozwrapper.cpp: buildable but thumbnail is
Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-single.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-single.cpp 2008-01-05 12:26:33 UTC (rev 3348)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-single.cpp 2008-01-06 09:26:29 UTC (rev 3349)
@@ -23,7 +23,6 @@
#endif /* HAVE_CONFIG_H */
#include <mozilla-config.h>
-#include <nsBuildID.h>
#include <glib/gi18n.h>
#include "kz-gecko-single.h"
#include "kz-app.h"
@@ -304,22 +303,6 @@
}
static void
-build_user_agent (gchar *user_agent, gint size)
-{
- gchar *system;
-
- system = kz_utils_get_system_name();
-
- g_snprintf(user_agent, size,
- "Mozilla/5.0 (X11; U; %s; rv:%s) Gecko/%d Kazehakase/%s",
- system,
- MOZILLA_VERSION,
- NS_BUILD_ID/100,
- VERSION);
- g_free (system);
-}
-
-static void
set_user_agent (KzProfile *profile)
{
gchar tmp_string[1024];
@@ -332,12 +315,16 @@
value = kz_profile_get_value(profile, "Global", "user_agent",
&tmp_string, G_N_ELEMENTS(tmp_string),
KZ_PROFILE_VALUE_TYPE_STRING);
+ mozilla_prefs_set_string("general.useragent.override",
+ tmp_string);
+ mozilla_prefs_clear("general.useragent.extra.kazehakase");
}
else /* set default */
{
- build_user_agent(tmp_string, G_N_ELEMENTS(tmp_string));
+ mozilla_prefs_clear("general.useragent.override");
+ mozilla_prefs_set_string("general.useragent.extra.kazehakase",
+ "Kazehakase/" VERSION);
}
- mozilla_prefs_set_string("general.useragent.override", tmp_string);
}
static void
Modified: kazehakase/trunk/module/embed/gecko/mozilla-prefs.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/mozilla-prefs.cpp 2008-01-05 12:26:33 UTC (rev 3348)
+++ kazehakase/trunk/module/embed/gecko/mozilla-prefs.cpp 2008-01-06 09:26:29 UTC (rev 3349)
@@ -519,3 +519,21 @@
g_free(no_proxies_on);
}
+gboolean
+mozilla_prefs_clear (const char *preference_name)
+{
+ g_return_val_if_fail(preference_name != NULL, FALSE);
+
+ nsCOMPtr<nsIPrefService> prefService =
+ do_GetService(NS_PREFSERVICE_CONTRACTID);
+ nsCOMPtr<nsIPrefBranch> pref;
+ prefService->GetBranch("", getter_AddRefs(pref));
+
+ if (pref)
+ {
+ nsresult rv = pref->ClearUserPref(preference_name);
+ return NS_SUCCEEDED(rv) ? TRUE : FALSE;
+ }
+
+ return FALSE;
+}
Modified: kazehakase/trunk/module/embed/gecko/mozilla-prefs.h
===================================================================
--- kazehakase/trunk/module/embed/gecko/mozilla-prefs.h 2008-01-05 12:26:33 UTC (rev 3348)
+++ kazehakase/trunk/module/embed/gecko/mozilla-prefs.h 2008-01-06 09:26:29 UTC (rev 3349)
@@ -48,6 +48,7 @@
int new_int_value);
void mozilla_prefs_set_proxy (KzProxyItem *item);
void mozilla_prefs_set_use_proxy (gboolean use);
+gboolean mozilla_prefs_clear (const char *preference_name);
G_END_DECLS