aboutsummaryrefslogtreecommitdiffstats
path: root/src/chrome
diff options
context:
space:
mode:
authorjmccrohan <jmccrohan@gmail.com>2012-05-10 16:42:34 -0700
committerjmccrohan <jmccrohan@gmail.com>2012-05-10 16:42:34 -0700
commite5769bc2e3ae6377fc5c8f19adb876c064463766 (patch)
tree8573255a41a5496efd8d7728bb25484a3b552371 /src/chrome
parent418e6ab9be9945ad0865a5d5760296bfb4e7dc71 (diff)
parent9b0daa26dbaebb70723d309f0bc4fb62bd3a0043 (diff)
downloadMultiproxy-Switch-e5769bc2e3ae6377fc5c8f19adb876c064463766.tar.gz
Merge pull request #2 from nickdu/master
Restart issue has been fixed
Diffstat (limited to 'src/chrome')
-rw-r--r--src/chrome/content/proxy.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/chrome/content/proxy.js b/src/chrome/content/proxy.js
index 8c94d0f..85664dc 100644
--- a/src/chrome/content/proxy.js
+++ b/src/chrome/content/proxy.js
@@ -65,9 +65,11 @@ function mproxy_initProxy(event){
//Populate Proxy List
mproxy_populateList();
- //Set Last Proxy Selected
- if(gSwitchP_List != null)
- gSwitchP_LastItem = gSwitchP_List.selectedItem;
+ //Set Last Proxy Selected
+ if (gSwitchP_List != null) {
+ gSwitchP_List.selectedItem.value = gSwitchP_Prefs.getCharPref("mproxy.proxy.current");
+ gSwitchP_LastItem = gSwitchP_List.selectedItem;
+ }
//Add Preferences Listener
var oProxyObserver = {
@@ -96,7 +98,7 @@ oPrefBranch.addObserver("mproxy.proxy.rdf.lastupdate", oProxyObserver, false);
// Start Anon Rotation
//setTimeout("mproxy_anon_nextProxy()", 1000);
-
+ mproxy_setProxy(true);
gSwitchP_Loaded = true;
}
}
5a39f66f1f 2010-02-12Fixed a segmentation fault bug in cfg_get().mjona1-1/+1 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1109 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-11All static memory allocations were turned into dynamical ones.mjona1-128/+200 Improved configuration parameters: - FifoPath to specify the fifo path (if absent, a built in replacement is used) - FifoBufSize to specify the size of the internal buffer (this parameter is optional as the plugin will try to match the number of display columns; if it fails and no FifoBufSize parameter is supplied then a built in replacement is used) Simplified and rationalized init and exit functions: most global variables have been localized. Fixed several off-by-one overflows memory bugs. git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1108 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-07timer.c: two small optimizations (removed "flag"; tv_usec can't be negative)mzuther1-7/+4 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1107 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-07added grouping of widgets by update interval (new file "timer_group.c")mzuther13-168/+441 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1106 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-07BUG: handle negative delays in timer_process() (timer.c)mzuther1-0/+4 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1105 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-06timer.c: I had forgotten how to initialize a "struct" :)mzuther1-3/+4 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1104 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-06BUG: compensate timers for processing delay ("timer.c")mzuther1-1/+3 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1103 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-06timer.c: exchanged "proprietary code" with timeradd() and timersub() functionsmzuther1-14/+10 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1102 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-04timer.c: removed fruitless changes to variable "flag" from timer_process()mzuther1-2/+0 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1101 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-04According to its man page, timercmp() is broken on some systems -- applied ↵mzuther1-1/+1 the recommended (and equivalent) change. git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1100 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-04small warning removedmichael1-1/+1 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1099 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-04clear errno after creating the FIFO by Claas Hilbrechtmichael1-0/+2 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1098 3ae390bd-cb1e-0410-b409-cd5a39f66f1f