Ticket #1066: sugar-1066.patch

File sugar-1066.patch, 7.8 KB (added by alsroot, 15 years ago)

  • configure.ac 

    From 2c17d4ac21177efbc4f0c862e62f67e73bf1d559 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Fri, 31 Jul 2009 15:20:01 +0000
Subject: Provide SugarPlatform version in useragent string

---
 configure.ac     |    3 ++
 data/prefs.js    |  100 ---------------------------------------------------
 data/prefs.js.in |  104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+), 100 deletions(-)
 delete mode 100644 data/prefs.js
 create mode 100644 data/prefs.js.in

diff --git a/configure.ac b/configure.ac
index 555573f..b4fb91b 100644
    a b  
    11m4_define([hulahop_build_id],[2008072400]) # FIXME: when should we update this?
    22m4_define([hulahop_version],[0.5.0])
     3m4_define([sp_version],[0.85])
    34
    45AC_INIT([hulahop],[0.5.0],[],[hulahop])
    56
    67AC_SUBST([HULAHOP_VERSION],[hulahop_version])
    78AC_SUBST([HULAHOP_BUILD_ID],[hulahop_build_id])
     9AC_SUBST([SP_VERSION],[sp_version])
    810
    911AC_PREREQ([2.59])
    1012
    … … AC_OUTPUT([ 
    5860Makefile
    5961components/Makefile
    6062data/Makefile
     63data/prefs.js
    6164data/chrome/Makefile
    6265src/Makefile
    6366python/Makefile

  • deleted file data/prefs.js 

    diff --git a/data/prefs.js b/data/prefs.js
deleted file mode 100644
index 93f203e..0000000
    + -  
    1 // Disable links prefetch
    2 user_pref("network.prefetch-next", false);
    3 
    4 // Disable onload popups
    5 pref("dom.disable_open_during_load", true);
    6 
    7 // Disable usless security warnings
    8 pref("security.warn_entering_secure", false);
    9 pref("security.warn_entering_secure.show_once", true);
    10 pref("security.warn_leaving_secure", false);
    11 pref("security.warn_leaving_secure.show_once", false);
    12 pref("security.warn_submit_insecure", false);
    13 pref("security.warn_submit_insecure.show_once", false);
    14 pref("security.warn_viewing_mixed", true);
    15 pref("security.warn_viewing_mixed.show_once", false);
    16 pref("security.warn_entering_weak", true);
    17 pref("security.warn_entering_weak.show_once", false);
    18 
    19 // Set some style properties to not follow our dark gtk theme
    20 pref("ui.-moz-field", "#FFFFFF");
    21 pref("ui.-moz-fieldtext", "#000000");
    22 pref("ui.-moz-dialog", "#C0C0C0");
    23 pref("ui.buttonface", "#D3D3DD");
    24 pref("ui.buttontext", "#000000");
    25 
    26 // Fonts
    27 pref("font.size.unit", "pt");
    28 
    29 pref("font.default.ar", "sans-serif");
    30 pref("font.size.variable.ar", 12);
    31 pref("font.size.fixed.ar", 9);
    32 
    33 pref("font.default.el", "serif");
    34 pref("font.size.variable.el", 12);
    35 pref("font.size.fixed.el", 9);
    36 
    37 pref("font.default.he", "sans-serif");
    38 pref("font.size.variable.he", 12);
    39 pref("font.size.fixed.he", 9);
    40 
    41 pref("font.default.ja", "sans-serif");
    42 pref("font.size.variable.ja", 12);
    43 pref("font.size.fixed.ja", 12);
    44 
    45 pref("font.default.ko", "sans-serif");
    46 pref("font.size.variable.ko", 12);
    47 pref("font.size.fixed.ko", 12);
    48 
    49 pref("font.default.th", "serif");
    50 pref("font.size.variable.th", 12);
    51 pref("font.size.fixed.th", 9);
    52 
    53 pref("font.default.tr", "serif");
    54 pref("font.size.variable.tr", 12);
    55 pref("font.size.fixed.tr", 9);
    56 
    57 pref("font.default.x-baltic", "serif");
    58 pref("font.size.variable.x-baltic", 12);
    59 pref("font.size.fixed.x-baltic", 9);
    60 
    61 pref("font.default.x-central-euro", "serif");
    62 pref("font.size.variable.x-central-euro", 12);
    63 pref("font.size.fixed.x-central-euro", 9);
    64 
    65 pref("font.default.x-cyrillic", "serif");
    66 pref("font.size.variable.x-cyrillic", 12);
    67 pref("font.size.fixed.x-cyrillic", 9);
    68 
    69 pref("font.default.x-unicode", "serif");
    70 pref("font.size.variable.x-unicode", 12);
    71 pref("font.size.fixed.x-unicode", 9);
    72 
    73 pref("font.default.x-western", "serif");
    74 pref("font.size.variable.x-western", 12);
    75 pref("font.size.fixed.x-western", 9);
    76 
    77 pref("font.default.zh-CN", "sans-serif");
    78 pref("font.size.variable.zh-CN", 12);
    79 pref("font.size.fixed.zh-CN", 12);
    80 
    81 pref("font.default.zh-TW", "sans-serif");
    82 pref("font.size.variable.zh-TW", 12);
    83 pref("font.size.fixed.zh-TW", 12);
    84 
    85 pref("font.default.zh-HK", "sans-serif");
    86 pref("font.size.variable.zh-HK", 12);
    87 pref("font.size.fixed.zh-HK", 12);
    88 
    89 // Enable error pages (xulrunner is missing this pref)
    90 pref("browser.xul.error_pages.enabled", true);
    91 
    92 // Set this to not show messages about loaded guns when about:config
    93 pref("general.warnOnAboutConfig", false);
    94 
    95 // Set the maximum history entries to 50
    96 pref("browser.sessionhistory.max_entries", 50);
    97 
    98 // Add vendor useragent string
    99 pref("general.useragent.locale", "en-US");
    100 pref("general.useragent.extra.firefox", "Firefox/3.0");

  • new file data/prefs.js.in 

    diff --git a/data/prefs.js.in b/data/prefs.js.in
new file mode 100644
index 0000000..79d7450
    - +  
     1// Disable links prefetch
     2user_pref("network.prefetch-next", false);
     3
     4// Disable onload popups
     5pref("dom.disable_open_during_load", true);
     6
     7// Disable usless security warnings
     8pref("security.warn_entering_secure", false);
     9pref("security.warn_entering_secure.show_once", true);
     10pref("security.warn_leaving_secure", false);
     11pref("security.warn_leaving_secure.show_once", false);
     12pref("security.warn_submit_insecure", false);
     13pref("security.warn_submit_insecure.show_once", false);
     14pref("security.warn_viewing_mixed", true);
     15pref("security.warn_viewing_mixed.show_once", false);
     16pref("security.warn_entering_weak", true);
     17pref("security.warn_entering_weak.show_once", false);
     18
     19// Set some style properties to not follow our dark gtk theme
     20pref("ui.-moz-field", "#FFFFFF");
     21pref("ui.-moz-fieldtext", "#000000");
     22pref("ui.-moz-dialog", "#C0C0C0");
     23pref("ui.buttonface", "#D3D3DD");
     24pref("ui.buttontext", "#000000");
     25
     26// Fonts
     27pref("font.size.unit", "pt");
     28
     29pref("font.default.ar", "sans-serif");
     30pref("font.size.variable.ar", 12);
     31pref("font.size.fixed.ar", 9);
     32
     33pref("font.default.el", "serif");
     34pref("font.size.variable.el", 12);
     35pref("font.size.fixed.el", 9);
     36
     37pref("font.default.he", "sans-serif");
     38pref("font.size.variable.he", 12);
     39pref("font.size.fixed.he", 9);
     40
     41pref("font.default.ja", "sans-serif");
     42pref("font.size.variable.ja", 12);
     43pref("font.size.fixed.ja", 12);
     44
     45pref("font.default.ko", "sans-serif");
     46pref("font.size.variable.ko", 12);
     47pref("font.size.fixed.ko", 12);
     48
     49pref("font.default.th", "serif");
     50pref("font.size.variable.th", 12);
     51pref("font.size.fixed.th", 9);
     52
     53pref("font.default.tr", "serif");
     54pref("font.size.variable.tr", 12);
     55pref("font.size.fixed.tr", 9);
     56
     57pref("font.default.x-baltic", "serif");
     58pref("font.size.variable.x-baltic", 12);
     59pref("font.size.fixed.x-baltic", 9);
     60
     61pref("font.default.x-central-euro", "serif");
     62pref("font.size.variable.x-central-euro", 12);
     63pref("font.size.fixed.x-central-euro", 9);
     64
     65pref("font.default.x-cyrillic", "serif");
     66pref("font.size.variable.x-cyrillic", 12);
     67pref("font.size.fixed.x-cyrillic", 9);
     68
     69pref("font.default.x-unicode", "serif");
     70pref("font.size.variable.x-unicode", 12);
     71pref("font.size.fixed.x-unicode", 9);
     72
     73pref("font.default.x-western", "serif");
     74pref("font.size.variable.x-western", 12);
     75pref("font.size.fixed.x-western", 9);
     76
     77pref("font.default.zh-CN", "sans-serif");
     78pref("font.size.variable.zh-CN", 12);
     79pref("font.size.fixed.zh-CN", 12);
     80
     81pref("font.default.zh-TW", "sans-serif");
     82pref("font.size.variable.zh-TW", 12);
     83pref("font.size.fixed.zh-TW", 12);
     84
     85pref("font.default.zh-HK", "sans-serif");
     86pref("font.size.variable.zh-HK", 12);
     87pref("font.size.fixed.zh-HK", 12);
     88
     89// Enable error pages (xulrunner is missing this pref)
     90pref("browser.xul.error_pages.enabled", true);
     91
     92// Set this to not show messages about loaded guns when about:config
     93pref("general.warnOnAboutConfig", false);
     94
     95// Set the maximum history entries to 50
     96pref("browser.sessionhistory.max_entries", 50);
     97
     98// Add vendor useragent string
     99pref("general.useragent.locale", "en-US");
     100pref("general.useragent.extra.firefox", "Firefox/3.0");
     101
     102pref("general.useragent.vendor", "Sugar Labs");
     103pref("general.useragent.vendorSub", "@SP_VERSION@");
     104pref("general.useragent.vendorComment", "hulahop/@HULAHOP_VERSION@");