Skip to content

Commit f71f91b

Browse files
committed
fixed allow/deny dialog for addons
1 parent 1678213 commit f71f91b

File tree

6 files changed

+44
-18
lines changed

6 files changed

+44
-18
lines changed

README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
##### Ice #####
22

3-
(C) 2010 - 2019 -- Kendall Weaver <kendall@peppermintos.com>
3+
(C) 2010 - 2015 -- Kendall Weaver <kendall@peppermintos.com>
44

55
Released under GNU General Public License version 2
66

debian/changelog

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,33 @@
1-
ice (6.0.0) bionic; urgency=low
1+
ice (6.0.3) bionic; urgency=low
22

3-
* Added isolation option for Chromium based browsers.
4-
* thanks rhein.
5-
* Changed 'Where in the menu?' categories to Xfce defaults.
3+
* Fixed flashing Allow/Deny dialog for
4+
* passwords and addon installation, makes
5+
* the nav-bar present but transparent.
66

7-
-- Mark Greaves (PCNetSpec) <mark@pcnetspec.co.uk> 27 Feb 2019 22:22:00 +0000
7+
-- Mark Greaves (PCNetSpec) <mark@pcnetspec.co.uk> 16 May 2019 12:48:00 +0000
8+
9+
ice (6.0.2) bionic; urgency=low
10+
11+
* Fixed Ctrl+Tab hidden tab navigation.
12+
13+
-- Mark Greaves (PCNetSpec) <mark@pcnetspec.co.uk> 12 May 2019 19:34:00 +0000
14+
15+
ice (6.0.1) bionic; urgency=low
16+
17+
* Added ability to isolate Chromium browser based SSB profiles.
18+
* Fixed "Gtk.Button.new_from_stock is deprecated" warning.
19+
* Added 4 bookmarks to Firefox SSB's on creation.
20+
* Fixed bug where non-UTF8 items in ~/.local/share/applications
21+
* would throw a "UnicodeDecodeError" in /usr/lib/python3.7/codecs.py.
22+
23+
-- Mark Greaves (PCNetSpec) <mark@pcnetspec.co.uk> 10 Apr 2019 18:00:00 +0000
24+
25+
ice (5.3.5) bionic; urgency=low
26+
27+
* Changed 'Sound & Video' category to 'Multimedia'.
28+
* Changed 'System Tools' category to 'System'.
29+
30+
-- Mark Greaves (PCNetSpec) <mark@pcnetspec.co.uk> 04 Dec 2018 12:24:00 +0000
831

932
ice (5.3.4) bionic; urgency=low
1033

debian/files

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ice_6.0.3_source.buildinfo net optional

usr/bin/ice

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ headers = {
6161

6262

6363
def get_details(app):
64-
a = open(app, 'r')
64+
a = open(app, 'r', errors='ignore')
6565
nameline = ""
6666
iconline = ""
6767
profile = ""
@@ -312,9 +312,10 @@ def init_firefox_profile(path):
312312

313313
os.system('mkdir -p ' + chromepath)
314314
os.system('cp -n /usr/lib/peppermint/ice/search.json.mozlz4 ' + path + '/search.json.mozlz4')
315+
os.system('cp -n /usr/lib/peppermint/ice/places.sqlite ' + path + '/places.sqlite')
315316
os.system("touch {0}".format(cssfile))
316317
with open(cssfile, 'w') as cfile:
317-
cfile.write("#nav-bar { visibility: hidden !important; max-height: 0 !important; margin-bottom: -20px !important; opacity: 0; } #identity-box, #navigator-toolbox::after, #tabbrowser-tabs { --tab-min-height: 0px !important; margin-left: 0px !important; height: 0px !important; }")
318+
cfile.write("#nav-bar { max-height: 0 !important; margin-bottom: -20px !important; opacity: 0; } #identity-box, #navigator-toolbox::after, #tabbrowser-tabs { --tab-min-height: 0px !important; margin-left: 0px !important; height: 0px !important; }")
318319

319320
os.system("touch {0}".format(settingsfile))
320321
with open(settingsfile, 'w') as sfile:
@@ -447,7 +448,7 @@ class NoBrowserError(Gtk.Window):
447448
text_lab = Gtk.Label(_("The name of the SSB will cause an existing SSB to\nbe overwritten. To prevent this, change a letter in\nthe name. Continue anyway?"))
448449
text_lab = Gtk.Label(_("Ice requires a system installation of either Google\nChrome or Chromium in order to function. Please\ninstall at least one in order to create SSBs."))
449450

450-
close = Gtk.Button.new_from_stock(Gtk.STOCK_CLOSE)
451+
close = Gtk.Button(label="Close")
451452
close.connect("clicked", self.destroy)
452453
void = Gtk.Label()
453454
box = Gtk.HBox()
@@ -497,9 +498,9 @@ class DuplicateError(Gtk.Window):
497498
main_lab.set_markup(_("<b>Warning: File Duplication Error</b>"))
498499
text_lab = Gtk.Label(_("The name of the SSB will cause an existing SSB to\nbe overwritten. To prevent this, change a letter in\nthe name. Continue anyway?"))
499500

500-
okay = Gtk.Button.new_from_stock(Gtk.STOCK_OK)
501+
okay = Gtk.Button(label="OK")
501502
okay.connect("clicked", self.okay_clicked, title, formatted, address, iconext, location)
502-
cancel = Gtk.Button.new_from_stock(Gtk.STOCK_CANCEL)
503+
cancel = Gtk.Button(label="Cancel")
503504
cancel.connect("clicked", self.destroy)
504505
void = Gtk.Label()
505506
box = Gtk.HBox()
@@ -536,9 +537,9 @@ class AddressError(Gtk.Window):
536537
main_lab.set_markup(_("<b>Warning: HTTP or URL Error</b>"))
537538
text_lab = Gtk.Label(_("An error with the web address has been detected.\nThis is possibly the site being down or unavailable\nright now. Continue anyway?"))
538539

539-
okay = Gtk.Button.new_from_stock(Gtk.STOCK_OK)
540+
okay = Gtk.Button(label="OK")
540541
okay.connect("clicked", self.okay_clicked)
541-
cancel = Gtk.Button.new_from_stock(Gtk.STOCK_CANCEL)
542+
cancel = Gtk.Button(label="Cancel")
542543
cancel.connect("clicked", self.destroy)
543544
void = Gtk.Label()
544545
box = Gtk.HBox()
@@ -716,9 +717,9 @@ class Ice(Gtk.Window):
716717
isolate_button.connect("toggled", self.isolate_clicked)
717718
isolate_box.add(isolate_button)
718719

719-
apply_button = Gtk.Button.new_from_stock(Gtk.STOCK_APPLY)
720+
apply_button = Gtk.Button(label="Apply")
720721
apply_button.connect("clicked", self.apply_clicked)
721-
close_button = Gtk.Button.new_from_stock(Gtk.STOCK_CLOSE)
722+
close_button = Gtk.Button(label="Close")
722723
close_button.connect("clicked", self.destroy)
723724
button_void = Gtk.Label()
724725
button_box = Gtk.HBox()
@@ -771,9 +772,9 @@ class Ice(Gtk.Window):
771772
scroll = Gtk.ScrolledWindow()
772773
scroll.add(iconview)
773774

774-
remove = Gtk.Button.new_from_stock(Gtk.STOCK_REMOVE)
775+
remove = Gtk.Button(label="Remove")
775776
remove.connect("clicked", delete)
776-
close = Gtk.Button.new_from_stock(Gtk.STOCK_CLOSE)
777+
close = Gtk.Button(label="Close")
777778
close.connect("clicked", self.destroy)
778779
void = Gtk.Label()
779780
buttons = Gtk.HBox()

usr/bin/ice-firefox

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ path = os.path.dirname(chromepath)
1515
execute = 'firefox -profile ' + path + ' -no-remote -new-instance' + ' ' + sys.argv[1]
1616

1717
os.system('mkdir -p ' + chromepath)
18-
os.system('echo "#nav-bar { visibility: hidden !important; max-height: 0 !important; margin-bottom: -20px !important; opacity: 0; } #identity-box, #navigator-toolbox::after, #tabbrowser-tabs { --tab-min-height: 0px !important; margin-left: 0px !important; height: 0px !important; }" > ' + chromepath + '/userChrome.css')
18+
os.system('echo "#nav-bar { max-height: 0 !important; margin-bottom: -20px !important; opacity: 0; } #identity-box, #navigator-toolbox::after, #tabbrowser-tabs { --tab-min-height: 0px !important; margin-left: 0px !important; height: 0px !important; }" > ' + chromepath + '/userChrome.css')
1919
os.system('echo "user_pref(\\"browser.cache.disk.enable\\", false);" > ' + profilepath + '/user.js')
2020
os.system('echo "user_pref(\\"browser.cache.disk.capacity\\", 0);" >> ' + profilepath + '/user.js')
2121
os.system('echo "user_pref(\\"browser.cache.disk.filesystem_reported\\", 1);" >> ' + profilepath + '/user.js')
@@ -26,5 +26,6 @@ os.system('echo "user_pref(\\"browser.ctrlTab.previews\\", true);" >> ' + profil
2626
os.system('echo "user_pref(\\"browser.tabs.warnOnClose\\", false);" >> ' + profilepath + '/user.js')
2727
os.system('echo "user_pref(\\"plugin.state.flash\\", 2);" >> ' + profilepath + '/user.js')
2828
os.system('cp -n /usr/lib/peppermint/ice/search.json.mozlz4 ' + profilepath + '/search.json.mozlz4')
29+
os.system('cp -n /usr/lib/peppermint/ice/places.sqlite ' + profilepath + '/places.sqlite')
2930
os.system(execute)
3031
os.system('rm -rf ' + path + '/cache2')
5 MB
Binary file not shown.

0 commit comments

Comments
 (0)