Merge lp:~elementary-apps/capnet-assist/bitesize-cleanups into lp:~elementary-apps/capnet-assist/trunk

[Danielle Foré]

CaptiveLogin.vala:
* Update license header
* return privacy mode without creating a variable
* remove extra comment

[Adam Bieńkowski (donadigo)]

No issues with it.

review: Approve (code / testing)

=== modified file 'src/CaptiveLogin.vala'
--- src/CaptiveLogin.vala	2016-09-08 19:50:06 +0000
+++ src/CaptiveLogin.vala	2016-09-09 01:34:50 +0000
@@ -1,21 +1,22 @@
-/***
-    BEGIN LICENSE
-
-    Copyright (C) 2015 elementary LLC.
-    This program is free software: you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License version 3, as published
-    by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranties of
-    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-    PURPOSE.  See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program.  If not, see <http://www.gnu.org/licenses/>
-
-    END LICENSE
-***/
+/*
+* Copyright (c) 2015 - 2016 elementary LLC (http://launchpad.net/capnet-assist)
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+* Boston, MA 02111-1307, USA.
+*
+*/
 
 public class ValaBrowser : Gtk.ApplicationWindow {
 
@@ -43,9 +44,8 @@
 
     bool is_privacy_mode_enabled () {
         var privacy_settings = new GLib.Settings ("org.gnome.desktop.privacy");
-        bool privacy_mode = !privacy_settings.get_boolean ("remember-recent-files") ||
-                            !privacy_settings.get_boolean ("remember-app-usage");
-        return privacy_mode;
+        return !privacy_settings.get_boolean ("remember-recent-files") ||
+               !privacy_settings.get_boolean ("remember-app-usage");
     }
 
     private void setup_web_view () {
@@ -243,7 +243,7 @@
     private void connect_signals () {
         this.destroy.connect (application.quit);
         tls_button.toggled.connect (on_tls_button_click);
-        //should title change?
+
         web_view.notify["title"].connect ((view, param_spec) => {
             title_label.set_text (web_view.get_title ());
         });