[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=0ee66e2

The following commit has been merged in the master branch:
commit 0ee66e254048498dfb74acb9b1fd224239141f01
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Mon Feb 14 01:59:50 2011 +0200

    Fix license and remove tabs.
---
 haze/CMakeLists.txt                |  4 ++--
 haze/haze-yahoo-account.cpp        | 43 +++++++++++++++++++-------------------
 haze/yahoo-main-options-widget.cpp |  2 +-
 haze/yahoo-main-options-widget.h   | 34 ++++++++++++++++--------------
 4 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/haze/CMakeLists.txt b/haze/CMakeLists.txt
index 4fe6ff4..49711ad 100644
--- a/haze/CMakeLists.txt
+++ b/haze/CMakeLists.txt
@@ -16,7 +16,7 @@ set (kcmtelepathyaccounts_plugin_haze_SRCS
 kde4_add_ui_files (kcmtelepathyaccounts_plugin_haze_SRCS
                    icq-main-options-widget.ui
                    icq-server-settings-widget.ui
-		   yahoo-main-options-widget.ui
+                   yahoo-main-options-widget.ui
 )
 
 kde4_add_plugin (kcmtelepathyaccounts_plugin_haze
@@ -37,4 +37,4 @@ install (TARGETS kcmtelepathyaccounts_plugin_haze
 
 install (FILES kcmtelepathyaccounts_plugin_haze.desktop
          DESTINATION ${SERVICES_INSTALL_DIR}
-)
\ No newline at end of file
+)
diff --git a/haze/haze-yahoo-account.cpp b/haze/haze-yahoo-account.cpp
index ac9d30c..96fda32 100644
--- a/haze/haze-yahoo-account.cpp
+++ b/haze/haze-yahoo-account.cpp
@@ -1,21 +1,22 @@
 /*
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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, see <http://www.gnu.org/licenses/>.
-*/
-
+ * This file is part of telepathy-accounts-kcm
+ *
+ * Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 #include "haze-yahoo-account.h"
 #include <KDebug>
@@ -52,15 +53,15 @@ bool HazeYahooAccount::hasAdvancedOptionsWidget() const
 }
 
 AbstractAccountParametersWidget* HazeYahooAccount::mainOptionsWidget(
-	ParameterEditModel* model,
-	QWidget* parent) const
+        ParameterEditModel* model,
+        QWidget* parent) const
 {
     return new YahooMainOptionsWidget(model,parent);
 }
 
 AbstractAccountParametersWidget* HazeYahooAccount::advancedOptionsWidget(
-	ParameterEditModel* model, 
-	QWidget* parent) const
+        ParameterEditModel* model,
+        QWidget* parent) const
 {
     return NULL;
 }
diff --git a/haze/yahoo-main-options-widget.cpp b/haze/yahoo-main-options-widget.cpp
index 1b40140..10501eb 100644
--- a/haze/yahoo-main-options-widget.cpp
+++ b/haze/yahoo-main-options-widget.cpp
@@ -29,7 +29,7 @@ public:
     Ui::YahooMainOptionsWidget* ui;
 
     Private()
-	: ui(0)
+        : ui(0)
     {
         kDebug();
     }
diff --git a/haze/yahoo-main-options-widget.h b/haze/yahoo-main-options-widget.h
index 5cde313..a694145 100644
--- a/haze/yahoo-main-options-widget.h
+++ b/haze/yahoo-main-options-widget.h
@@ -1,20 +1,22 @@
 /*
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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, see <http://www.gnu.org/licenses/>.
-*/
+ * This file is part of telepathy-accounts-kcm
+ *
+ * Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 
 #ifndef HAZE_YAHOO_ACCOUNT_H

-- 
ktp-accounts-kcm packaging