SOURCES: kazehakase-agent.patch - updated for 0.4.7

hawk hawk at pld-linux.org
Thu Jul 12 17:56:08 CEST 2007


Author: hawk                         Date: Thu Jul 12 15:56:08 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.4.7

---- Files affected:
SOURCES:
   kazehakase-agent.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/kazehakase-agent.patch
diff -u SOURCES/kazehakase-agent.patch:1.1 SOURCES/kazehakase-agent.patch:1.2
--- SOURCES/kazehakase-agent.patch:1.1	Thu Mar 22 01:47:12 2007
+++ SOURCES/kazehakase-agent.patch	Thu Jul 12 17:56:03 2007
@@ -1,27 +1,39 @@
-diff -ur kazehakase-0.4.4.1.orig/src/mozilla/mozilla-prefs.cpp kazehakase-0.4.4.1/src/mozilla/mozilla-prefs.cpp
---- kazehakase-0.4.4.1.orig/src/mozilla/mozilla-prefs.cpp	2007-01-02 10:23:47.000000000 +0100
-+++ kazehakase-0.4.4.1/src/mozilla/mozilla-prefs.cpp	2007-03-22 00:38:00.000000000 +0100
-@@ -62,31 +62,6 @@
- }
+diff -ur kazehakase-0.4.7.orig/etc/kzrc kazehakase-0.4.7.agent/etc/kzrc
+--- kazehakase-0.4.7.orig/etc/kzrc	2007-07-13 19:18:59.000000000 +0200
++++ kazehakase-0.4.7.agent/etc/kzrc	2007-07-13 19:19:41.000000000 +0200
+@@ -1,8 +1,6 @@
+ # Encoding: UTF-8
  
+ [Global]
+-# Default layout engine. mozilla or gtk+-webcore
+-#layout_engine=mozilla
  
--static void
+ startup_page=about:blank
+ 
+@@ -38,6 +36,10 @@
+ # if javascript_enable is false in about:config.
+ use_javascript=true
+ 
++[Browser]
++# Default layout engine. gecko or gtk+-webcore
++layout_engine=gecko
++
+ [MainWindow]
+ width=720
+ height=600
+diff -ur kazehakase-0.4.7.orig/module/embed/gecko/kz-gecko-single.cpp kazehakase-0.4.7.agent/module/embed/gecko/kz-gecko-single.cpp
+--- kazehakase-0.4.7.orig/module/embed/gecko/kz-gecko-single.cpp	2007-07-13 19:19:00.000000000 +0200
++++ kazehakase-0.4.7.agent/module/embed/gecko/kz-gecko-single.cpp	2007-07-13 19:19:41.000000000 +0200
+@@ -300,20 +300,6 @@
+ }
+ 
+ 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");
--	}
--		
+-	system = kz_utils_get_system_name();
+-
 -	g_snprintf(user_agent, size,
 -		   "Mozilla/5.0 (X11; %s; U;) Gecko/%d Kazehakase/"  VERSION,
 -		   system,
@@ -29,41 +41,43 @@
 -	g_free (system);
 -}
 -
--
- extern "C" void 
- mozilla_prefs_set (KzProfile *profile)
+-static void
+ set_user_agent (KzProfile *profile)
  {
-@@ -106,11 +81,16 @@
- 		override = kz_profile_get_value(profile, "Global", "user_agent", 
- 			   			&user_agent, sizeof(user_agent),
- 						KZ_PROFILE_VALUE_TYPE_STRING);
-+		mozilla_prefs_set_string ("general.useragent.override", user_agent);
+ 	gchar tmp_string[1024];
+@@ -326,12 +312,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);
  	}
- 	if (!override)
--		build_user_agent(user_agent, G_N_ELEMENTS(user_agent));
--	mozilla_prefs_set_string ("general.useragent.override", user_agent);
--
-+	{
+ 	else /* set default */
+ 	{
+-		build_user_agent(tmp_string, G_N_ELEMENTS(tmp_string));
 +		mozilla_prefs_delete ("general.useragent.override");
 +		mozilla_prefs_set_string ("general.useragent.extra.kazehakase", "Kazehakase/" VERSION);
 +		mozilla_prefs_set_string ("general.useragent.vendor", "PLD");
-+		mozilla_prefs_set_string ("general.useragent.vendorSub", "2.0");
-+		mozilla_prefs_set_string ("general.useragent.vendorComment", "Ac");
-+	}
- 	if (!mozilla_prefs_get_string("kazehakase.font.language", &value))
- 	{
- 		mozilla_prefs_set_string("kazehakase.font.language",
-@@ -308,6 +288,26 @@
++		mozilla_prefs_set_string ("general.useragent.vendorSub", "3.0");
++		mozilla_prefs_set_string ("general.useragent.vendorComment", "Th");
+ 	}
+-	mozilla_prefs_set_string("general.useragent.override", tmp_string);
+ }
+ 
+ static void
+diff -ur kazehakase-0.4.7.orig/module/embed/gecko/mozilla-prefs.cpp kazehakase-0.4.7.agent/module/embed/gecko/mozilla-prefs.cpp
+--- kazehakase-0.4.7.orig/module/embed/gecko/mozilla-prefs.cpp	2007-07-13 19:19:00.000000000 +0200
++++ kazehakase-0.4.7.agent/module/embed/gecko/mozilla-prefs.cpp	2007-07-13 19:19:41.000000000 +0200
+@@ -449,6 +449,26 @@
  }
  
  
-+extern "C" gboolean
-+mozilla_prefs_delete(const char *preference_name)
++gboolean
++mozilla_prefs_delete (const char *preference_name)
 +{
 +	g_return_val_if_fail(preference_name != NULL, FALSE);
 +
 +	nsCOMPtr<nsIPrefService> prefService = 
-+				do_GetService (NS_PREFSERVICE_CONTRACTID);
++				do_GetService(NS_PREFSERVICE_CONTRACTID);
 +	nsCOMPtr<nsIPrefBranch> pref;
 +	prefService->GetBranch("", getter_AddRefs(pref));
 +
@@ -77,17 +91,17 @@
 +}
 +
 +
- //
- //  Picked from Epiphany-0.7.0 (embed/mozilla/mozilla-embed-single.cpp).
- //  Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti
-diff -ur kazehakase-0.4.4.1.orig/src/mozilla/mozilla-prefs.h kazehakase-0.4.4.1/src/mozilla/mozilla-prefs.h
---- kazehakase-0.4.4.1.orig/src/mozilla/mozilla-prefs.h	2007-01-02 10:23:47.000000000 +0100
-+++ kazehakase-0.4.4.1/src/mozilla/mozilla-prefs.h	2007-03-22 00:37:24.000000000 +0100
+ void
+ mozilla_prefs_set_use_proxy (gboolean use)
+ {
+diff -ur kazehakase-0.4.7.orig/module/embed/gecko/mozilla-prefs.h kazehakase-0.4.7.agent/module/embed/gecko/mozilla-prefs.h
+--- kazehakase-0.4.7.orig/module/embed/gecko/mozilla-prefs.h	2007-07-13 19:19:00.000000000 +0200
++++ kazehakase-0.4.7.agent/module/embed/gecko/mozilla-prefs.h	2007-07-13 19:19:41.000000000 +0200
 @@ -46,6 +46,7 @@
  					gboolean     new_boolean_value);
  gboolean mozilla_prefs_set_int         (const char  *preference_name,
  					int          new_int_value);
 +gboolean mozilla_prefs_delete          (const char  *preference_name);
+ void     mozilla_prefs_set_proxy       (KzProxyItem *item);
+ void     mozilla_prefs_set_use_proxy   (gboolean use);
  
- gboolean mozilla_prefs_get_font_list   (const char  *lang_group,
- 					const char  *font_type,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kazehakase-agent.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list