Skip to content

Fix for loading NmaCertChooser or NMACertChooser based VPN plugins #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dkosovic wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for loading NmaCertChooser or NMACertChooser based VPN plugins #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions shell/cinnamon-control-center.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* with the Control Center; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Author: Thomas Wood <thos@gnome.org>

Check failure on line 19 in shell/cinnamon-control-center.c

View workflow job for this annotation

GitHub Actions / build / build (mint22, linuxmintd/mint22.3-amd64, Mint 22, true) / Mint 22 

thos ==> those, this
*/

#include "config.h"
Expand All @@ -39,6 +39,8 @@
#include "cc-shell-model.h"
#include "cc-shell-nav-bar.h"

#include <libnma/nma-cert-chooser.h>

G_DEFINE_TYPE (CinnamonControlCenter, cinnamon_control_center, CC_TYPE_SHELL)

#define CONTROL_CENTER_PRIVATE(o) \
Expand Down Expand Up @@ -1391,6 +1393,12 @@
/* load the available settings panels */
setup_model (self);

/* Pre-register NMA widget types so they are in the global GType table and
* their get_type symbols are in RTLD_DEFAULT before any panel or VPN plugin
* is loaded. Without this, VPN editor plugins that reference NmaCertChooser
* or NMACertChooser in their GtkBuilder UI fail with "Invalid object type" */
g_type_ensure (NMA_TYPE_CERT_CHOOSER);

/* load the panels that are implemented as plugins */
load_panel_plugins (self);

Expand Down
3 changes: 2 additions & 1 deletion shell/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ controlcenter = executable('cinnamon-control-center',
gio_unix,
cinn_menu,
libx11,
libnotify
libnotify,
libnma,
],
link_with: libcinnamon_control_center,
install: true
Expand Down
Loading