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
b8c56f42
Commit
b8c56f42
authored
10 years ago
by
Alexandre Lision
Committed by
Alexandre Lision
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
api: merge registration signals
Following daemon modification Refs #68868
parent
d5f33a88
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/accountmodel.cpp
+3
-3
3 additions, 3 deletions
src/accountmodel.cpp
src/private/accountmodel_p.h
+1
-1
1 addition, 1 deletion
src/private/accountmodel_p.h
src/qtwrapper/configurationmanager_wrap.h
+7
-11
7 additions, 11 deletions
src/qtwrapper/configurationmanager_wrap.h
with
11 additions
and
15 deletions
src/accountmodel.cpp
+
3
−
3
View file @
b8c56f42
...
@@ -61,8 +61,8 @@ void AccountModelPrivate::init()
...
@@ -61,8 +61,8 @@ void AccountModelPrivate::init()
CallManagerInterface
&
callManager
=
DBus
::
CallManager
::
instance
();
CallManagerInterface
&
callManager
=
DBus
::
CallManager
::
instance
();
ConfigurationManagerInterface
&
configurationManager
=
DBus
::
ConfigurationManager
::
instance
();
ConfigurationManagerInterface
&
configurationManager
=
DBus
::
ConfigurationManager
::
instance
();
connect
(
&
configurationManager
,
SIGNAL
(
sipR
egistrationStateChanged
(
QString
,
QString
,
int
)),
this
,
connect
(
&
configurationManager
,
SIGNAL
(
r
egistrationStateChanged
(
QString
,
int
,
unsigned
,
QString
)),
this
,
SLOT
(
slotAccountChanged
(
QString
,
QString
,
int
)));
SLOT
(
slotAccountChanged
(
QString
,
int
,
unsigned
,
QString
)));
connect
(
&
configurationManager
,
SIGNAL
(
accountsChanged
())
,
q_ptr
,
connect
(
&
configurationManager
,
SIGNAL
(
accountsChanged
())
,
q_ptr
,
SLOT
(
updateAccounts
())
);
SLOT
(
updateAccounts
())
);
connect
(
&
callManager
,
SIGNAL
(
voiceMailNotify
(
QString
,
int
))
,
this
,
connect
(
&
callManager
,
SIGNAL
(
voiceMailNotify
(
QString
,
int
))
,
this
,
...
@@ -197,7 +197,7 @@ Account::RegistrationState AccountModelPrivate::fromDaemonName(const QString& st
...
@@ -197,7 +197,7 @@ Account::RegistrationState AccountModelPrivate::fromDaemonName(const QString& st
}
}
///Account status changed
///Account status changed
void
AccountModelPrivate
::
slotAccountChanged
(
const
QString
&
account
,
const
QString
&
status
,
int
code
)
void
AccountModelPrivate
::
slotAccountChanged
(
const
QString
&
account
,
int
registration_state
,
unsigned
code
,
const
QString
&
status
)
{
{
Account
*
a
=
q_ptr
->
getById
(
account
.
toLatin1
());
Account
*
a
=
q_ptr
->
getById
(
account
.
toLatin1
());
...
...
This diff is collapsed.
Click to expand it.
src/private/accountmodel_p.h
+
1
−
1
View file @
b8c56f42
...
@@ -54,7 +54,7 @@ public:
...
@@ -54,7 +54,7 @@ public:
static
QHash
<
QByteArray
,
AccountPlaceHolder
*>
m_hsPlaceHolder
;
static
QHash
<
QByteArray
,
AccountPlaceHolder
*>
m_hsPlaceHolder
;
public
Q_SLOTS
:
public
Q_SLOTS
:
void
slotAccountChanged
(
const
QString
&
account
,
const
QString
&
state
,
int
code
);
void
slotAccountChanged
(
const
QString
&
account
,
int
registration_state
,
unsigned
code
,
const
QString
&
status
);
void
slotAccountChanged
(
Account
*
a
);
void
slotAccountChanged
(
Account
*
a
);
void
slotVoiceMailNotify
(
const
QString
&
accountID
,
int
count
);
void
slotVoiceMailNotify
(
const
QString
&
accountID
,
int
count
);
void
slotAccountPresenceEnabledChanged
(
bool
state
);
void
slotAccountPresenceEnabledChanged
(
bool
state
);
...
...
This diff is collapsed.
Click to expand it.
src/qtwrapper/configurationmanager_wrap.h
+
7
−
11
View file @
b8c56f42
...
@@ -77,15 +77,12 @@ public:
...
@@ -77,15 +77,12 @@ public:
});
});
}),
}),
exportable_callback
<
ConfigurationSignal
::
RegistrationStateChanged
>
(
exportable_callback
<
ConfigurationSignal
::
RegistrationStateChanged
>
(
[
this
]
(
const
std
::
string
&
accountID
,
int
registration_state
)
{
[
this
]
(
const
std
::
string
&
accountID
,
int
registration_state
,
unsigned
detail_code
,
const
std
::
string
&
detail_str
)
{
QTimer
::
singleShot
(
0
,
[
this
,
accountID
,
registration_state
]
{
QTimer
::
singleShot
(
0
,
[
this
,
accountID
,
registration_state
,
detail_code
,
detail_str
]
{
emit
this
->
registrationStateChanged
(
QString
(
accountID
.
c_str
()),
registration_state
);
emit
this
->
registrationStateChanged
(
QString
(
accountID
.
c_str
()),
});
registration_state
,
}),
detail_code
,
exportable_callback
<
ConfigurationSignal
::
SipRegistrationStateChanged
>
(
QString
(
detail_str
.
c_str
()));
[
this
]
(
const
std
::
string
&
accountID
,
const
std
::
string
&
state
,
int
code
)
{
QTimer
::
singleShot
(
0
,
[
this
,
accountID
,
state
,
code
]
{
emit
this
->
sipRegistrationStateChanged
(
QString
(
accountID
.
c_str
()),
QString
(
state
.
c_str
()),
code
);
});
});
}),
}),
exportable_callback
<
ConfigurationSignal
::
VolatileDetailsChanged
>
(
exportable_callback
<
ConfigurationSignal
::
VolatileDetailsChanged
>
(
...
@@ -513,8 +510,7 @@ Q_SIGNALS: // SIGNALS
...
@@ -513,8 +510,7 @@ Q_SIGNALS: // SIGNALS
void
accountsChanged
();
void
accountsChanged
();
void
historyChanged
();
void
historyChanged
();
void
stunStatusFailure
(
const
QString
&
reason
);
void
stunStatusFailure
(
const
QString
&
reason
);
void
registrationStateChanged
(
const
QString
&
accountID
,
int
registration_state
);
void
registrationStateChanged
(
const
QString
&
accountID
,
int
registration_state
,
unsigned
detail_code
,
const
QString
&
detail_str
);
void
sipRegistrationStateChanged
(
const
QString
&
accountID
,
const
QString
&
state
,
int
code
);
void
stunStatusSuccess
(
const
QString
&
message
);
void
stunStatusSuccess
(
const
QString
&
message
);
void
errorAlert
(
int
code
);
void
errorAlert
(
int
code
);
void
volatileAccountDetailsChanged
(
const
QString
&
accountID
,
MapStringString
details
);
void
volatileAccountDetailsChanged
(
const
QString
&
accountID
,
MapStringString
details
);
...
...
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