Skip to content

GitLab

network-manager-applet
network-manager-applet
Commit a4fa0bf2 authored by Lubomir Rintel's avatar Lubomir Rintel
Browse files
Options

all: use gresources 

This seems like a good idea. Apart from a tiny speed improvement by
avoiding directory lookups when loading the UI elements and condensing
the XML data by whitespace ommission, this makes it easy to run the
applet and the connection editor without installing them.

This makes it possible to run the binaries directly from the build tree
and not pick up the glade files from whatever happens to be installed in
the system. Neat!
parent 6b0de82d
Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 149 deletions
.gitignore
View file @ a4fa0bf2
......@@ -45,16 +45,26 @@ org.gnome.nm-applet.gschema.valid
org.gnome.nm-connection-editor.appdata.xml
src/connection-editor/nm-connection-editor
src/connection-editor/nm-connection-editor-service-glue.h
src/connection-editor/ce-resources.c
src/connection-editor/ce-resources.h
src/libnma/libnma.pc
src/libnma/NMA-1.0.gir
src/libnma/NMA-1.0.typelib
src/libnma/nma-resources.c
src/libnma/nma-resources.h
src/libnm-gtk/libnm-gtk.pc
src/libnm-gtk/NMGtk-1.0.gir
src/libnm-gtk/NMGtk-1.0.typelib
src/libnm-gtk/tests/test-mobile-providers
src/libnm-gtk/nm-resources.c
src/libnm-gtk/nm-resources.h
src/marshallers/nma-marshal.*
src/nm-applet
src/applet-dbus-bindings.h
src/applet-resources.c
src/applet-resources.h
src/wireless-security/ws-resources.c
src/wireless-security/ws-resources.h
man/*.1
/test-driver
......
configure.ac
View file @ a4fa0bf2
......@@ -140,6 +140,7 @@ GOBJECT_INTROSPECTION_CHECK([0.9.6])
GLIB_CONFIG_NMA
GLIB_GSETTINGS
AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
dnl
dnl Compiler flags
......
src/Makefile.am
View file @ a4fa0bf2
......@@ -12,7 +12,6 @@ nm_applet_CPPFLAGS = \
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4 \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4 \
-DICONDIR=\""$(datadir)/icons"\" \
-DUIDIR=\""$(uidir)"\" \
-DBINDIR=\""$(bindir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
......@@ -48,6 +47,8 @@ nm_applet_SOURCES = \
mobile-helpers.h \
applet-device-bt.h \
applet-device-bt.c \
applet-resources.h \
applet-resources.c \
fallback-icon.h
if WITH_WWAN
......@@ -56,6 +57,10 @@ nm_applet_SOURCES += \
applet-device-broadband.c
endif
BUILT_SOURCES = \
applet-resources.h \
applet-resources.c
nm_applet_LDADD = \
-lm \
$(GTK_LIBS) \
......@@ -68,8 +73,8 @@ nm_applet_LDADD = \
${top_builddir}/src/wireless-security/libwireless-security-libnm.la \
${top_builddir}/src/libnma/libnma.la
uidir = $(datadir)/nm-applet
ui_DATA = gsm-unlock.ui info.ui 8021x.ui keyring.png
EXTRA_DIST = $(ui_DATA)
applet-resources.h: applet.gresource.xml
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-header --internal
applet-resources.c: applet.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/applet.gresource.xml)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-source --internal
src/applet-device-ethernet.c
View file @ a4fa0bf2
......@@ -321,7 +321,7 @@ pppoe_get_secrets (SecretsRequest *req, GError **error)
builder = gtk_builder_new ();
if (!gtk_builder_add_from_file (builder, UIDIR "/ce-page-dsl.ui", &tmp_error)) {
if (!gtk_builder_add_from_resource (builder, "/org/freedesktop/network-manager-applet/connection-editor/ce-page-dsl.ui", &tmp_error)) {
g_set_error (error,
NM_SECRET_AGENT_ERROR,
NM_SECRET_AGENT_ERROR_FAILED,
......
src/applet-dialogs.c
View file @ a4fa0bf2
......@@ -1317,8 +1317,8 @@ applet_mobile_pin_dialog_new (const char *unlock_required,
builder = gtk_builder_new ();
if (!gtk_builder_add_from_file (builder, UIDIR "/gsm-unlock.ui", &error)) {
g_warning ("Couldn't load builder file: %s", error->message);
if (!gtk_builder_add_from_resource (builder, "/org/freedesktop/network-manager-applet/gsm-unlock.ui", &error)) {
g_warning ("Couldn't load builder resource: %s", error->message);
g_error_free (error);
g_object_unref (builder);
return NULL;
......
src/applet.c
View file @ a4fa0bf2
......@@ -3234,7 +3234,7 @@ applet_startup (GApplication *app, gpointer user_data)
applet->info_dialog_ui = gtk_builder_new ();
if (!gtk_builder_add_from_file (applet->info_dialog_ui, UIDIR "/info.ui", &error)) {
if (!gtk_builder_add_from_resource (applet->info_dialog_ui, "/org/freedesktop/network-manager-applet/info.ui", &error)) {
g_warning ("Could not load info dialog UI file: %s", error->message);
g_application_quit (app);
return;
......
src/applet.gresource.xml 0 → 100644
View file @ a4fa0bf2
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/freedesktop/network-manager-applet">
<file preprocess="xml-stripblanks">connection-editor/ce-page-dsl.ui</file>
<file preprocess="xml-stripblanks">gsm-unlock.ui</file>
<file preprocess="xml-stripblanks">info.ui</file>
<file preprocess="xml-stripblanks">8021x.ui</file>
</gresource>
</gresources>
src/connection-editor/Makefile.am
View file @ a4fa0bf2
......@@ -7,7 +7,6 @@ nm_connection_editor_CPPFLAGS = \
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4 \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4 \
-DICONDIR=\""$(datadir)/icons"\" \
-DUIDIR=\""$(uidir)"\" \
-DBINDIR=\""$(bindir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DLIBDIR=\""$(libdir)"\" \
......@@ -18,7 +17,13 @@ nm_connection_editor_CPPFLAGS = \
-I${top_srcdir}/src/wireless-security \
-I${top_srcdir}/src/libnma
BUILT_SOURCES = \
ce-resources.h \
ce-resources.c
nm_connection_editor_SOURCES = \
ce-resources.h \
ce-resources.c \
nm-connection-editor.c \
nm-connection-editor.h \
nm-connection-list.c \
......@@ -94,33 +99,8 @@ nm_connection_editor_LDADD = \
$(JANSSON_LIBS) \
-lm
uidir = $(datadir)/nm-applet
ui_DATA = \
nm-connection-editor.ui \
ce-new-connection.ui \
ce-page-general.ui \
ce-page-ethernet.ui \
ce-page-wifi.ui \
ce-page-wifi-security.ui \
ce-page-infiniband.ui \
ce-page-bond.ui \
ce-page-team.ui \
ce-page-team-port.ui \
ce-page-bridge.ui \
ce-page-bridge-port.ui \
ce-page-proxy.ui \
ce-page-ip4.ui \
ce-ip4-routes.ui \
ce-page-ip6.ui \
ce-ip6-routes.ui \
ce-page-ip-tunnel.ui \
ce-page-dsl.ui \
ce-page-mobile.ui \
ce-page-bluetooth.ui \
ce-page-ppp.ui \
ce-ppp-auth-methods.ui \
ce-page-vlan.ui \
ce-page-dcb.ui
EXTRA_DIST = $(ui_DATA)
ce-resources.h: ce.gresource.xml
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-header --internal
ce-resources.c: ce.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/ce.gresource.xml)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-source --internal
src/connection-editor/ce-page.c
View file @ a4fa0bf2
......@@ -847,7 +847,7 @@ ce_page_new (GType page_type,
NMConnection *connection,
GtkWindow *parent_window,
NMClient *client,
const char *ui_file,
const char *ui_resource,
const char *widget_name,
const char *title)
{
......@@ -855,7 +855,7 @@ ce_page_new (GType page_type,
GError *error = NULL;
g_return_val_if_fail (title != NULL, NULL);
if (ui_file)
if (ui_resource)
g_return_val_if_fail (widget_name != NULL, NULL);
self = CE_PAGE (g_object_new (page_type,
......@@ -866,9 +866,9 @@ ce_page_new (GType page_type,
self->client = client;
self->editor = editor;
if (ui_file) {
if (!gtk_builder_add_from_file (self->builder, ui_file, &error)) {
g_warning ("Couldn't load builder file: %s", error->message);
if (ui_resource) {
if (!gtk_builder_add_from_resource (self->builder, ui_resource, &error)) {
g_warning ("Couldn't load builder resource: %s", error->message);
g_error_free (error);
g_object_unref (self);
return NULL;
......@@ -876,7 +876,7 @@ ce_page_new (GType page_type,
self->page = GTK_WIDGET (gtk_builder_get_object (self->builder, widget_name));
if (!self->page) {
g_warning ("Couldn't load page widget '%s' from %s", widget_name, ui_file);
g_warning ("Couldn't load page widget '%s' from %s", widget_name, ui_resource);
g_object_unref (self);
return NULL;
}
......
src/connection-editor/ce-page.h
View file @ a4fa0bf2
......@@ -195,7 +195,7 @@ CEPage *ce_page_new (GType page_type,
NMConnection *connection,
GtkWindow *parent_window,
NMClient *client,
const char *ui_file,
const char *ui_resource,
const char *widget_name,
const char *title);
......
src/connection-editor/ce.gresource.xml 0 → 100644
View file @ a4fa0bf2
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/freedesktop/network-manager-applet">
<file preprocess="xml-stripblanks">nm-connection-editor.ui</file>
<file preprocess="xml-stripblanks">ce-ip4-routes.ui</file>
<file preprocess="xml-stripblanks">ce-ip6-routes.ui</file>
<file preprocess="xml-stripblanks">ce-new-connection.ui</file>
<file preprocess="xml-stripblanks">ce-page-bluetooth.ui</file>
<file preprocess="xml-stripblanks">ce-page-bond.ui</file>
<file preprocess="xml-stripblanks">ce-page-bridge-port.ui</file>
<file preprocess="xml-stripblanks">ce-page-bridge.ui</file>
<file preprocess="xml-stripblanks">ce-page-dcb.ui</file>
<file preprocess="xml-stripblanks">ce-page-dsl.ui</file>
<file preprocess="xml-stripblanks">ce-page-ethernet.ui</file>
<file preprocess="xml-stripblanks">ce-page-general.ui</file>
<file preprocess="xml-stripblanks">ce-page-infiniband.ui</file>
<file preprocess="xml-stripblanks">ce-page-ip4.ui</file>
<file preprocess="xml-stripblanks">ce-page-ip6.ui</file>
<file preprocess="xml-stripblanks">ce-page-ip-tunnel.ui</file>
<file preprocess="xml-stripblanks">ce-page-mobile.ui</file>
<file preprocess="xml-stripblanks">ce-page-ppp.ui</file>
<file preprocess="xml-stripblanks">ce-page-proxy.ui</file>
<file preprocess="xml-stripblanks">ce-page-team-port.ui</file>
<file preprocess="xml-stripblanks">ce-page-team.ui</file>
<file preprocess="xml-stripblanks">ce-page-vlan.ui</file>
<file preprocess="xml-stripblanks">ce-page-wifi-security.ui</file>
<file preprocess="xml-stripblanks">ce-page-wifi.ui</file>
<file preprocess="xml-stripblanks">ce-ppp-auth-methods.ui</file>
</gresource>
</gresources>
src/connection-editor/connection-helpers.c
View file @ a4fa0bf2
......@@ -630,10 +630,10 @@ new_connection_dialog_full (GtkWindow *parent_window,
/* load GUI */
gui = gtk_builder_new ();
if (!gtk_builder_add_from_file (gui,
UIDIR "/ce-new-connection.ui",
&error)) {
g_warning ("Couldn't load builder file: %s", error->message);
if (!gtk_builder_add_from_resource (gui,
"/org/freedesktop/network-manager-applet/ce-new-connection.ui",
&error)) {
g_warning ("Couldn't load builder resource: %s", error->message);
g_error_free (error);
g_object_unref (gui);
return;
......
src/connection-editor/ip4-routes-dialog.c
View file @ a4fa0bf2
......@@ -624,8 +624,8 @@ ip4_routes_dialog_new (NMSettingIPConfig *s_ip4, gboolean automatic)
builder = gtk_builder_new ();
if (!gtk_builder_add_from_file (builder, UIDIR "/ce-ip4-routes.ui", &error)) {
g_warning ("Couldn't load builder file: %s", error->message);
if (!gtk_builder_add_from_resource (builder, "/org/freedesktop/network-manager-applet/ce-ip4-routes.ui", &error)) {
g_warning ("Couldn't load builder resource: %s", error->message);
g_error_free (error);
return NULL;
}
......
src/connection-editor/ip6-routes-dialog.c
View file @ a4fa0bf2
......@@ -648,8 +648,8 @@ ip6_routes_dialog_new (NMSettingIPConfig *s_ip6, gboolean automatic)
builder = gtk_builder_new ();
if (!gtk_builder_add_from_file (builder, UIDIR "/ce-ip6-routes.ui", &error)) {
g_warning ("Couldn't load builder file: %s", error->message);
if (!gtk_builder_add_from_resource (builder, "/org/freedesktop/network-manager-applet/ce-ip6-routes.ui", &error)) {
g_warning ("Couldn't load builder resource: %s", error->message);
g_error_free (error);
return NULL;
}
......
src/connection-editor/nm-connection-editor.c
View file @ a4fa0bf2
......@@ -271,11 +271,11 @@ nm_connection_editor_init (NMConnectionEditor *editor)
editor->builder = gtk_builder_new ();
if (!gtk_builder_add_objects_from_file (editor->builder,
UIDIR "/nm-connection-editor.ui",
(char **) objects,
&error)) {
g_warning ("Couldn't load builder file " UIDIR "/nm-connection-editor.ui: %s", error->message);
if (!gtk_builder_add_objects_from_resource (editor->builder,
"/org/freedesktop/network-manager-applet/nm-connection-editor.ui",
(char **) objects,
&error)) {
g_warning ("Couldn't load builder resource " "/org/freedesktop/network-manager-applet/nm-connection-editor.ui: %s", error->message);
g_error_free (error);
dialog = gtk_message_dialog_new (NULL, 0,
......
src/connection-editor/nm-connection-list.c
View file @ a4fa0bf2
......@@ -861,11 +861,11 @@ nm_connection_list_new (void)
/* load GUI */
list->gui = gtk_builder_new ();
if (!gtk_builder_add_objects_from_file (list->gui,
UIDIR "/nm-connection-editor.ui",
(char **) objects,
&error)) {
g_warning ("Couldn't load builder file: %s", error->message);
if (!gtk_builder_add_objects_from_resource (list->gui,
"/org/freedesktop/network-manager-applet/nm-connection-editor.ui",
(char **) objects,
&error)) {
g_warning ("Couldn't load builder resource: %s", error->message);
g_error_free (error);
goto error;
}
......
src/connection-editor/page-bluetooth.c
View file @ a4fa0bf2
......@@ -118,7 +118,7 @@ ce_page_bluetooth_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-bluetooth.ui",
"/org/freedesktop/network-manager-applet/ce-page-bluetooth.ui",
"BluetoothPage",
_("Bluetooth")));
if (!self) {
......
src/connection-editor/page-bond.c
View file @ a4fa0bf2
......@@ -441,7 +441,7 @@ ce_page_bond_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-bond.ui",
"/org/freedesktop/network-manager-applet/ce-page-bond.ui",
"BondPage",
_("Bond")));
if (!self) {
......
src/connection-editor/page-bridge-port.c
View file @ a4fa0bf2
......@@ -100,7 +100,7 @@ ce_page_bridge_port_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-bridge-port.ui",
"/org/freedesktop/network-manager-applet/ce-page-bridge-port.ui",
"BridgePortPage",
/* Translators: a "Bridge Port" is a network
* device that is part of a bridge.
......
src/connection-editor/page-bridge.c
View file @ a4fa0bf2
......@@ -207,7 +207,7 @@ ce_page_bridge_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-bridge.ui",
"/org/freedesktop/network-manager-applet/ce-page-bridge.ui",
"BridgePage",
_("Bridge")));
if (!self) {
......
src/connection-editor/page-dcb.c
View file @ a4fa0bf2
......@@ -617,7 +617,7 @@ ce_page_dcb_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-dcb.ui",
"/org/freedesktop/network-manager-applet/ce-page-dcb.ui",
"DcbPage",
_("DCB")));
if (!self) {
......
src/connection-editor/page-dsl.c
View file @ a4fa0bf2
......@@ -122,7 +122,7 @@ ce_page_dsl_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-dsl.ui",
"/org/freedesktop/network-manager-applet/ce-page-dsl.ui",
"DslPage",
_("DSL")));
if (!self) {
......
src/connection-editor/page-ethernet.c
View file @ a4fa0bf2
......@@ -347,7 +347,7 @@ ce_page_ethernet_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-ethernet.ui",
"/org/freedesktop/network-manager-applet/ce-page-ethernet.ui",
"EthernetPage",
_("Ethernet")));
if (!self) {
......
src/connection-editor/page-general.c
View file @ a4fa0bf2
......@@ -362,7 +362,7 @@ ce_page_general_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-general.ui",
"/org/freedesktop/network-manager-applet/ce-page-general.ui",
"GeneralPage",
_("General")));
if (!self) {
......
src/connection-editor/page-infiniband.c
View file @ a4fa0bf2
......@@ -143,7 +143,7 @@ ce_page_infiniband_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-infiniband.ui",
"/org/freedesktop/network-manager-applet/ce-page-infiniband.ui",
"InfinibandPage",
_("InfiniBand")));
if (!self) {
......
src/connection-editor/page-ip-tunnel.c
View file @ a4fa0bf2
......@@ -171,7 +171,7 @@ ce_page_ip_tunnel_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-ip-tunnel.ui",
"/org/freedesktop/network-manager-applet/ce-page-ip-tunnel.ui",
"IPTunnelPage",
_("IP tunnel")));
if (!self) {
......
src/connection-editor/page-ip4.c
View file @ a4fa0bf2
......@@ -1221,7 +1221,7 @@ ce_page_ip4_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-ip4.ui",
"/org/freedesktop/network-manager-applet/ce-page-ip4.ui",
"IP4Page",
_("IPv4 Settings")));
if (!self) {
......
src/connection-editor/page-ip6.c
View file @ a4fa0bf2
......@@ -1174,7 +1174,7 @@ ce_page_ip6_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-ip6.ui",
"/org/freedesktop/network-manager-applet/ce-page-ip6.ui",
"IP6Page",
_("IPv6 Settings")));
if (!self) {
......
src/connection-editor/page-mobile.c
View file @ a4fa0bf2
......@@ -303,7 +303,7 @@ ce_page_mobile_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-mobile.ui",
"/org/freedesktop/network-manager-applet/ce-page-mobile.ui",
"MobilePage",
_("Mobile Broadband")));
if (!self) {
......
src/connection-editor/page-ppp.c
View file @ a4fa0bf2
......@@ -274,7 +274,7 @@ ce_page_ppp_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-ppp.ui",
"/org/freedesktop/network-manager-applet/ce-page-ppp.ui",
"PppPage",
_("PPP Settings")));
if (!self) {
......
src/connection-editor/page-proxy.c
View file @ a4fa0bf2
......@@ -212,7 +212,7 @@ ce_page_proxy_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-proxy.ui",
"/org/freedesktop/network-manager-applet/ce-page-proxy.ui",
"ProxyPage",
_("Proxy")));
if (!self) {
......
src/connection-editor/page-team-port.c
View file @ a4fa0bf2
......@@ -724,7 +724,7 @@ ce_page_team_port_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-team-port.ui",
"/org/freedesktop/network-manager-applet/ce-page-team-port.ui",
"TeamPortPage",
/* Translators: a "Team Port" is a network
* device that is part of a team.
......
src/connection-editor/page-team.c
View file @ a4fa0bf2
......@@ -1148,7 +1148,7 @@ ce_page_team_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-team.ui",
"/org/freedesktop/network-manager-applet/ce-page-team.ui",
"TeamPage",
_("Team")));
if (!self) {
......
src/connection-editor/page-vlan.c
View file @ a4fa0bf2
......@@ -588,7 +588,7 @@ ce_page_vlan_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-vlan.ui",
"/org/freedesktop/network-manager-applet/ce-page-vlan.ui",
"VlanPage",
_("VLAN")));
if (!self) {
......
src/connection-editor/page-wifi-security.c
View file @ a4fa0bf2
......@@ -420,7 +420,7 @@ ce_page_wifi_security_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-wifi-security.ui",
"/org/freedesktop/network-manager-applet/ce-page-wifi-security.ui",
"WifiSecurityPage",
_("Wi-Fi Security")));
if (!self) {
......
src/connection-editor/page-wifi.c
View file @ a4fa0bf2
......@@ -436,7 +436,7 @@ ce_page_wifi_new (NMConnectionEditor *editor,
connection,
parent_window,
client,
UIDIR "/ce-page-wifi.ui",
"/org/freedesktop/network-manager-applet/ce-page-wifi.ui",
"WifiPage",
_("Wi-Fi")));
if (!self) {
......
src/connection-editor/ppp-auth-methods-dialog.c
View file @ a4fa0bf2
......@@ -86,8 +86,8 @@ ppp_auth_methods_dialog_new (gboolean refuse_eap,
builder = gtk_builder_new ();
if (!gtk_builder_add_from_file (builder, UIDIR "/ce-ppp-auth-methods.ui", &error)) {
g_warning ("Couldn't load builder file: %s", error->message);
if (!gtk_builder_add_from_resource (builder, "/org/freedesktop/network-manager-applet/ce-ppp-auth-methods.ui", &error)) {
g_warning ("Couldn't load builder resource: %s", error->message);
g_error_free (error);
return NULL;
}
......
src/ethernet-dialog.c
View file @ a4fa0bf2
......@@ -80,8 +80,8 @@ nma_ethernet_dialog_new (NMConnection *connection)
builder = gtk_builder_new ();
if (!gtk_builder_add_from_file (builder, UIDIR "/8021x.ui", &error)) {
g_warning ("Couldn't load builder file: %s", error->message);
if (!gtk_builder_add_from_resource (builder, "/org/freedesktop/network-manager-applet/8021x.ui", &error)) {
g_warning ("Couldn't load builder resource: %s", error->message);
g_error_free (error);
applet_missing_ui_warning_dialog_show ();
g_object_unref (builder);
......
src/libnm-gtk/Makefile.am
View file @ a4fa0bf2
SUBDIRS = . tests examples
uidir = $(datadir)/libnm-gtk
ui_DATA = wifi.ui
libnmgtkdir = $(includedir)/libnm-gtk
libnmgtk_HEADERS = \
......@@ -15,6 +12,10 @@ libnmgtk_HEADERS = \
lib_LTLIBRARIES = libnm-gtk.la
BUILT_SOURCES = \
nm-resources.h \
nm-resources.c
libnm_gtk_la_SOURCES = \
nm-wifi-dialog.c \
nm-wireless-dialog.c \
......@@ -22,6 +23,8 @@ libnm_gtk_la_SOURCES = \
nm-ui-utils.c \
nm-mobile-providers.c \
nm-vpn-password-dialog.c \
nm-resources.h \
nm-resources.c \
init.c
libnm_gtk_la_CFLAGS = \
......@@ -30,7 +33,6 @@ libnm_gtk_la_CFLAGS = \
$(GUDEV_CFLAGS) \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
-DICONDIR=\""$(datadir)/icons"\" \
-DUIDIR=\""$(uidir)"\" \
-DBINDIR=\""$(bindir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
......@@ -52,6 +54,12 @@ EXTRA_libnm_gtk_la_DEPENDENCIES = $(srcdir)/libnm-gtk.ver
libnm_gtk_la_LDFLAGS = -Wl,-no-undefined \
-Wl,--version-script=$(srcdir)/libnm-gtk.ver
nm-resources.h: nm.gresource.xml
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-header --internal
nm-resources.c: nm.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/nm.gresource.xml)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-source --internal
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libnm-gtk.pc
......@@ -59,9 +67,9 @@ pkgconfig_DATA = libnm-gtk.pc
INTROSPECTION_GIRS =
if HAVE_INTROSPECTION
introspection_sources = \
$(filter-out \
nm-wireless-dialog.%, \
introspection_sources = \
$(filter-out \