[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:00:53 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=5e414c4
The following commit has been merged in the master branch:
commit 5e414c4e9c0c6b5dd9a05ba8ce2266a716aabef7
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Tue Dec 27 17:39:49 2011 +0100
Add .profile for msn using gabble and empty config dialog
FEATURE: 289154
---
data/profiles/msn-xmpp.profile | 16 +++++++++++
plugins/gabble/CMakeLists.txt | 3 ++
plugins/gabble/gabble-account-ui.cpp | 5 +++-
.../main-options-widget-msn.cpp} | 32 ++++++++++++----------
...widget-facebook.h => main-options-widget-msn.h} | 23 ++++++++--------
plugins/gabble/main-options-widget-msn.ui | 21 ++++++++++++++
6 files changed, 72 insertions(+), 28 deletions(-)
diff --git a/data/profiles/msn-xmpp.profile b/data/profiles/msn-xmpp.profile
new file mode 100644
index 0000000..b8ccf1e
--- /dev/null
+++ b/data/profiles/msn-xmpp.profile
@@ -0,0 +1,16 @@
+<service xmlns="http://telepathy.freedesktop.org/wiki/service-profile-v1"
+ id="msn-xmpp"
+ type="IM"
+ provider="msn-xmpp"
+ manager="gabble"
+ protocol="jabber"
+ icon="im-msn">
+ <name>MSN (using XMPP)</name>
+
+ <parameters>
+ <parameter name="server" type="s" mandatory="1">xmpp.messenger.live.com</parameter>
+ <parameter name="port" type="u" mandatory="1">5222</parameter>
+ <parameter name="ignore-ssl-errors" type="b" mandatory="1">1</parameter>
+ <parameter name="account" type="s" mandatory="1">messenger.live.com</parameter>
+ </parameters>
+</service>
diff --git a/plugins/gabble/CMakeLists.txt b/plugins/gabble/CMakeLists.txt
index d979ad7..327d5a5 100644
--- a/plugins/gabble/CMakeLists.txt
+++ b/plugins/gabble/CMakeLists.txt
@@ -10,6 +10,7 @@ set (ktpaccountskcm_plugin_gabble_SRCS
main-options-widget.cpp
main-options-widget-googletalk.cpp
main-options-widget-facebook.cpp
+ main-options-widget-msn.cpp
server-settings-widget.cpp
proxy-settings-widget.cpp
)
@@ -18,10 +19,12 @@ kde4_add_ui_files (ktpaccountskcm_plugin_gabble_SRCS
main-options-widget.ui
main-options-widget-googletalk.ui
main-options-widget-facebook.ui
+ main-options-widget-msn.ui
server-settings-widget.ui
proxy-settings-widget.ui
)
+
kde4_add_plugin (ktpaccountskcm_plugin_gabble
${ktpaccountskcm_plugin_gabble_SRCS}
)
diff --git a/plugins/gabble/gabble-account-ui.cpp b/plugins/gabble/gabble-account-ui.cpp
index e563e93..5f6df72 100644
--- a/plugins/gabble/gabble-account-ui.cpp
+++ b/plugins/gabble/gabble-account-ui.cpp
@@ -23,6 +23,7 @@
#include "main-options-widget.h"
#include "main-options-widget-googletalk.h"
#include "main-options-widget-facebook.h"
+#include "main-options-widget-msn.h"
#include "server-settings-widget.h"
#include "proxy-settings-widget.h"
@@ -72,8 +73,10 @@ AbstractAccountParametersWidget *GabbleAccountUi::mainOptionsWidget(
return new MainOptionsWidgetGoogleTalk(model, parent);
} else if (m_serviceName == QLatin1String("facebook")) {
return new MainOptionsWidgetFacebook(model, parent);
+ } else if (m_serviceName == QLatin1String("msn-xmpp")) {
+ return new MainOptionsWidgetMSN(model, parent);
} else {
- return new MainOptionsWidget(model, parent);
+ return new MainOptionsWidget(model, parent);
}
}
diff --git a/plugins/butterfly/main-options-widget.cpp b/plugins/gabble/main-options-widget-msn.cpp
similarity index 63%
copy from plugins/butterfly/main-options-widget.cpp
copy to plugins/gabble/main-options-widget-msn.cpp
index 79b3287..f910c50 100644
--- a/plugins/butterfly/main-options-widget.cpp
+++ b/plugins/gabble/main-options-widget-msn.cpp
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2009 Collabora Ltd. <info at collabora.com>
+ * Copyright (C) 2011 Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,32 +18,34 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "main-options-widget.h"
+#include "main-options-widget-msn.h"
-#include <KDebug>
+#include <KCMTelepathyAccounts/ParameterEditModel>
-MainOptionsWidget::MainOptionsWidget(ParameterEditModel *model,
+
+MainOptionsWidgetMSN::MainOptionsWidgetMSN(ParameterEditModel *model,
QWidget *parent)
: AbstractAccountParametersWidget(model, parent)
{
- kDebug();
-
// Set up the UI.
- m_ui = new Ui::MainOptionsWidget;
+ m_ui = new Ui::MainOptionsWidgetMSN;
m_ui->setupUi(this);
+}
- handleParameter("account", QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
- handleParameter("password", QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
-
- QTimer::singleShot(0, m_ui->accountLineEdit, SLOT(setFocus()));
+MainOptionsWidgetMSN::~MainOptionsWidgetMSN()
+{
+ delete m_ui;
}
-MainOptionsWidget::~MainOptionsWidget()
+void MainOptionsWidgetMSN::submit()
{
- kDebug();
+ AbstractAccountParametersWidget::submit();
+}
- delete m_ui;
+bool MainOptionsWidgetMSN::validateParameterValues()
+{
+ return true;
}
-#include "main-options-widget.moc"
+#include "main-options-widget-msn.moc"
diff --git a/plugins/gabble/main-options-widget-facebook.h b/plugins/gabble/main-options-widget-msn.h
similarity index 67%
copy from plugins/gabble/main-options-widget-facebook.h
copy to plugins/gabble/main-options-widget-msn.h
index 4653b73..75ccef3 100644
--- a/plugins/gabble/main-options-widget-facebook.h
+++ b/plugins/gabble/main-options-widget-msn.h
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2011 David Edmundson <kde at davidedmundson.co.uk>
+ * Copyright (C) 2011 Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,29 +18,28 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_FACEBOOK_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_FACEBOOK_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_MSN_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_MSN_H
-#include "ui_main-options-widget-facebook.h"
+#include "ui_main-options-widget-msn.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class MainOptionsWidgetFacebook : public AbstractAccountParametersWidget
+class MainOptionsWidgetMSN : public AbstractAccountParametersWidget
{
Q_OBJECT
- Q_DISABLE_COPY(MainOptionsWidgetFacebook);
+ Q_DISABLE_COPY(MainOptionsWidgetMSN);
public:
- explicit MainOptionsWidgetFacebook(ParameterEditModel *model,
- QWidget *parent = 0);
- virtual ~MainOptionsWidgetFacebook();
+ explicit MainOptionsWidgetMSN(ParameterEditModel *model,
+ QWidget *parent = 0);
+ virtual ~MainOptionsWidgetMSN();
virtual void submit();
bool validateParameterValues();
private:
- Ui::MainOptionsWidgetFacebook *m_ui;
+ Ui::MainOptionsWidgetMSN *m_ui;
};
-#endif // header guard
-
+#endif // KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_MSN_H
diff --git a/plugins/gabble/main-options-widget-msn.ui b/plugins/gabble/main-options-widget-msn.ui
new file mode 100644
index 0000000..200a461
--- /dev/null
+++ b/plugins/gabble/main-options-widget-msn.ui
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainOptionsWidgetMSN</class>
+ <widget class="QWidget" name="MainOptionsWidgetMSN">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>400</width>
+ <height>0</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Account Preferences</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list