@ -220,12 +220,13 @@ const WeatherMenuButton = new Lang.Class({
reactive : false
reactive : false
} ) ;
} ) ;
if ( ExtensionUtils . versionCheck ( [ '3.9' , '3.10' ] , Config . PACKAGE _VERSION ) ) {
log ( "gnome-shell-version: " + Config . PACKAGE _VERSION ) ;
_itemCurrent . actor . add _actor ( this . _currentWeather ) ;
if ( ExtensionUtils . versionCheck ( [ '3.6' , '3.8' ] , Config . PACKAGE _VERSION ) ) {
_itemFuture . actor . add _actor ( this . _futureWeather ) ;
} else {
_itemCurrent . addActor ( this . _currentWeather ) ;
_itemCurrent . addActor ( this . _currentWeather ) ;
_itemFuture . addActor ( this . _futureWeather ) ;
_itemFuture . addActor ( this . _futureWeather ) ;
} else {
_itemCurrent . actor . add _actor ( this . _currentWeather ) ;
_itemFuture . actor . add _actor ( this . _futureWeather ) ;
}
}
this . menu . addMenuItem ( _itemCurrent ) ;
this . menu . addMenuItem ( _itemCurrent ) ;
@ -662,10 +663,10 @@ const WeatherMenuButton = new Lang.Class({
item = new PopupMenu . PopupMenuItem ( this . extractLocation ( cities [ i ] ) ) ;
item = new PopupMenu . PopupMenuItem ( this . extractLocation ( cities [ i ] ) ) ;
item . location = i ;
item . location = i ;
if ( i == this . _actual _city ) {
if ( i == this . _actual _city ) {
if ( ExtensionUtils . versionCheck ( [ '3.9' , '3.10' ] , Config . PACKAGE _VERSION ) )
if ( ExtensionUtils . versionCheck ( [ '3.6' , '3.8' ] , Config . PACKAGE _VERSION ) )
item . setOrnament ( PopupMenu . Ornament . DOT ) ;
else
item . setShowDot ( true ) ;
item . setShowDot ( true ) ;
else
item . setOrnament ( PopupMenu . Ornament . DOT ) ;
}
}
this . _selectCity . menu . addMenuItem ( item ) ;
this . _selectCity . menu . addMenuItem ( item ) ;
@ -1138,7 +1139,7 @@ weather-storm.png = weather-storm-symbolic.svg
load _json _async : function ( url , params , fun ) {
load _json _async : function ( url , params , fun ) {
if ( _httpSession == undefined ) {
if ( _httpSession == undefined ) {
if ( ExtensionUtils . versionCheck ( [ '3.6' , '3.7' ] , Config . PACKAGE _VERSION ) ) {
if ( ExtensionUtils . versionCheck ( [ '3.6' ] , Config . PACKAGE _VERSION ) ) {
// Soup session (see https://bugzilla.gnome.org/show_bug.cgi?id=661323#c64) (Simon Legner)
// Soup session (see https://bugzilla.gnome.org/show_bug.cgi?id=661323#c64) (Simon Legner)
_httpSession = new Soup . SessionAsync ( ) ;
_httpSession = new Soup . SessionAsync ( ) ;
Soup . Session . prototype . add _feature . call ( _httpSession , new Soup . ProxyResolverDefault ( ) ) ;
Soup . Session . prototype . add _feature . call ( _httpSession , new Soup . ProxyResolverDefault ( ) ) ;