Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-libclient
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-libclient
Commits
501b1718
Commit
501b1718
authored
13 years ago
by
Emmanuel Lepage
Browse files
Options
Downloads
Patches
Plain Diff
[ #7887 ] Fix warning
parent
4d97ceb0
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Account.cpp
+3
-3
3 additions, 3 deletions
src/Account.cpp
src/sflphone_const.h
+3
-0
3 additions, 0 deletions
src/sflphone_const.h
with
6 additions
and
3 deletions
src/Account.cpp
+
3
−
3
View file @
501b1718
...
@@ -125,7 +125,7 @@ const QString& Account::getAccountId() const
...
@@ -125,7 +125,7 @@ const QString& Account::getAccountId() const
qDebug
()
<<
"Error : getting AccountId of a new account."
;
qDebug
()
<<
"Error : getting AccountId of a new account."
;
if
(
!
m_pAccountId
)
{
if
(
!
m_pAccountId
)
{
qDebug
()
<<
"Account not configured"
;
qDebug
()
<<
"Account not configured"
;
return
""
;
//WARNING May explode
return
EMPTY_STRING
;
//WARNING May explode
}
}
return
*
m_pAccountId
;
return
*
m_pAccountId
;
...
@@ -148,13 +148,13 @@ const QString& Account::getAccountDetail(const QString& param) const
...
@@ -148,13 +148,13 @@ const QString& Account::getAccountDetail(const QString& param) const
{
{
if
(
!
m_pAccountDetails
)
{
if
(
!
m_pAccountDetails
)
{
qDebug
()
<<
"The account list is not set"
;
qDebug
()
<<
"The account list is not set"
;
return
NULL
;
//May crash, but better than crashing now
return
EMPTY_STRING
;
//May crash, but better than crashing now
}
}
if
(
m_pAccountDetails
->
find
(
param
)
!=
m_pAccountDetails
->
end
())
if
(
m_pAccountDetails
->
find
(
param
)
!=
m_pAccountDetails
->
end
())
return
(
*
m_pAccountDetails
)[
param
];
return
(
*
m_pAccountDetails
)[
param
];
else
{
else
{
qDebug
()
<<
"Account details not found, there is "
<<
m_pAccountDetails
->
count
()
<<
" details available"
;
qDebug
()
<<
"Account details not found, there is "
<<
m_pAccountDetails
->
count
()
<<
" details available"
;
return
NULL
;
return
EMPTY_STRING
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/sflphone_const.h
+
3
−
0
View file @
501b1718
...
@@ -305,6 +305,9 @@ typedef enum
...
@@ -305,6 +305,9 @@ typedef enum
CALL_STATE_ERROR
=
10
CALL_STATE_ERROR
=
10
}
call_state
;
}
call_state
;
static
const
QString
empty
(
""
);
#define EMPTY_STRING empty
/** MIME API */
/** MIME API */
#define MIME_CALLID "text/sflphone.call.id"
#define MIME_CALLID "text/sflphone.call.id"
#define MIME_CONTACT "text/sflphone.contact"
#define MIME_CONTACT "text/sflphone.contact"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment