Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
d94c232a
Commit
d94c232a
authored
Jul 25, 2012
by
Emmanuel Lepage Vallee
Browse files
[ #13801 ] Fix licensing issues, better translation, minor fixes
parent
bd68d770
Changes
152
Hide whitespace changes
Inline
Side-by-side
kde/data/sflphone-client-kde.desktop
View file @
d94c232a
...
...
@@ -7,6 +7,6 @@ Name=SFLphone VoIP KDE4 client
GenericName=Telephone
Comment=Call and receive calls with SIP or IAX protocols
Exec=sflphone-client-kde
Icon=sflphone
.svg
Icon=sflphone
StartupNotify=true
Categories=Network;Telephony;
kde/man/CMakeLists.txt
View file @
d94c232a
...
...
@@ -3,4 +3,4 @@
#
kde4_create_manpage
(
sflphone-client-kde.1.docbook 1 INSTALL_DESTINATION
${
MAN_INSTALL_DIR
}
)
# kde4_create_manpage(sflphone.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
\ No newline at end of file
# kde4_create_manpage(sflphone.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
kde/plasma/plasmoid-qml/CMakeLists.txt
View file @
d94c232a
...
...
@@ -8,4 +8,4 @@ install(DIRECTORY package/
DESTINATION
${
DATA_INSTALL_DIR
}
/plasma/plasmoids/org.kde.plasma.applet.sflphone
)
install
(
FILES package/metadata.desktop
DESTINATION
${
SERVICES_INSTALL_DIR
}
RENAME plasma-applet-sflphone.desktop
)
\ No newline at end of file
DESTINATION
${
SERVICES_INSTALL_DIR
}
RENAME plasma-applet-sflphone.desktop
)
kde/plasma/plasmoid-qml/package/contents/ui/.TabBar.qml.kate-swp
deleted
100644 → 0
View file @
bd68d770
File deleted
kde/plasma/plasmoid-qml/package/contents/ui/BookmarkTab.qml
View file @
d94c232a
/******************************************************************************
* Copyright (C) 2012 by Savoir-Faire Linux *
* Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
* *
* 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 Lesser GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
import
QtQuick
1.1
import
org
.
kde
.
plasma
.
components
0.1
as
Plasma
import
org
.
kde
.
plasma
.
core
0.1
as
PlasmaCore
...
...
kde/plasma/plasmoid-qml/package/contents/ui/CallTab.qml
View file @
d94c232a
/******************************************************************************
* Copyright (C) 2012 by Savoir-Faire Linux *
* Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
* *
* 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 Lesser GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
import
QtQuick
1.1
import
org
.
kde
.
plasma
.
components
0.1
as
Plasma
import
org
.
kde
.
plasma
.
core
0.1
as
PlasmaCore
...
...
@@ -396,4 +413,4 @@ Plasma.Page {
when
:
(
requestNumberOverlay
==
true
)
}
]
}
\ No newline at end of file
}
kde/plasma/plasmoid-qml/package/contents/ui/ContactTab.qml
View file @
d94c232a
/******************************************************************************
* Copyright (C) 2012 by Savoir-Faire Linux *
* Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
* *
* 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 Lesser GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
import
QtQuick
1.1
import
org
.
kde
.
plasma
.
components
0.1
as
Plasma
import
org
.
kde
.
plasma
.
core
0.1
as
PlasmaCore
...
...
kde/plasma/plasmoid-qml/package/contents/ui/DialPad.qml
View file @
d94c232a
/******************************************************************************
* Copyright (C) 2012 by Savoir-Faire Linux *
* Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
* *
* 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 Lesser GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
import
QtQuick
1.1
import
org
.
kde
.
plasma
.
components
0.1
as
Plasma
...
...
kde/plasma/plasmoid-qml/package/contents/ui/HistoryTab.qml
View file @
d94c232a
/******************************************************************************
* Copyright (C) 2012 by Savoir-Faire Linux *
* Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
* *
* 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 Lesser GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
import
QtQuick
1.1
import
org
.
kde
.
plasma
.
components
0.1
as
Plasma
import
org
.
kde
.
plasma
.
core
0.1
as
PlasmaCore
...
...
kde/plasma/plasmoid-qml/package/contents/ui/ListSectiondelegate.qml
View file @
d94c232a
/******************************************************************************
* Copyright (C) 2012 by Savoir-Faire Linux *
* Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
* *
* 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 Lesser GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
import
QtQuick
1.1
import
org
.
kde
.
plasma
.
components
0.1
as
Plasma
import
org
.
kde
.
plasma
.
core
0.1
as
PlasmaCore
...
...
@@ -21,4 +38,4 @@ Rectangle {
text
:
section
color
:
theme
.
buttonTextColor
}
}
\ No newline at end of file
}
kde/plasma/plasmoid-qml/package/contents/ui/NumberOverlay.qml
View file @
d94c232a
/******************************************************************************
* Copyright (C) 2012 by Savoir-Faire Linux *
* Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
* *
* 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 Lesser GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
import
QtQuick
1.1
import
org
.
kde
.
plasma
.
components
0.1
as
Plasma
import
org
.
kde
.
plasma
.
core
0.1
as
PlasmaCore
...
...
@@ -80,4 +97,4 @@ Rectangle {
//PropertyChanges {target: clearButton;width:parent.width}
}
]
}
\ No newline at end of file
}
kde/plasma/plasmoid-qml/package/contents/ui/Settingstab.qml
View file @
d94c232a
/******************************************************************************
* Copyright (C) 2012 by Savoir-Faire Linux *
* Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
* *
* 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 Lesser GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
import
QtQuick
1.1
import
org
.
kde
.
plasma
.
components
0.1
as
Plasma
import
org
.
kde
.
plasma
.
core
0.1
as
PlasmaCore
...
...
@@ -151,4 +168,4 @@ Plasma.Page {
width
:
parent
.
width
}
}
}
\ No newline at end of file
}
kde/plasma/plasmoid-qml/package/contents/ui/TabBar.qml
View file @
d94c232a
/******************************************************************************
* Copyright (C) 2012 by Savoir-Faire Linux *
* Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
* *
* 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 Lesser GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
import
QtQuick
1.1
import
org
.
kde
.
plasma
.
components
0.1
as
Plasma
...
...
@@ -96,4 +113,4 @@ Plasma.TabBar {
}
}
}
//}
\ No newline at end of file
//}
kde/plasma/plasmoid-qml/package/contents/ui/TransferOverlay.qml
View file @
d94c232a
/******************************************************************************
* Copyright (C) 2012 by Savoir-Faire Linux *
* Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
* *
* 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 Lesser GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
import
QtQuick
1.1
import
org
.
kde
.
plasma
.
components
0.1
as
Plasma
import
org
.
kde
.
plasma
.
core
0.1
as
PlasmaCore
...
...
@@ -121,4 +138,4 @@ Rectangle {
//PropertyChanges {target: clearButton;width:parent.width}
}
]
}
\ No newline at end of file
}
kde/plasma/plasmoid-qml/package/contents/ui/main.qml
View file @
d94c232a
/******************************************************************************
* Copyright (C) 2012 by Savoir-Faire Linux *
* Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
* *
* 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 Lesser GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
import
QtQuick
1.1
import
org
.
kde
.
plasma
.
components
0.1
as
Plasma
import
org
.
kde
.
plasma
.
core
0.1
as
PlasmaCore
...
...
kde/src/AccountWizard.cpp
View file @
d94c232a
...
...
@@ -14,9 +14,7 @@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
**************************************************************************/
#include
"AccountWizard.h"
...
...
@@ -129,7 +127,7 @@ int sendRequest(QString host, int port, QString req, QString & ret)
if
(
strncasecmp
(
buf
,
status_h
,
strlen
(
status_h
))
==
0
)
status
=
atoi
(
buf
+
strlen
(
status_h
)
+
1
);
}
for
(
i
=
0
;
i
<
length
;
i
++
)
for
(
i
=
-
1
;
i
<
length
;
++
i
)
ret
[
i
]
=
fgetc
(
f
);
if
(
status
!=
200
)
{
...
...
@@ -242,10 +240,10 @@ void AccountWizard::accept()
if
(
acc
.
success
)
{
ret
+=
i18n
(
"This assistant is now finished."
)
+
'\n'
;
field
(
FIELD_SIP_ALIAS
)
=
QString
(
acc
.
user
)
+
'@'
+
SFL_ACCOUNT_HOST
;
field
(
FIELD_SIP_VOICEMAIL
)
=
QString
(
);
field
(
FIELD_SIP_SERVER
)
=
QString
(
SFL_ACCOUNT_HOST
);
field
(
FIELD_SIP_PASSWORD
)
=
QString
(
acc
.
passwd
);
field
(
FIELD_SIP_USER
)
=
QString
(
acc
.
user
);
field
(
FIELD_SIP_VOICEMAIL
).
clear
();
protocol
=
QString
(
ACCOUNT_TYPE_SIP
);
server
=
QString
(
SFL_ACCOUNT_HOST
);
...
...
@@ -300,7 +298,7 @@ void AccountWizard::accept()
}
else
{
stun_enabled
=
QString
(
REGISTRATION_ENABLED_FALSE
);
stun_server
=
QString
();
stun_server
.
clear
();
}
if
(
field
(
FIELD_ZRTP_ENABLED
).
toBool
())
{
...
...
kde/src/AccountWizard.h
View file @
d94c232a
...
...
@@ -14,9 +14,7 @@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
**************************************************************************/
#ifndef ACCOUNTWIZARD_H
...
...
kde/src/ActionSetAccountFirst.cpp
View file @
d94c232a
...
...
@@ -14,9 +14,7 @@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
**************************************************************************/
//Parent
...
...
kde/src/ActionSetAccountFirst.h
View file @
d94c232a
...
...
@@ -14,9 +14,7 @@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
**************************************************************************/
#ifndef ACTION_SET_ACCOUNT_FIRST_H
...
...
kde/src/CallView.cpp
View file @
d94c232a
...
...
@@ -13,9 +13,7 @@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
**************************************************************************/
//Parent
...
...
Prev
1
2
3
4
5
…
8
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment