Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
d9882528
Commit
d9882528
authored
Dec 10, 2013
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
jni: configurationmanager: fix spelling
parent
7f365e41
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
daemon/src/client/android/configurationmanager.i
+12
-12
12 additions, 12 deletions
daemon/src/client/android/configurationmanager.i
daemon/src/client/android/configurationmanager_jni.cpp
+5
-5
5 additions, 5 deletions
daemon/src/client/android/configurationmanager_jni.cpp
with
17 additions
and
17 deletions
daemon/src/client/android/configurationmanager.i
+
12
−
12
View file @
d9882528
...
@@ -33,8 +33,8 @@
...
@@ -33,8 +33,8 @@
typedef
struct
configurationmanager_callback
typedef
struct
configurationmanager_callback
{
{
void (*on_accounts_changed)(void);
void (*on_accounts_changed)(void);
void (*on_account_state_changed)(const std::string& accoun
d
ID, const int32_t& state);
void (*on_account_state_changed)(const std::string& accoun
t
ID, const int32_t& state);
void (*on_account_state_changed_with_code)(const std::string& accoun
d
ID, const std::string& state, const int32_t& code);
void (*on_account_state_changed_with_code)(const std::string& accoun
t
ID, const std::string& state, const int32_t& code);
}
configurationmanager_callback_t
;
}
configurationmanager_callback_t
;
...
@@ -42,8 +42,8 @@ class ConfigurationCallback {
...
@@ -42,8 +42,8 @@ class ConfigurationCallback {
public
:
public
:
virtual
~
ConfigurationCallback
()
{}
virtual
~
ConfigurationCallback
()
{}
virtual
void
on_accounts_changed
(
void
)
{}
virtual
void
on_accounts_changed
(
void
)
{}
virtual
void
on_account_state_changed
(
const
std
::
string&
accoun
d
ID
,
const
int32_t&
state
)
{}
virtual
void
on_account_state_changed
(
const
std
::
string&
accoun
t
ID
,
const
int32_t&
state
)
{}
virtual
void
on_account_state_changed_with_code
(
const
std
::
string&
accoun
d
ID
,
const
std
::
string&
state
,
const
int32_t&
code
)
{}
virtual
void
on_account_state_changed_with_code
(
const
std
::
string&
accoun
t
ID
,
const
std
::
string&
state
,
const
int32_t&
code
)
{}
}
;
}
;
static
ConfigurationCallback
*
registeredConfigurationCallbackObject
=
NULL
;
static
ConfigurationCallback
*
registeredConfigurationCallbackObject
=
NULL
;
...
@@ -52,12 +52,12 @@ void on_accounts_changed_wrapper (void) {
...
@@ -52,12 +52,12 @@ void on_accounts_changed_wrapper (void) {
registeredConfigurationCallbackObject->on_accounts_changed();
registeredConfigurationCallbackObject->on_accounts_changed();
}
}
void
on_account_state_changed_wrapper
(
const
std
::
string&
accoun
d
ID
,
const
int32_t&
state
)
{
void
on_account_state_changed_wrapper
(
const
std
::
string&
accoun
t
ID
,
const
int32_t&
state
)
{
registeredConfigurationCallbackObject->on_account_state_changed(accoun
d
ID, state);
registeredConfigurationCallbackObject->on_account_state_changed(accoun
t
ID, state);
}
}
void
on_account_state_changed_with_code_wrapper
(
const
std
::
string&
accoun
d
ID
,
const
std
::
string&
state
,
const
int32_t&
code
)
{
void
on_account_state_changed_with_code_wrapper
(
const
std
::
string&
accoun
t
ID
,
const
std
::
string&
state
,
const
int32_t&
code
)
{
registeredConfigurationCallbackObject->on_account_state_changed_with_code(accoun
d
ID, state, code);
registeredConfigurationCallbackObject->on_account_state_changed_with_code(accoun
t
ID, state, code);
}
}
static
struct
configurationmanager_callback
wrapper_configurationcallback_struct
=
{
static
struct
configurationmanager_callback
wrapper_configurationcallback_struct
=
{
...
@@ -80,9 +80,9 @@ public:
...
@@ -80,9 +80,9 @@ public:
void setAccountDetails(const std::string& accountID, const std::map< std::string, std::string >& details);
void setAccountDetails(const std::string& accountID, const std::map< std::string, std::string >& details);
std::map<std::string, std::string> getAccountTemplate();
std::map<std::string, std::string> getAccountTemplate();
std::string addAccount(const std::map< std::string, std::string >& details);
std::string addAccount(const std::map< std::string, std::string >& details);
void removeAccount(const std::string& accoun
d
ID);
void removeAccount(const std::string& accoun
t
ID);
std::vector< std::string > getAccountList();
std::vector< std::string > getAccountList();
void sendRegister(const std::string& accoun
d
ID, const bool& enable);
void sendRegister(const std::string& accoun
t
ID, const bool& enable);
void registerAllAccounts(void);
void registerAllAccounts(void);
std::map< std::string, std::string > getTlsSettingsDefault();
std::map< std::string, std::string > getTlsSettingsDefault();
...
@@ -155,8 +155,8 @@ class ConfigurationCallback {
...
@@ -155,8 +155,8 @@ class ConfigurationCallback {
public:
public:
virtual ~ConfigurationCallback();
virtual ~ConfigurationCallback();
virtual void on_accounts_changed(void);
virtual void on_accounts_changed(void);
virtual void on_account_state_changed(const std::string& accoun
d
ID, const int32_t& state);
virtual void on_account_state_changed(const std::string& accoun
t
ID, const int32_t& state);
virtual void on_account_state_changed_with_code(const std::string& accoun
d
ID, const std::string& state, const int32_t& code);
virtual void on_account_state_changed_with_code(const std::string& accoun
t
ID, const std::string& state, const int32_t& code);
}
;
}
;
static
ConfigurationCallback
*
registeredConfigurationCallbackObject
=
NULL
;
static
ConfigurationCallback
*
registeredConfigurationCallbackObject
=
NULL
;
...
...
This diff is collapsed.
Click to expand it.
daemon/src/client/android/configurationmanager_jni.cpp
+
5
−
5
View file @
d9882528
...
@@ -46,19 +46,19 @@ void ConfigurationManager::historyChanged()
...
@@ -46,19 +46,19 @@ void ConfigurationManager::historyChanged()
}
}
void
ConfigurationManager
::
stunStatusFailure
(
const
std
::
string
&
accoun
d
ID
)
void
ConfigurationManager
::
stunStatusFailure
(
const
std
::
string
&
accoun
t
ID
)
{
{
}
}
void
ConfigurationManager
::
registrationStateChanged
(
const
std
::
string
&
accoun
d
ID
,
int
const
&
state
)
void
ConfigurationManager
::
registrationStateChanged
(
const
std
::
string
&
accoun
t
ID
,
int
const
&
state
)
{
{
on_account_state_changed_wrapper
(
accoun
d
ID
,
state
);
on_account_state_changed_wrapper
(
accoun
t
ID
,
state
);
}
}
void
ConfigurationManager
::
sipRegistrationStateChanged
(
const
std
::
string
&
accoun
d
ID
,
const
std
::
string
&
state
,
const
int32_t
&
code
)
void
ConfigurationManager
::
sipRegistrationStateChanged
(
const
std
::
string
&
accoun
t
ID
,
const
std
::
string
&
state
,
const
int32_t
&
code
)
{
{
on_account_state_changed_with_code_wrapper
(
accoun
d
ID
,
state
,
code
);
on_account_state_changed_with_code_wrapper
(
accoun
t
ID
,
state
,
code
);
}
}
void
ConfigurationManager
::
errorAlert
(
const
int
&
/*alert*/
)
void
ConfigurationManager
::
errorAlert
(
const
int
&
/*alert*/
)
...
...
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