Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-daemon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
138
Issues
138
List
Boards
Labels
Service Desk
Milestones
Iterations
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-daemon
Commits
da09a686
Commit
da09a686
authored
Oct 16, 2020
by
Aline Gondim Santos
Committed by
Adrien Béraud
Oct 19, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
plugins: fix saveConfig logic
Change-Id: Iebb5804098699ca206a506cf8e1362faf1ef1aff
parent
25511994
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
7 deletions
+10
-7
src/client/plugin_manager_interface.cpp
src/client/plugin_manager_interface.cpp
+10
-2
src/plugin/jamipluginmanager.cpp
src/plugin/jamipluginmanager.cpp
+0
-5
No files found.
src/client/plugin_manager_interface.cpp
View file @
da09a686
...
...
@@ -28,13 +28,21 @@ namespace DRing {
bool
loadPlugin
(
const
std
::
string
&
path
)
{
return
jami
::
Manager
::
instance
().
getJamiPluginManager
().
loadPlugin
(
path
);
bool
status
=
jami
::
Manager
::
instance
().
getJamiPluginManager
().
loadPlugin
(
path
);
jami
::
Manager
::
instance
().
pluginPreferences
.
saveStateLoadedPlugins
(
path
,
status
);
jami
::
Manager
::
instance
().
saveConfig
();
return
status
;
}
bool
unloadPlugin
(
const
std
::
string
&
path
)
{
return
jami
::
Manager
::
instance
().
getJamiPluginManager
().
unloadPlugin
(
path
);
bool
status
=
jami
::
Manager
::
instance
().
getJamiPluginManager
().
unloadPlugin
(
path
);
jami
::
Manager
::
instance
().
pluginPreferences
.
saveStateLoadedPlugins
(
path
,
false
);
jami
::
Manager
::
instance
().
saveConfig
();
return
status
;
}
void
...
...
src/plugin/jamipluginmanager.cpp
View file @
da09a686
...
...
@@ -302,8 +302,6 @@ JamiPluginManager::loadPlugin(const std::string& rootPath)
bool
status
=
pm_
.
load
(
getPluginDetails
(
rootPath
).
at
(
"soPath"
));
JAMI_INFO
()
<<
"PLUGIN: load status - "
<<
status
;
jami
::
Manager
::
instance
().
pluginPreferences
.
saveStateLoadedPlugins
(
rootPath
,
status
);
jami
::
Manager
::
instance
().
saveConfig
();
return
status
;
}
catch
(
const
std
::
exception
&
e
)
{
...
...
@@ -322,9 +320,6 @@ JamiPluginManager::unloadPlugin(const std::string& rootPath)
bool
status
=
pm_
.
unload
(
getPluginDetails
(
rootPath
).
at
(
"soPath"
));
JAMI_INFO
()
<<
"PLUGIN: unload status - "
<<
status
;
jami
::
Manager
::
instance
().
pluginPreferences
.
saveStateLoadedPlugins
(
rootPath
,
false
);
jami
::
Manager
::
instance
().
saveConfig
();
return
status
;
}
catch
(
const
std
::
exception
&
e
)
{
JAMI_ERR
()
<<
e
.
what
();
...
...
Write
Preview
Markdown
is supported
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