Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert pull request 599 against stable branch #607

Merged
merged 1 commit into from
Jul 26, 2016
Merged

Revert pull request 599 against stable branch #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 0 additions & 51 deletions code/common/ia7_collection_upgrader.pl
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions code/common/ia7_notifications.pl
View file
Open in desktop

This file was deleted.

13 changes: 6 additions & 7 deletions data/web/collections.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,6 @@
"28" : {
"link" : "/bin/set_parm_tv_provider.pl",
"name" : "Setup TV Provider",
"mode" : "advanced",
"icon" : "fa-desktop"
},
"5" : {
Expand Down Expand Up @@ -488,7 +487,6 @@
"26" : {
"link" : "/ia5/house/irman.shtml",
"name" : "Program IRMAN",
"mode" : "advanced",
"icon" : "fa-rss"
},
"57" : {
Expand Down Expand Up @@ -709,7 +707,6 @@
"27" : {
"icon" : "fa-wrench",
"name" : "Header Control",
"mode" : "advanced",
"link" : "/bin/headercontrol.pl"
},
"78" : {
Expand All @@ -720,7 +717,7 @@
"102" : {
"name" : "Picture Frame",
"icon" : "fa-desktop",
"external" : "$config_parms{html_dir}/misc/photos.shtml"
"external" : "http://home.krkeegan.com:8081/misc/photos.shtml"
},
"105" : {
"link" : "/ia5/calendar/main.shtml",
Expand Down Expand Up @@ -775,12 +772,14 @@
"icon" : "fa-home",
"name" : "Gear Settings",
"children" : [
700
501

]
},
"700" : {
"user" : "$Authorized"
"501" : {
"link" : "/UNSET_PASSWORD?user=admin",
"name" : "Authorize",
"icon" : "fa-lock"
},
"600" : {
"link" : "/ia7/#path=/objects&parents=ia7_status_items",
Expand Down
4 changes: 1 addition & 3 deletions data/web/ia7_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
"fp_icon_size" : "32",
"fp_state_popovers" : "yes",
"substate_percentages" : "20",
"disable_current_state" : "yes",
"notifications" : "yes",
"speech_default" : "banner"
"disable_current_state" : "yes"
},
"objects" : {
"example_object" : {
Expand Down
5 changes: 1 addition & 4 deletions lib/ajax.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,7 @@ sub checkForUpdate {
&main::print_log("checkForUpdate sub ${$$self{sub}} returned $xml")
if $main::Debug{ajax};
&::print_socket_fork( ${ $$self{waitingSocket} }, $xml );
&main::print_log( "Closing Socket " . ${ $$self{waitingSocket} } )
if $main::Debug{ajax};
${ $$self{waitingSocket} }->shutdown(2)
; #Changed this from close() to shutdown(2). In some cases, the parent port wasn't being closed -- ie. speech events
${ $$self{waitingSocket} }->close;
${ $$self{changed} } = 1;
}
else {
Expand Down
Loading