diff --git a/cmake/GResources.cmake b/cmake/GResources.cmake
index 9766c8f12e473c42fb48bf406eded71ff8e841e9..cf51a923ead9561ae0869f81f94ca31b4be7423f 100644
--- a/cmake/GResources.cmake
+++ b/cmake/GResources.cmake
@@ -19,17 +19,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-# Additional permission under GNU GPL version 3 section 7:
-#
-# If you modify this program, or any covered work, by linking or
-# combining it with the OpenSSL project's OpenSSL library (or a
-# modified version of that library), containing parts covered by the
-# terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-# grants you additional permission to convey the resulting work.
-# Corresponding Source for a non-source form of such a combination
-# shall include the source code for the parts of OpenSSL used as well
-# as that of the covered work.
-#
FIND_PROGRAM(GLIB_COMPILE_RESOURCES_EXECUTABLE NAMES glib-compile-resources)
MARK_AS_ADVANCED(GLIB_COMPILE_RESOURCES_EXECUTABLE)
diff --git a/cmake/GSettings.cmake b/cmake/GSettings.cmake
index 1bdc87418c289381dfc50d677ef8e629047e2bee..c32d67472818924b10fcd95f596cb65defe3c54d 100644
--- a/cmake/GSettings.cmake
+++ b/cmake/GSettings.cmake
@@ -1,7 +1,7 @@
# CMake macros adapted from those written for Marlin, released under GPLv3:
# https://github.com/ammonkey/marlin/blob/master/cmake/GSettings.cmake
#
-# Copyright (C) 2015 Savoir-Faire Linux Inc.
+# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
# Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
#
# This program is free software; you can redistribute it and/or modify
@@ -18,17 +18,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-# Additional permission under GNU GPL version 3 section 7:
-#
-# If you modify this program, or any covered work, by linking or
-# combining it with the OpenSSL project's OpenSSL library (or a
-# modified version of that library), containing parts covered by the
-# terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-# grants you additional permission to convey the resulting work.
-# Corresponding Source for a non-source form of such a combination
-# shall include the source code for the parts of OpenSSL used as well
-# as that of the covered work.
-#
option (GSETTINGS_LOCALCOMPILE "Compile GSettings schemas locally during build to the location of the binary (no need to run 'make install')" ON)
diff --git a/cmake/GitRevision.cmake b/cmake/GitRevision.cmake
index fe0474b5b2d2d516a171c5d39d6a6c76faa9133c..eff05e3271cd4801c9f3bdadb10e0de315fafcda 100644
--- a/cmake/GitRevision.cmake
+++ b/cmake/GitRevision.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2015 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
# Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
#
# This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-# Additional permission under GNU GPL version 3 section 7:
-#
-# If you modify this program, or any covered work, by linking or
-# combining it with the OpenSSL project's OpenSSL library (or a
-# modified version of that library), containing parts covered by the
-# terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
-# grants you additional permission to convey the resulting work.
-# Corresponding Source for a non-source form of such a combination
-# shall include the source code for the parts of OpenSSL used as well
-# as that of the covered work.
-#
FIND_PACKAGE(Git)
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 31fc8334847261a0d2d89db7475a496fd9c22484..8184df4b332d2e6d8282cf23da1f65a57780220a 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -7,4 +7,4 @@ FILE_PATTERNS = *.cpp *.h *.c *.md
INPUT_ENCODING = UTF-8
USE_MDFILE_AS_MAINPAGE = @PROJECT_SOURCE_DIR@/doc/README.md
EXTRACT_ALL = YES
-EXTRACT_LOCAL_CLASSES = YES
\ No newline at end of file
+EXTRACT_LOCAL_CLASSES = YES
diff --git a/src/accountadvancedtab.cpp b/src/accountadvancedtab.cpp
index 1aeeaa3aaa9755a308ea9561e3fd1c38f10ece71..46dbbd22a5ef70af5870f03074aeb2459a39636f 100644
--- a/src/accountadvancedtab.cpp
+++ b/src/accountadvancedtab.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "accountadvancedtab.h"
diff --git a/src/accountadvancedtab.h b/src/accountadvancedtab.h
index e48317d48cba5e9426bec960e4ea66d16944d706..e7e623c5f7c0722fee5b8ff4f8280111ae154a34 100644
--- a/src/accountadvancedtab.h
+++ b/src/accountadvancedtab.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _ACCOUNTADVANCEDTAB_H
@@ -51,4 +40,4 @@ GtkWidget *account_advanced_tab_new (Account *account);
G_END_DECLS
-#endif /* _ACCOUNTADVANCEDTAB_H */
\ No newline at end of file
+#endif /* _ACCOUNTADVANCEDTAB_H */
diff --git a/src/accountaudiotab.cpp b/src/accountaudiotab.cpp
index 58fa68aa3f7e5ab7265643f3d2b2648869ac5a08..fae97c6b123b67a09263f1a1097d6ff3f9d256d8 100644
--- a/src/accountaudiotab.cpp
+++ b/src/accountaudiotab.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "accountaudiotab.h"
diff --git a/src/accountaudiotab.h b/src/accountaudiotab.h
index 6040137d2e64fe558e264e3e2df7fe97d10600b9..818c349bdc1d07cd5dabf1eaa76081958b0aac35 100644
--- a/src/accountaudiotab.h
+++ b/src/accountaudiotab.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _ACCOUNTAUDIOTAB_H
@@ -50,4 +39,4 @@ GtkWidget *account_audio_tab_new (Account *account);
G_END_DECLS
-#endif /* _ACCOUNTAUDIOTAB_H */
\ No newline at end of file
+#endif /* _ACCOUNTAUDIOTAB_H */
diff --git a/src/accountgeneraltab.cpp b/src/accountgeneraltab.cpp
index 97d8cc9944e348ff1b106631286b04efdb98c617..5f3ddd8671c2d54166ed6db47ea10d156850b957 100644
--- a/src/accountgeneraltab.cpp
+++ b/src/accountgeneraltab.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "accountgeneraltab.h"
diff --git a/src/accountgeneraltab.h b/src/accountgeneraltab.h
index c411315ea40d11fd7abda30cba4a56d34b2b8994..910a7d9dff747cd63411df2c4f4bdec14ef2bc86 100644
--- a/src/accountgeneraltab.h
+++ b/src/accountgeneraltab.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _ACCOUNTGENERALTAB_H
@@ -50,4 +39,4 @@ GtkWidget *account_general_tab_new (Account *account);
G_END_DECLS
-#endif /* _ACCOUNTGENERALTAB_H */
\ No newline at end of file
+#endif /* _ACCOUNTGENERALTAB_H */
diff --git a/src/accountsecuritytab.cpp b/src/accountsecuritytab.cpp
index 052710745d2a594e511589af9a1234362aa2ec46..028ae7749cdc22262afb5245932f666ccc428829 100644
--- a/src/accountsecuritytab.cpp
+++ b/src/accountsecuritytab.cpp
@@ -1,5 +1,5 @@
- /*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+/*
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "accountsecuritytab.h"
diff --git a/src/accountsecuritytab.h b/src/accountsecuritytab.h
index 604fac0a4760cd5b3557a50ca7943546cd7114cb..882c731182413f6c6968d47532a0cb97c7375a5e 100644
--- a/src/accountsecuritytab.h
+++ b/src/accountsecuritytab.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _ACCOUNTSECURITYTAB_H
@@ -51,4 +40,4 @@ GtkWidget *account_security_tab_new (Account *account);
G_END_DECLS
-#endif /* _ACCOUNTSECURITYTAB_H */
\ No newline at end of file
+#endif /* _ACCOUNTSECURITYTAB_H */
diff --git a/src/accountvideotab.cpp b/src/accountvideotab.cpp
index e9b4466bf43c7ddad8358c9f1d24b115ed91096e..5fff98ce555fde60edb129608815645977296712 100644
--- a/src/accountvideotab.cpp
+++ b/src/accountvideotab.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "accountvideotab.h"
diff --git a/src/accountvideotab.h b/src/accountvideotab.h
index 83116a95257464586d35a967e213e15091941386..6d727025ffcdbe6faf5f5463cd47e4ebc4c64114 100644
--- a/src/accountvideotab.h
+++ b/src/accountvideotab.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _ACCOUNTVIDEOTAB_H
@@ -50,4 +39,4 @@ GtkWidget *account_video_tab_new (Account *account);
G_END_DECLS
-#endif /* _ACCOUNTVIDEOTAB_H */
\ No newline at end of file
+#endif /* _ACCOUNTVIDEOTAB_H */
diff --git a/src/accountview.cpp b/src/accountview.cpp
index 84dc12709b48a54df014d411438d2d62abda1584..10543004729e1c87df803b21e14c581e813e146b 100644
--- a/src/accountview.cpp
+++ b/src/accountview.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "accountview.h"
diff --git a/src/accountview.h b/src/accountview.h
index 2931f502956e77c2310adea49892feae839f8f23..569fb38e8e852563f246dd62c98a1c3d5fb338a3 100644
--- a/src/accountview.h
+++ b/src/accountview.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _ACCOUNTVIEW_H
@@ -49,4 +38,4 @@ GtkWidget *account_view_new (void);
G_END_DECLS
-#endif /* _ACCOUNTVIEW_H */
\ No newline at end of file
+#endif /* _ACCOUNTVIEW_H */
diff --git a/src/backends/edscontactbackend.cpp b/src/backends/edscontactbackend.cpp
index e2ccef7c49e15c0726af7ffca15698431f307009..c099aed2748bfb952bd83e36906cff0e3dbf802d 100644
--- a/src/backends/edscontactbackend.cpp
+++ b/src/backends/edscontactbackend.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "edscontactbackend.h"
diff --git a/src/backends/edscontactbackend.h b/src/backends/edscontactbackend.h
index f53e62625a5e54266c4f12609e60f5e6fbec2643..f67d38d6063505dcf03599fe3a8fe2095172d79c 100644
--- a/src/backends/edscontactbackend.h
+++ b/src/backends/edscontactbackend.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef EDSCONTACTBACKEND_H
diff --git a/src/choosecontactview.cpp b/src/choosecontactview.cpp
index 4d5a7bdc1facb8245a6ceaa8b1dbcaf41091ea54..c5b46113242f3cfc3fce9654d1dec0c8dfd57168 100644
--- a/src/choosecontactview.cpp
+++ b/src/choosecontactview.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "choosecontactview.h"
diff --git a/src/choosecontactview.h b/src/choosecontactview.h
index 20ce78ff7a989d22146d58cb7e93933c49d32a58..efe1eb84c2d288cae54d8080580c02317ee4845b 100644
--- a/src/choosecontactview.h
+++ b/src/choosecontactview.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _CHOOSECONTACTVIEW_H
diff --git a/src/contactpopover.cpp b/src/contactpopover.cpp
index b41038c2597cc56cb2ebc40f00eab3c32a4f018b..f0627f5a11c391811140addec472ed5109e3335d 100644
--- a/src/contactpopover.cpp
+++ b/src/contactpopover.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "contactpopover.h"
diff --git a/src/contactpopover.h b/src/contactpopover.h
index 6b3b80169bc9aaa5de94939e47481b0d039ac21b..b2e791c698cddd8ef3564c669211205a7ef0da74 100644
--- a/src/contactpopover.h
+++ b/src/contactpopover.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _CONTACTPOPOVER_H
diff --git a/src/contactsview.cpp b/src/contactsview.cpp
index 9e2877068b04035933064d6a96422fba82db32e3..26067e078549fff611de89b52d3be09ab121e5a4 100644
--- a/src/contactsview.cpp
+++ b/src/contactsview.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "contactsview.h"
diff --git a/src/contactsview.h b/src/contactsview.h
index 43c097da7b76ae13331d8db99b96c36398a451bb..49ec8c9df1e7e573cd397951199def8716af066f 100644
--- a/src/contactsview.h
+++ b/src/contactsview.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _CONTACTSVIEW_H
diff --git a/src/currentcallview.cpp b/src/currentcallview.cpp
index 1dcf932c6655c1b1ac99e12e3aec75a9a39ffe1d..8d8808d1ac229db335d80d81106d164c7dee709e 100644
--- a/src/currentcallview.cpp
+++ b/src/currentcallview.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "currentcallview.h"
diff --git a/src/currentcallview.h b/src/currentcallview.h
index 887e669380fb54dd33af370adb78418e5948ad42..686da4359815a3d581eae3c8df01b42bfa3ed4ce 100644
--- a/src/currentcallview.h
+++ b/src/currentcallview.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _CURRENTCALLVIEW_H
diff --git a/src/defines.h b/src/defines.h
index a3a611995da83ca0d643989f73cec16b3916c568..2ad210b3c300e5ea47c572906ba4c735804a3457 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,21 +15,10 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __DEFINES_H__
#define BUTTON_RIGHT_CLICK 3
-#endif /* __DEFINES_H__ */
\ No newline at end of file
+#endif /* __DEFINES_H__ */
diff --git a/src/dialogs.c b/src/dialogs.c
index 25cfee1082f279bc4b625ae87691565ffe4f2cf2..4cbdd865a8add47252007de35b6507197f385de0 100644
--- a/src/dialogs.c
+++ b/src/dialogs.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -107,7 +107,7 @@ ring_about_dialog(GtkWidget *parent)
gtk_show_about_dialog(
GTK_WINDOW(parent),
"program-name", name,
- "copyright", "© 2015 Savoir-faire Linux",
+ "copyright", "© 2016 Savoir-faire Linux",
"license-type", GTK_LICENSE_GPL_3_0,
"logo", logo,
"version", version,
diff --git a/src/dialogs.h b/src/dialogs.h
index a22c26518a18719b0aeee0d55a67d7e9b8a60379..d602a21d26eb4e837da80817fd8f6debe971feb2 100644
--- a/src/dialogs.h
+++ b/src/dialogs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _DIALOGS_H
diff --git a/src/editcontactview.cpp b/src/editcontactview.cpp
index fa6a7cc003ac2b3fe94a86899d1b73477def7c8d..5242d5033ace4b30766c512cb389c452f3aacab6 100644
--- a/src/editcontactview.cpp
+++ b/src/editcontactview.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "editcontactview.h"
diff --git a/src/editcontactview.h b/src/editcontactview.h
index 64c283360ae4be75c59109441d184a5d1f0b2e5b..a1a5baeb5b3967f0f8fab871b26b4ab207ef34f8 100644
--- a/src/editcontactview.h
+++ b/src/editcontactview.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _EDITCONTACTVIEW_H
diff --git a/src/generalsettingsview.cpp b/src/generalsettingsview.cpp
index 9bf1e067131d4ec821c2a1430e66896fc8780d53..883b0acb6edd593102ed45f2a3cf6e8f0b3ca4da 100644
--- a/src/generalsettingsview.cpp
+++ b/src/generalsettingsview.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "generalsettingsview.h"
diff --git a/src/generalsettingsview.h b/src/generalsettingsview.h
index 5a478f99a95353592452e8b9bcace5c19bfb71c3..8557eb7d4f53b68e246988b8e8f6382e6f7eacfd 100644
--- a/src/generalsettingsview.h
+++ b/src/generalsettingsview.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _GENERALSETTINGSVIEW_H
@@ -49,4 +38,4 @@ GtkWidget *general_settings_view_new (void);
G_END_DECLS
-#endif /* _GENERALSETTINGSVIEW_H */
\ No newline at end of file
+#endif /* _GENERALSETTINGSVIEW_H */
diff --git a/src/historyview.cpp b/src/historyview.cpp
index 2c13bb2e49e1d278f81980f5346d52fcb4842a40..9e3a6553a513a0869b84033f565f2e111cf42c7a 100644
--- a/src/historyview.cpp
+++ b/src/historyview.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "historyview.h"
diff --git a/src/historyview.h b/src/historyview.h
index 1f4cb06d8d5923027bcd1f9609343850fc490e73..587af3773c78841dac0429bb66a42097987ca63c 100644
--- a/src/historyview.h
+++ b/src/historyview.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _HISTORYVIEW_H
diff --git a/src/incomingcallview.cpp b/src/incomingcallview.cpp
index 836afff0aef4b2acfee2b5f0cb21b850d7ee0550..6dfaa610606b0f1e52ca9f4e132d19fe26d7b741 100644
--- a/src/incomingcallview.cpp
+++ b/src/incomingcallview.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "incomingcallview.h"
diff --git a/src/incomingcallview.h b/src/incomingcallview.h
index 1a25c7221bf8caef58aa4d40fcc9bc10de27a1db..517836fa218d268c05f27b15c7565b433cdc870d 100644
--- a/src/incomingcallview.h
+++ b/src/incomingcallview.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _INCOMINGCALLVIEW_H
@@ -52,4 +41,4 @@ void incoming_call_view_set_call_info (IncomingCallView *view, const QMode
G_END_DECLS
-#endif /* _INCOMINGCALLVIEW_H */
\ No newline at end of file
+#endif /* _INCOMINGCALLVIEW_H */
diff --git a/src/main.cpp b/src/main.cpp
index 1ca9c3e7734b58b7ca44c2e6d3ac8a1373d1e7e2..718b3ab1aa633187499a48b0ea25e2899b4842fb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include <gtk/gtk.h>
diff --git a/src/mediasettingsview.cpp b/src/mediasettingsview.cpp
index 2760313d25ccbcdf41cfadf66706180744da9ca0..3d8fe01ae1f4c6c695bba7b616fafa00c1d13c09 100644
--- a/src/mediasettingsview.cpp
+++ b/src/mediasettingsview.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "mediasettingsview.h"
diff --git a/src/mediasettingsview.h b/src/mediasettingsview.h
index 735082cffe5a4d4573848d885e3aeec7aef4bd70..465f83f5680ae9b00fda0dc2facafbaf3905e4cf 100644
--- a/src/mediasettingsview.h
+++ b/src/mediasettingsview.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _MEDIASETTINGSVIEW_H
@@ -50,4 +39,4 @@ void media_settings_view_show_preview (MediaSettingsView *self, gboolean
G_END_DECLS
-#endif /* _MEDIASETTINGSVIEW_H */
\ No newline at end of file
+#endif /* _MEDIASETTINGSVIEW_H */
diff --git a/src/models/activeitemproxymodel.cpp b/src/models/activeitemproxymodel.cpp
index b7233be6e23f7900d40f8d76b8719b23e9949e3e..8c2b815a7d3a5878cba59aaa68ede5e4c1cc5386 100644
--- a/src/models/activeitemproxymodel.cpp
+++ b/src/models/activeitemproxymodel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "activeitemproxymodel.h"
diff --git a/src/models/activeitemproxymodel.h b/src/models/activeitemproxymodel.h
index 402910225297bdde5c26e70a722618a247f31520..df738fe54b152da5c0f54cb245c4a151c3e72da0 100644
--- a/src/models/activeitemproxymodel.h
+++ b/src/models/activeitemproxymodel.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef ACTIVEITEMPROXYMODEL_H
@@ -44,4 +33,4 @@ public:
virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
};
-#endif /* ACTIVEITEMPROXYMODEL_H */
\ No newline at end of file
+#endif /* ACTIVEITEMPROXYMODEL_H */
diff --git a/src/models/gtkaccessproxymodel.cpp b/src/models/gtkaccessproxymodel.cpp
index f810e77ffd86c1217682ede59d1fb61f5872415a..e8ae855766d59f213f8a70a0ce2fb8ac41579da7 100644
--- a/src/models/gtkaccessproxymodel.cpp
+++ b/src/models/gtkaccessproxymodel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "gtkaccessproxymodel.h"
@@ -33,4 +22,4 @@
QModelIndex GtkAccessProxyModel::indexFromId(int row, int column, void *ptr) const
{
return QAbstractItemModel::createIndex(row, column, ptr);
-}
\ No newline at end of file
+}
diff --git a/src/models/gtkaccessproxymodel.h b/src/models/gtkaccessproxymodel.h
index 2a199a4ddba663ded25b4a16aa9bd0f2432f4200..c75e05b0c2157a44f05a0f2623bd819e80a0f5ba 100644
--- a/src/models/gtkaccessproxymodel.h
+++ b/src/models/gtkaccessproxymodel.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef GTK_ACCESS_PROXY_MODEL_H_
@@ -39,4 +28,4 @@ public:
QModelIndex indexFromId(int row, int column, void *ptr) const;
};
-#endif /* GTK_ACCESS_PROXY_MODEL_H_ */
\ No newline at end of file
+#endif /* GTK_ACCESS_PROXY_MODEL_H_ */
diff --git a/src/models/gtkqsortfiltertreemodel.cpp b/src/models/gtkqsortfiltertreemodel.cpp
index 395c9c1392ee6bdc5f634ecee2aa2785ea8640e8..ef6ebfae08bed9577e17a215155ec588b78e2629 100644
--- a/src/models/gtkqsortfiltertreemodel.cpp
+++ b/src/models/gtkqsortfiltertreemodel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "gtkqsortfiltertreemodel.h"
diff --git a/src/models/gtkqsortfiltertreemodel.h b/src/models/gtkqsortfiltertreemodel.h
index 3929e3d0f1128cea2d6ee6de40ee1ced59745f80..f0d9d9970321b263ee635dd5cf30e8f0cd395c65 100644
--- a/src/models/gtkqsortfiltertreemodel.h
+++ b/src/models/gtkqsortfiltertreemodel.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef GTK_Q_SORT_FILTER_TREE_MODEL_H_
diff --git a/src/models/gtkqtreemodel.cpp b/src/models/gtkqtreemodel.cpp
index c33b323e1dc5e84d3ec4d289af9679dfa2b0ada9..2d732989e8e176de6b4897bdb08c861972298e76 100644
--- a/src/models/gtkqtreemodel.cpp
+++ b/src/models/gtkqtreemodel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "gtkqtreemodel.h"
diff --git a/src/models/gtkqtreemodel.h b/src/models/gtkqtreemodel.h
index 34a6c1fdb7c9d32cc199e4a76608004936e0d07f..c7d3aadea359373e478ecaa28e171404d5eced5d 100644
--- a/src/models/gtkqtreemodel.h
+++ b/src/models/gtkqtreemodel.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef GTK_Q_TREE_MODEL_H_
diff --git a/src/native/dbuserrorhandler.cpp b/src/native/dbuserrorhandler.cpp
index ee1be0fd6fb65d2488a2dda6867fb8390d5a6dd3..64ca18364d45d10ff327b6ae54600624ebe0e51e 100644
--- a/src/native/dbuserrorhandler.cpp
+++ b/src/native/dbuserrorhandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,8 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
*/
#include "dbuserrorhandler.h"
diff --git a/src/native/dbuserrorhandler.h b/src/native/dbuserrorhandler.h
index b0267ce64829a91289eda110fadd120d96971217..b026261122ba9e26fc681bdb27bd07d75a67861e 100644
--- a/src/native/dbuserrorhandler.h
+++ b/src/native/dbuserrorhandler.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/native/pixbufmanipulator.cpp b/src/native/pixbufmanipulator.cpp
index 0051872270d2eb36a7567085bbf97acc7bf640f2..22dfb484c88c792db488754f26f0bd9eb9006474 100644
--- a/src/native/pixbufmanipulator.cpp
+++ b/src/native/pixbufmanipulator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "pixbufmanipulator.h"
diff --git a/src/native/pixbufmanipulator.h b/src/native/pixbufmanipulator.h
index 368a3278a828850f5be3a12882d1fecc24b30b93..cbb303ae450a7165e8b78713895b7ca506f50602 100644
--- a/src/native/pixbufmanipulator.h
+++ b/src/native/pixbufmanipulator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#pragma once
diff --git a/src/recentcontactsview.cpp b/src/recentcontactsview.cpp
index 44fa3a6c423739fa19db2899507eb97259fe3816..69f327ee3e642bde53bfb0b8c282a92133a8d8d0 100644
--- a/src/recentcontactsview.cpp
+++ b/src/recentcontactsview.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/recentcontactsview.h b/src/recentcontactsview.h
index eb56e6b079d492eb1d63a9c1394b4c903cff77a1..a54d82bf2ae86cff75991286030cc7ac65007b25 100644
--- a/src/recentcontactsview.h
+++ b/src/recentcontactsview.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/ring b/src/ring
index c158f684839685c12eb366dad54f60180eccd56c..48e9e74aeef697fe8e243fdc5e305238af5b1333 100644
--- a/src/ring
+++ b/src/ring
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (C) 2015 Savoir-Faire Linux Inc.
+# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
# Author: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
# Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
#
@@ -18,17 +18,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-# Additional permission under GNU GPL version 3 section 7:
-#
-# If you modify this program, or any covered work, by linking or
-# combining it with the OpenSSL project's OpenSSL library (or a
-# modified version of that library), containing parts covered by the
-# terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-# grants you additional permission to convey the resulting work.
-# Corresponding Source for a non-source form of such a combination
-# shall include the source code for the parts of OpenSSL used as well
-# as that of the covered work.
-#
HAS_KDE=0
HAS_GNOME=0
diff --git a/src/ring_client.cpp b/src/ring_client.cpp
index 045c007c789be486a6ff0c23b02925c64fa8964f..8326338ffef9e985e94980df80c0a03cb896da21 100644
--- a/src/ring_client.cpp
+++ b/src/ring_client.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "ring_client.h"
diff --git a/src/ring_client.h b/src/ring_client.h
index 4abfed26208742bef870e22c06daa3687419c262..7c21cf29aaf960b4b0a6439f5f255ba5a47b0ea6 100644
--- a/src/ring_client.h
+++ b/src/ring_client.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/ring_client_options.c b/src/ring_client_options.c
index 51ac1bc00a4aee9334b4197e028eafcca0ecc92c..0b79009d12d351ee0ad0cbc8f32f33996a1371fe 100644
--- a/src/ring_client_options.c
+++ b/src/ring_client_options.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2016 Savoir-faire Linux Inc.
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
diff --git a/src/ring_client_options.h b/src/ring_client_options.h
index 445000e9a9ff42b666451245e72b0ecf6a237174..5fdad291dc19e3e329b0df8ce08eb3caa7409c2e 100644
--- a/src/ring_client_options.h
+++ b/src/ring_client_options.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2013-2016 Savoir-faire Linux Inc.
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef RING_CLIENT_OPTIONS_H_
diff --git a/src/ringmainwindow.cpp b/src/ringmainwindow.cpp
index acb05ab93615f2ea47a29552e2e749b66d1eca85..f551a422d065de1889b70c17ddc49f4fded7eaea 100644
--- a/src/ringmainwindow.cpp
+++ b/src/ringmainwindow.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "ringmainwindow.h"
diff --git a/src/ringmainwindow.h b/src/ringmainwindow.h
index 6ea8f70cb2862a7540e12b1ced6bc0355aed61ad..0b3af2109e2d9b1e78bb9de2ba09dfbd0d1015fe 100644
--- a/src/ringmainwindow.h
+++ b/src/ringmainwindow.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _RINGMAINWINDOW_H
diff --git a/src/ringnotify.cpp b/src/ringnotify.cpp
index 8cd8e90aeba572e0017d98d3927d69eaef25e66b..ad7875a874cb6eb1197d5f737a2eabb4c9a512f2 100644
--- a/src/ringnotify.cpp
+++ b/src/ringnotify.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "ringnotify.h"
diff --git a/src/ringnotify.h b/src/ringnotify.h
index d42c972b2945cb9183e878af5999430cc7aea7ea..ba97e33122d2511d969d2626c252124f24a832c2 100644
--- a/src/ringnotify.h
+++ b/src/ringnotify.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef RING_NOTIFY_H_
diff --git a/src/ringwelcomeview.cpp b/src/ringwelcomeview.cpp
index 0e3713766f515a88c73a6c711137c9391b7f8be6..4f28faec75ade3e67c48fe5f81794a25148e9573 100644
--- a/src/ringwelcomeview.cpp
+++ b/src/ringwelcomeview.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/ringwelcomeview.h b/src/ringwelcomeview.h
index d01c73730196d6288797bcfb62ecff2cd247e6fe..6120e60135d403d678b78007186762eaf020509c 100644
--- a/src/ringwelcomeview.h
+++ b/src/ringwelcomeview.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/utils/accounts.cpp b/src/utils/accounts.cpp
index fbc640cb3fbef56458135625d02d656d1edec792..c2591e8c7a697fb4802512ce56d038b549b80c29 100644
--- a/src/utils/accounts.cpp
+++ b/src/utils/accounts.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "accounts.h"
diff --git a/src/utils/accounts.h b/src/utils/accounts.h
index 06fe1d245dc74e5effdd5b30a5f14c8b58a7f105..4f49b794e369c8509022f43392e77b21792ff91b 100644
--- a/src/utils/accounts.h
+++ b/src/utils/accounts.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _ACCOUNTS_H
diff --git a/src/utils/calling.cpp b/src/utils/calling.cpp
index 4a682ffdaba3c338de0922423c3d96e7b484d315..e52e142ac938b54bde3847c4aa2e0aa451b49269 100644
--- a/src/utils/calling.cpp
+++ b/src/utils/calling.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "calling.h"
diff --git a/src/utils/calling.h b/src/utils/calling.h
index 0772111e7527b3b4abb46f451025bb4099884c24..b8a986c09d9b5dde8f12974cef3ea3987a441283 100644
--- a/src/utils/calling.h
+++ b/src/utils/calling.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _CALLING_H
@@ -37,4 +26,4 @@ class Account;
void
place_new_call(const ContactMethod *n, Account *acc = nullptr);
-#endif /* _CALLING_H */
\ No newline at end of file
+#endif /* _CALLING_H */
diff --git a/src/utils/drawing.cpp b/src/utils/drawing.cpp
index 89ba21a19cf21640ed4b34902f23dd1378a75b05..8c535d41b9a03514a4f11f9500dc80266abeeab8 100644
--- a/src/utils/drawing.cpp
+++ b/src/utils/drawing.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "drawing.h"
diff --git a/src/utils/drawing.h b/src/utils/drawing.h
index 284fca6f651e20da0b339bba70a527f7a8bbcf1d..ee96cc3b9c4cc7d19682697c417fa3c817e7440b 100644
--- a/src/utils/drawing.h
+++ b/src/utils/drawing.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _DRAWING_H
diff --git a/src/utils/files.cpp b/src/utils/files.cpp
index 2356cab84c2e519db148fd9d6d782cdd61015e90..d941cc4284819ad96beac180bfeadef05be3bbf2 100644
--- a/src/utils/files.cpp
+++ b/src/utils/files.cpp
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+ * Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
+ *
+ * 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 3 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
#include "files.h"
#include <memory>
diff --git a/src/utils/files.h b/src/utils/files.h
index b912790911cd10b77b215e44ad5f7289c5f44c8c..847ce94a6688b72eaeeb1cf3951fa85f667bd3ea 100644
--- a/src/utils/files.h
+++ b/src/utils/files.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _FILES_H
diff --git a/src/utils/menus.cpp b/src/utils/menus.cpp
index ab498c831f34831ece8ead8304f88dd0b4144b19..313527d0a01fbbd18c73814a6637c48f32480d50 100644
--- a/src/utils/menus.cpp
+++ b/src/utils/menus.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "menus.h"
diff --git a/src/utils/menus.h b/src/utils/menus.h
index 359fbf74299471a162167aad95c7937690ca3b53..4b792d404cada9d580095d076512cfcfd6ab27fd 100644
--- a/src/utils/menus.h
+++ b/src/utils/menus.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _MENUS_H
diff --git a/src/utils/models.cpp b/src/utils/models.cpp
index 1052bb15c5159c0f8dfd3e05063dd30f29012550..db0a4b35c258826e1b53904d23f9006260910ecf 100644
--- a/src/utils/models.cpp
+++ b/src/utils/models.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "models.h"
diff --git a/src/utils/models.h b/src/utils/models.h
index 1eeeefbc11c8723585a0dc348b6986c32ef5838a..f0ea7c5d3d4afa2103894339c8310a8b49262c02 100644
--- a/src/utils/models.h
+++ b/src/utils/models.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef _MODELS_H
@@ -50,4 +39,4 @@ gtk_combo_box_set_active_index(GtkComboBox *box, const QModelIndex& idx);
QMetaObject::Connection
gtk_combo_box_set_qmodel(GtkComboBox *box, QAbstractItemModel *qmodel, QItemSelectionModel *selection_model);
-#endif /* _MODELS_H */
\ No newline at end of file
+#endif /* _MODELS_H */
diff --git a/src/video/video_widget.cpp b/src/video/video_widget.cpp
index 61492f5ffd2acfeffa3916a8d22a9c18734c00d7..6989a37afdf325afcdfb2363ac47b6afd3515311 100644
--- a/src/video/video_widget.cpp
+++ b/src/video/video_widget.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#include "video_widget.h"
diff --git a/src/video/video_widget.h b/src/video/video_widget.h
index ce66f2957201a75011715603d86ed3647e9d496a..de677bc3ca4e75be5669f1d7f8c8fec15fafab42 100644
--- a/src/video/video_widget.h
+++ b/src/video/video_widget.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#ifndef __VIDEO_WIDGET_H__