[network-manager-netbook] Rename GtkBuilder files.
- From: Tambet Ingo <tambeti src gnome org>
- To: svn-commits-list gnome org
- Subject: [network-manager-netbook] Rename GtkBuilder files.
- Date: Fri, 19 Jun 2009 09:27:43 -0400 (EDT)
commit 723a0ca45a5d62c8a63c083ea53a493e49ac57e2
Author: Tambet Ingo <tambet gmail com>
Date: Fri Jun 19 15:50:16 2009 +0300
Rename GtkBuilder files.
src/Makefile.am | 8 ++++----
...er-netbook.glade => network-manager-netbook.ui} | 0
src/nmn-applet.c | 2 +-
src/wireless-dialog.c | 6 +++---
...ireless-security.glade => wireless-security.ui} | 0
5 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 602765d..3ddcc2a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ network_manager_netbook_CPPFLAGS = \
$(NMN_CFLAGS) \
-I${top_srcdir}/src/gconf-helpers \
-I${top_srcdir}/src/wireless-security \
- -DGLADEDIR=\""$(gladedir)"\" \
+ -DUIDIR=\""$(gladedir)"\" \
-DICON_PATH=\""$(pkgdatadir)/icons/"\" \
$(NULL)
@@ -69,9 +69,9 @@ network_manager_netbook_SOURCES = \
nbtk-gtk-light-switch.h \
$(NULL)
-gladedir = $(datadir)/network-manager-netbook
-glade_DATA = network-manager-netbook.glade wireless-security.glade
+uidir = $(datadir)/network-manager-netbook
+ui_DATA = network-manager-netbook.ui wireless-security.ui
EXTRA_DIST = \
- $(glade_DATA) \
+ $(ui_DATA) \
$(NULL)
diff --git a/src/network-manager-netbook.glade b/src/network-manager-netbook.ui
similarity index 100%
rename from src/network-manager-netbook.glade
rename to src/network-manager-netbook.ui
diff --git a/src/nmn-applet.c b/src/nmn-applet.c
index 3085dae..4dad48d 100644
--- a/src/nmn-applet.c
+++ b/src/nmn-applet.c
@@ -368,7 +368,7 @@ nmn_applet_init (NmnApplet *applet)
nmn_status_icon_set_client (NMN_STATUS_ICON (priv->status_icon), NM_CLIENT (priv->nm_data));
priv->builder = gtk_builder_new ();
- gtk_builder_add_from_file (priv->builder, GLADEDIR "/network-manager-netbook.glade", NULL);
+ gtk_builder_add_from_file (priv->builder, UIDIR "/network-manager-netbook.ui", NULL);
priv->pane = GTK_WIDGET (gtk_builder_get_object (priv->builder, "main_container"));
priv->list = nmn_networks_new (priv->nm_data);
diff --git a/src/wireless-dialog.c b/src/wireless-dialog.c
index 7627913..5443d02 100644
--- a/src/wireless-dialog.c
+++ b/src/wireless-dialog.c
@@ -811,7 +811,7 @@ internal_init (NMAWirelessDialog *self,
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hbox1"));
if (!widget) {
- nm_warning ("Couldn't find glade wireless_dialog widget.");
+ nm_warning ("Couldn't find UI wireless_dialog widget.");
return FALSE;
}
@@ -1145,9 +1145,9 @@ nma_wireless_dialog_init (NMAWirelessDialog *self)
GError *error = NULL;
priv->builder = gtk_builder_new ();
- gtk_builder_add_from_file (priv->builder, GLADEDIR "/wireless-security.glade", &error);
+ gtk_builder_add_from_file (priv->builder, UIDIR "/wireless-security.ui", &error);
if (error) {
- g_error ("Could not load wireless security glade file: %s", error->message);
+ g_error ("Could not load wireless security UI file: %s", error->message);
g_error_free (error);
}
diff --git a/src/wireless-security.glade b/src/wireless-security.ui
similarity index 100%
rename from src/wireless-security.glade
rename to src/wireless-security.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]