GNOME.org
 

[gyrus] Remove orphan references to glade

commit bc969ac3005c7be68371b445faf845fce7d587eb
Author: Claudio Saavedra <csaavedra igalia com>
Date:   Sun Dec 26 17:20:00 2010 +0200

    Remove orphan references to glade

 configure.ac                         |    2 +-
 po/POTFILES.in                       |   10 +++++-----
 src/Makefile.am                      |    6 +++---
 src/gyrus-admin.c                    |    2 +-
 src/gyrus-common.c                   |    2 +-
 src/gyrus-dialog-find-mailbox.c      |    2 +-
 src/gyrus-dialog-mailbox-new.c       |    2 +-
 src/gyrus-report.c                   |    2 +-
 src/gyrus-session.c                  |    4 ++--
 src/{glade => ui}/Makefile.am        |    2 +-
 src/{glade => ui}/create_mailbox.xml |    0
 src/{glade => ui}/find.xml           |    0
 src/{glade => ui}/page.xml           |    0
 src/{glade => ui}/password.xml       |    0
 src/{glade => ui}/preferences.glade  |    0
 src/{glade => ui}/report.xml         |    0
 src/{glade => ui}/sessions.xml       |    0
 src/{glade => ui}/sessions_edit.xml  |    0
 18 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d91b541..226e7cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ AC_OUTPUT([
 gyrus.desktop.in
 Makefile
 src/Makefile
-src/glade/Makefile
+src/ui/Makefile
 src/pixmaps/Makefile
 po/Makefile.in
 tests/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cb09d90..9ff3ef4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,11 +2,11 @@
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
 gyrus.desktop.in.in
-src/glade/create_mailbox.glade
-src/glade/find.glade
-src/glade/page.glade
-src/glade/report.glade
-src/glade/sessions.glade
+src/ui/create_mailbox.xml
+src/ui/find.xml
+src/ui/page.xml
+src/ui/report.xml
+src/ui/sessions.xml
 src/gyrus-admin-acl.c
 src/gyrus-admin-mailbox.c
 src/gyrus-admin.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 2567861..eac17a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,15 @@
 ## Process this file with automake to produce Makefile.in
 
 SUBDIRS = \
-	glade \
+	ui \
 	pixmaps
 
-gladedir = $(datadir)/gyrus/glade
+uidir = $(datadir)/gyrus/ui
 pixmapsdir = $(datadir)/gyrus/pixmaps
 
 INCLUDES = \
 	-DGYRUS_DATA_DIR=\""$(datadir)"\" \
-	-DGYRUS_GLADE_DIR=\""$(gladedir)"\" \
+	-DGYRUS_UI_DIR=\""$(uidir)"\" \
 	-DGYRUS_PIXMAPS_DIR=\""$(pixmapsdir)"\" \
 	-DGNOME_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	$(GYRUS_CFLAGS)
diff --git a/src/gyrus-admin.c b/src/gyrus-admin.c
index 9a4bf2a..96062a3 100644
--- a/src/gyrus-admin.c
+++ b/src/gyrus-admin.c
@@ -166,7 +166,7 @@ gyrus_admin_init_get_widgets (GyrusAdmin *admin)
 	GtkWidget *table;
 	GtkBuilder *builder;
 
-	file_xml = g_build_filename (GYRUS_GLADE_DIR, "page.xml", NULL);
+	file_xml = g_build_filename (GYRUS_UI_DIR, "page.xml", NULL);
 
         builder = gtk_builder_new ();
         gtk_builder_add_from_file (builder, file_xml, NULL);
diff --git a/src/gyrus-common.c b/src/gyrus-common.c
index 05d165d..505f580 100644
--- a/src/gyrus-common.c
+++ b/src/gyrus-common.c
@@ -71,7 +71,7 @@ gyrus_dialog_password_new (void)
 	gint result;
 	GtkBuilder *builder;
 
-	file_xml = g_build_filename (GYRUS_GLADE_DIR, "password.xml", NULL);
+	file_xml = g_build_filename (GYRUS_UI_DIR, "password.xml", NULL);
 
         builder = gtk_builder_new ();
         gtk_builder_add_from_file (builder, file_xml, NULL);
diff --git a/src/gyrus-dialog-find-mailbox.c b/src/gyrus-dialog-find-mailbox.c
index 2683aea..a24295a 100644
--- a/src/gyrus-dialog-find-mailbox.c
+++ b/src/gyrus-dialog-find-mailbox.c
@@ -210,7 +210,7 @@ gyrus_dialog_find_mailbox_init_get_widgets (GyrusDialogFindMailbox *dialog)
 	GtkWidget *vbox_find;
 	GtkBuilder *builder;
 
-	file_xml = g_build_filename (GYRUS_GLADE_DIR, "find.xml", NULL);
+	file_xml = g_build_filename (GYRUS_UI_DIR, "find.xml", NULL);
 
 	builder = gtk_builder_new ();
         gtk_builder_add_from_file (builder, file_xml, NULL);
diff --git a/src/gyrus-dialog-mailbox-new.c b/src/gyrus-dialog-mailbox-new.c
index 67aeb6d..ed547d6 100644
--- a/src/gyrus-dialog-mailbox-new.c
+++ b/src/gyrus-dialog-mailbox-new.c
@@ -162,7 +162,7 @@ gyrus_dialog_mailbox_new_init_get_widgets (GyrusDialogMailboxNew *dialog)
 	GtkWidget *table;
 	GtkBuilder *builder;
 
-	file_xml = g_build_filename (GYRUS_GLADE_DIR, "create_mailbox.xml", NULL);
+	file_xml = g_build_filename (GYRUS_UI_DIR, "create_mailbox.xml", NULL);
 
         builder = gtk_builder_new ();
         gtk_builder_add_from_file (builder, file_xml, NULL);
diff --git a/src/gyrus-report.c b/src/gyrus-report.c
index dabf00e..7a8cc86 100644
--- a/src/gyrus-report.c
+++ b/src/gyrus-report.c
@@ -88,7 +88,7 @@ gyrus_report_show_report (GyrusAdmin *admin)
 	report->mailbox_temp = NULL;
 	report->admin = admin;
 
-	file_xml = g_build_filename (GYRUS_GLADE_DIR, "report.xml", NULL);
+	file_xml = g_build_filename (GYRUS_UI_DIR, "report.xml", NULL);
 
 	builder = gtk_builder_new ();
 	gtk_builder_add_from_file (builder, file_xml, NULL);
diff --git a/src/gyrus-session.c b/src/gyrus-session.c
index 91b63eb..7766118 100644
--- a/src/gyrus-session.c
+++ b/src/gyrus-session.c
@@ -728,7 +728,7 @@ gyrus_session_load_interface (gpointer user_data)
 	gchar *file_xml;
 	GtkBuilder *builder;
         
-	file_xml = g_build_filename (GYRUS_GLADE_DIR, "sessions.xml", NULL);
+	file_xml = g_build_filename (GYRUS_UI_DIR, "sessions.xml", NULL);
 
 	builder = gtk_builder_new ();
         gtk_builder_add_from_file (builder, file_xml, NULL);
@@ -790,7 +790,7 @@ gyrus_session_edit_load_interface (gpointer user_data)
 	GtkBuilder *builder;
 	GtkCellRenderer *cell;
         
-	file_xml = g_build_filename (GYRUS_GLADE_DIR, "sessions_edit.xml", NULL);
+	file_xml = g_build_filename (GYRUS_UI_DIR, "sessions_edit.xml", NULL);
 
 	builder = gtk_builder_new ();
         gtk_builder_add_from_file (builder, file_xml, NULL);
diff --git a/src/glade/Makefile.am b/src/ui/Makefile.am
similarity index 84%
rename from src/glade/Makefile.am
rename to src/ui/Makefile.am
index a5b7b6f..5d73391 100644
--- a/src/glade/Makefile.am
+++ b/src/ui/Makefile.am
@@ -1,5 +1,5 @@
 
-uidir = $(datadir)/gyrus/glade
+uidir = $(datadir)/gyrus/ui
 
 #
 # Glade Files
diff --git a/src/glade/create_mailbox.xml b/src/ui/create_mailbox.xml
similarity index 100%
rename from src/glade/create_mailbox.xml
rename to src/ui/create_mailbox.xml
diff --git a/src/glade/find.xml b/src/ui/find.xml
similarity index 100%
rename from src/glade/find.xml
rename to src/ui/find.xml
diff --git a/src/glade/page.xml b/src/ui/page.xml
similarity index 100%
rename from src/glade/page.xml
rename to src/ui/page.xml
diff --git a/src/glade/password.xml b/src/ui/password.xml
similarity index 100%
rename from src/glade/password.xml
rename to src/ui/password.xml
diff --git a/src/glade/preferences.glade b/src/ui/preferences.glade
similarity index 100%
rename from src/glade/preferences.glade
rename to src/ui/preferences.glade
diff --git a/src/glade/report.xml b/src/ui/report.xml
similarity index 100%
rename from src/glade/report.xml
rename to src/ui/report.xml
diff --git a/src/glade/sessions.xml b/src/ui/sessions.xml
similarity index 100%
rename from src/glade/sessions.xml
rename to src/ui/sessions.xml
diff --git a/src/glade/sessions_edit.xml b/src/ui/sessions_edit.xml
similarity index 100%
rename from src/glade/sessions_edit.xml
rename to src/ui/sessions_edit.xml
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]