Updating branch refs/heads/master
to bf80501888a0216943d0b1aa214678277e14d37f (commit)
from 5399a68a4e526c2a1e2a513b8969b7197315486f (commit)
commit bf80501888a0216943d0b1aa214678277e14d37f
Author: Christian Dywan <christ...@twotoasts.de>
Date: Fri Sep 18 19:35:15 2009 +0200
Fix identification string, don't accidentally include extra brackets
midori/midori-websettings.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index 5c0b441..c20438b 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -1110,19 +1110,18 @@ generate_ident_string (MidoriIdentity identify_as)
#define WEBKIT_USER_AGENT_MAJOR_VERSION 532
#define WEBKIT_USER_AGENT_MINOR_VERSION 1
#endif
-
- const gchar* webcore = "WebKit/" G_STRINGIFY
(WEBKIT_USER_AGENT_MAJOR_VERSION)
- "." G_STRINGIFY (WEBKIT_USER_AGENT_MINOR_VERSION) "+";
+ const int webcore_major = WEBKIT_USER_AGENT_MAJOR_VERSION;
+ const int webcore_minor = WEBKIT_USER_AGENT_MINOR_VERSION;
switch (identify_as)
{
case MIDORI_IDENT_MIDORI:
- return g_strdup_printf ("%s (%s; %s; U; %s) %s",
- appname, platform, os, lang, webcore);
+ return g_strdup_printf ("%s (%s; %s; U; %s) WebKit/%d.%d+",
+ appname, platform, os, lang, webcore_major, webcore_minor);
case MIDORI_IDENT_SAFARI:
return g_strdup_printf ("Mozilla/5.0 (%s; U; %s; %s) "
- "AppleWebKit/532+ (KHTML, like Gecko) Safari/%s %s",
- platform, os, lang, webcore, appname);
+ "AppleWebKit/%d+ (KHTML, like Gecko) Safari/%d.%d+ %s",
+ platform, os, lang, webcore_major, webcore_major, webcore_minor,
appname);
case MIDORI_IDENT_IPHONE:
return g_strdup_printf ("Mozilla/5.0 (iPhone; U; %s; %s) "
"AppleWebKit/532+ (KHTML, like Gecko) Version/3.0 Mobile/1A538b "
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
