diff --git a/panels/network/wireless-security/eap-method-fast.c b/panels/network/wireless-security/eap-method-fast.c index 69b8a86..be5578d 100644 --- a/panels/network/wireless-security/eap-method-fast.c +++ b/panels/network/wireless-security/eap-method-fast.c @@ -351,7 +351,7 @@ eap_method_fast_new (WirelessSecurity *ws_parent, fill_connection, update_secrets, destroy, - UIDIR "/eap-method-fast.ui", + "/org/gnome/control-center/network/eap-method-fast.ui", "eap_fast_notebook", "eap_fast_anon_identity_entry", FALSE); diff --git a/panels/network/wireless-security/eap-method-leap.c b/panels/network/wireless-security/eap-method-leap.c index 5fbdd86..6163468 100644 --- a/panels/network/wireless-security/eap-method-leap.c +++ b/panels/network/wireless-security/eap-method-leap.c @@ -204,7 +204,7 @@ eap_method_leap_new (WirelessSecurity *ws_parent, fill_connection, update_secrets, destroy, - UIDIR "/eap-method-leap.ui", + "/org/gnome/control-center/network/eap-method-leap.ui", "eap_leap_notebook", "eap_leap_username_entry", FALSE); diff --git a/panels/network/wireless-security/eap-method-peap.c b/panels/network/wireless-security/eap-method-peap.c index 6462ef2..7f87541 100644 --- a/panels/network/wireless-security/eap-method-peap.c +++ b/panels/network/wireless-security/eap-method-peap.c @@ -349,7 +349,7 @@ eap_method_peap_new (WirelessSecurity *ws_parent, fill_connection, update_secrets, destroy, - UIDIR "/eap-method-peap.ui", + "/org/gnome/control-center/network/eap-method-peap.ui", "eap_peap_notebook", "eap_peap_anon_identity_entry", FALSE); diff --git a/panels/network/wireless-security/eap-method-simple.c b/panels/network/wireless-security/eap-method-simple.c index 0f72029..f9fd473 100644 --- a/panels/network/wireless-security/eap-method-simple.c +++ b/panels/network/wireless-security/eap-method-simple.c @@ -307,7 +307,7 @@ eap_method_simple_new (WirelessSecurity *ws_parent, fill_connection, update_secrets, destroy, - UIDIR "/eap-method-simple.ui", + "/org/gnome/control-center/network/eap-method-simple.ui", "eap_simple_notebook", "eap_simple_username_entry", flags & EAP_METHOD_SIMPLE_FLAG_PHASE2); diff --git a/panels/network/wireless-security/eap-method-tls.c b/panels/network/wireless-security/eap-method-tls.c index 8f33d83..587c399 100644 --- a/panels/network/wireless-security/eap-method-tls.c +++ b/panels/network/wireless-security/eap-method-tls.c @@ -453,7 +453,7 @@ eap_method_tls_new (WirelessSecurity *ws_parent, fill_connection, update_secrets, NULL, - UIDIR "/eap-method-tls.ui", + "/org/gnome/control-center/network/eap-method-tls.ui", "eap_tls_notebook", "eap_tls_identity_entry", phase2); diff --git a/panels/network/wireless-security/eap-method-ttls.c b/panels/network/wireless-security/eap-method-ttls.c index 789f0fa..ef02529 100644 --- a/panels/network/wireless-security/eap-method-ttls.c +++ b/panels/network/wireless-security/eap-method-ttls.c @@ -380,7 +380,7 @@ eap_method_ttls_new (WirelessSecurity *ws_parent, fill_connection, update_secrets, destroy, - UIDIR "/eap-method-ttls.ui", + "/org/gnome/control-center/network/eap-method-ttls.ui", "eap_ttls_notebook", "eap_ttls_anon_identity_entry", FALSE); diff --git a/panels/network/wireless-security/eap-method.c b/panels/network/wireless-security/eap-method.c index 90efea1..6ec4849 100644 --- a/panels/network/wireless-security/eap-method.c +++ b/panels/network/wireless-security/eap-method.c @@ -34,7 +34,19 @@ #include "utils.h" #include "helpers.h" -G_DEFINE_BOXED_TYPE (EAPMethod, eap_method, eap_method_ref, eap_method_unref) +GType +eap_method_get_type (void) +{ + static GType type_id = 0; + + if (!type_id) { + type_id = g_boxed_type_register_static ("CcEAPMethod", + (GBoxedCopyFunc) eap_method_ref, + (GBoxedFreeFunc) eap_method_unref); + } + + return type_id; +} GtkWidget * eap_method_get_widget (EAPMethod *method) @@ -129,7 +141,7 @@ eap_method_init (gsize obj_size, EMFillConnectionFunc fill_connection, EMUpdateSecretsFunc update_secrets, EMDestroyFunc destroy, - const char *ui_file, + const char *ui_resource, const char *ui_widget_name, const char *default_field, gboolean phase2) @@ -138,7 +150,7 @@ eap_method_init (gsize obj_size, GError *error = NULL; g_return_val_if_fail (obj_size > 0, NULL); - g_return_val_if_fail (ui_file != NULL, NULL); + g_return_val_if_fail (ui_resource != NULL, NULL); g_return_val_if_fail (ui_widget_name != NULL, NULL); method = g_slice_alloc0 (obj_size); @@ -154,9 +166,9 @@ eap_method_init (gsize obj_size, method->phase2 = phase2; method->builder = gtk_builder_new (); - if (!gtk_builder_add_from_file (method->builder, ui_file, &error)) { + if (!gtk_builder_add_from_resource (method->builder, ui_resource, &error)) { g_warning ("Couldn't load UI builder file %s: %s", - ui_file, error->message); + ui_resource, error->message); eap_method_unref (method); return NULL; } @@ -164,7 +176,7 @@ eap_method_init (gsize obj_size, method->ui_widget = GTK_WIDGET (gtk_builder_get_object (method->builder, ui_widget_name)); if (!method->ui_widget) { g_warning ("Couldn't load UI widget '%s' from UI file %s", - ui_widget_name, ui_file); + ui_widget_name, ui_resource); eap_method_unref (method); return NULL; } diff --git a/panels/network/wireless-security/eap-method.h b/panels/network/wireless-security/eap-method.h index 84c1c78..de287e3 100644 --- a/panels/network/wireless-security/eap-method.h +++ b/panels/network/wireless-security/eap-method.h @@ -99,7 +99,7 @@ EAPMethod *eap_method_init (gsize obj_size, EMFillConnectionFunc fill_connection, EMUpdateSecretsFunc update_secrets, EMDestroyFunc destroy, - const char *ui_file, + const char *ui_resource, const char *ui_widget_name, const char *default_field, gboolean phase2); diff --git a/panels/network/wireless-security/wireless-security.c b/panels/network/wireless-security/wireless-security.c index 23b8a27..bd233b0 100644 --- a/panels/network/wireless-security/wireless-security.c +++ b/panels/network/wireless-security/wireless-security.c @@ -25,10 +25,25 @@ #include #include "wireless-security.h" +#include "wireless-security-resources.h" #include "eap-method.h" #include "utils.h" -G_DEFINE_BOXED_TYPE (WirelessSecurity, wireless_security, wireless_security_ref, wireless_security_unref) +GType +wireless_security_get_type (void) +{ + static GType type_id = 0; + + if (!type_id) { + g_resources_register (wireless_security_get_resource ()); + + type_id = g_boxed_type_register_static ("CcWirelessSecurity", + (GBoxedCopyFunc) wireless_security_ref, + (GBoxedFreeFunc) wireless_security_unref); + } + + return type_id; +} GtkWidget * wireless_security_get_widget (WirelessSecurity *sec) @@ -146,7 +161,7 @@ wireless_security_init (gsize obj_size, WSFillConnectionFunc fill_connection, WSUpdateSecretsFunc update_secrets, WSDestroyFunc destroy, - const char *ui_file, + const char *ui_resource, const char *ui_widget_name, const char *default_field) { @@ -154,7 +169,7 @@ wireless_security_init (gsize obj_size, GError *error = NULL; g_return_val_if_fail (obj_size > 0, NULL); - g_return_val_if_fail (ui_file != NULL, NULL); + g_return_val_if_fail (ui_resource != NULL, NULL); g_return_val_if_fail (ui_widget_name != NULL, NULL); sec = g_slice_alloc0 (obj_size); @@ -170,9 +185,9 @@ wireless_security_init (gsize obj_size, sec->default_field = default_field; sec->builder = gtk_builder_new (); - if (!gtk_builder_add_from_file (sec->builder, ui_file, &error)) { + if (!gtk_builder_add_from_resource (sec->builder, ui_resource, &error)) { g_warning ("Couldn't load UI builder file %s: %s", - ui_file, error->message); + ui_resource, error->message); g_error_free (error); wireless_security_unref (sec); return NULL; @@ -181,7 +196,7 @@ wireless_security_init (gsize obj_size, sec->ui_widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, ui_widget_name)); if (!sec->ui_widget) { g_warning ("Couldn't load UI widget '%s' from UI file %s", - ui_widget_name, ui_file); + ui_widget_name, ui_resource); wireless_security_unref (sec); return NULL; } diff --git a/panels/network/wireless-security/wireless-security.h b/panels/network/wireless-security/wireless-security.h index e9bcf63..3d56fa3 100644 --- a/panels/network/wireless-security/wireless-security.h +++ b/panels/network/wireless-security/wireless-security.h @@ -23,6 +23,8 @@ #ifndef WIRELESS_SECURITY_H #define WIRELESS_SECURITY_H +#define LIBNM_GLIB_BUILD + #include #include @@ -118,7 +120,7 @@ WirelessSecurity *wireless_security_init (gsize obj_size, WSFillConnectionFunc fill_connection, WSUpdateSecretsFunc update_secrets, WSDestroyFunc destroy, - const char *ui_file, + const char *ui_resource, const char *ui_widget_name, const char *default_field); diff --git a/panels/network/wireless-security/ws-dynamic-wep.c b/panels/network/wireless-security/ws-dynamic-wep.c index db55119..0192d24 100644 --- a/panels/network/wireless-security/ws-dynamic-wep.c +++ b/panels/network/wireless-security/ws-dynamic-wep.c @@ -109,7 +109,7 @@ ws_dynamic_wep_new (NMConnection *connection, fill_connection, update_secrets, destroy, - UIDIR "/ws-dynamic-wep.ui", + "/org/gnome/control-center/network/ws-dynamic-wep.ui", "dynamic_wep_notebook", NULL); if (!parent) diff --git a/panels/network/wireless-security/ws-leap.c b/panels/network/wireless-security/ws-leap.c index 2b8b615..3a0f60c 100644 --- a/panels/network/wireless-security/ws-leap.c +++ b/panels/network/wireless-security/ws-leap.c @@ -155,7 +155,7 @@ ws_leap_new (NMConnection *connection, gboolean secrets_only) fill_connection, update_secrets, NULL, - UIDIR "/ws-leap.ui", + "/org/gnome/control-center/network/ws-leap.ui", "leap_notebook", "leap_username_entry"); if (!parent) diff --git a/panels/network/wireless-security/ws-wep-key.c b/panels/network/wireless-security/ws-wep-key.c index 045ac4b..cd7dbac 100644 --- a/panels/network/wireless-security/ws-wep-key.c +++ b/panels/network/wireless-security/ws-wep-key.c @@ -264,7 +264,7 @@ ws_wep_key_new (NMConnection *connection, fill_connection, update_secrets, destroy, - UIDIR "/ws-wep-key.ui", + "/org/gnome/control-center/network/ws-wep-key.ui", "wep_key_notebook", "wep_key_entry"); if (!parent) diff --git a/panels/network/wireless-security/ws-wpa-eap.c b/panels/network/wireless-security/ws-wpa-eap.c index d83218d..7db42df 100644 --- a/panels/network/wireless-security/ws-wpa-eap.c +++ b/panels/network/wireless-security/ws-wpa-eap.c @@ -110,7 +110,7 @@ ws_wpa_eap_new (NMConnection *connection, fill_connection, update_secrets, destroy, - UIDIR "/ws-wpa-eap.ui", + "/org/gnome/control-center/network/ws-wpa-eap.ui", "wpa_eap_notebook", NULL); if (!parent) diff --git a/panels/network/wireless-security/ws-wpa-psk.c b/panels/network/wireless-security/ws-wpa-psk.c index e56f348..4be28f2 100644 --- a/panels/network/wireless-security/ws-wpa-psk.c +++ b/panels/network/wireless-security/ws-wpa-psk.c @@ -182,7 +182,7 @@ ws_wpa_psk_new (NMConnection *connection, gboolean secrets_only) fill_connection, update_secrets, NULL, - UIDIR "/ws-wpa-psk.ui", + "/org/gnome/control-center/network/ws-wpa-psk.ui", "wpa_psk_notebook", "wpa_psk_entry"); if (!parent)