File tree Expand file tree Collapse file tree 3 files changed +12
-3
lines changed Expand file tree Collapse file tree 3 files changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ var firetrayUIOptions = {
4040 ] ) ;
4141 } else if ( firetray . AppIndicator ) {
4242 this . hideUnsupportedOptions ( [
43- 'app_icon_default' ,
43+ 'app_icon_default' ,
4444 'newmail_icon_names'
4545 ] ) ;
4646 } else {
@@ -66,6 +66,12 @@ var firetrayUIOptions = {
6666 this . removePrefPane ( "pref-pane-chat" ) ;
6767 } ;
6868
69+ if ( ! firetray . Handler . canAppind ) {
70+ this . hideUnsupportedOptions ( [
71+ 'ui_use_appindicator_icon'
72+ ] ) ;
73+ }
74+
6975 window . sizeToContent ( ) ;
7076 } ,
7177
Original file line number Diff line number Diff line change @@ -38,6 +38,7 @@ firetray.Handler = {
3838 appHasChat : false ,
3939 appStarted : false ,
4040 useAppind : false , // initialized in StatusIcon
41+ canAppind : false , // initialized in StatusIcon
4142 windows : { } ,
4243 get windowsCount ( ) { return Object . keys ( this . windows ) . length ; } ,
4344 get visibleWindowsCount ( ) {
Original file line number Diff line number Diff line change @@ -29,6 +29,7 @@ firetray.StatusIcon = {
2929 prefNewMailIconNames : null ,
3030 defaultAppIconName : null ,
3131 defaultNewMailIconName : null ,
32+ canAppind : false ,
3233
3334 init : function ( ) {
3435 this . defineIconNames ( ) ;
@@ -110,11 +111,11 @@ firetray.StatusIcon = {
110111 return false ;
111112 }
112113
113- let canAppIndicator = ( appind . available ( ) &&
114+ this . canAppind = ( appind . available ( ) &&
114115 this . dbusNotificationWatcherReady ( ) ) ;
115116
116117 return ( firetray . Utils . prefService . getBoolPref ( 'with_appindicator' ) &&
117- canAppIndicator && isAppindDesktop ) ;
118+ this . canAppind && isAppindDesktop ) ;
118119 } ,
119120
120121 getDesktop : function ( ) {
@@ -223,6 +224,7 @@ firetray.StatusIcon = {
223224
224225
225226firetray . Handler . useAppind = firetray . StatusIcon . appindEnable ( ) ;
227+ firetray . Handler . canAppind = firetray . StatusIcon . canAppind ;
226228
227229firetray . Handler . setIconTooltipDefault = function ( ) {
228230 if ( ! this . app . name )
You can’t perform that action at this time.
0 commit comments