GNOME.org
 

[evolution/gtk-builder: 3/5] Change all EVOLUTION_GLADEDIR to EVOLUTION_UIDIR.

commit 5eed3b82fcfafd1dfbabc7106e395025c6f4ed48
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Sep 24 21:31:39 2009 -0400

    Change all EVOLUTION_GLADEDIR to EVOLUTION_UIDIR.

 .../gui/contact-editor/e-contact-editor-fullname.c |    2 +-
 addressbook/gui/contact-editor/e-contact-editor.c  |    2 +-
 .../contact-list-editor/e-contact-list-editor.c    |    2 +-
 addressbook/gui/merging/eab-contact-merging.c      |    4 ++--
 calendar/gui/alarm-notify/alarm-notify-dialog.c    |    2 +-
 calendar/gui/dialogs/alarm-dialog.c                |    2 +-
 calendar/gui/dialogs/alarm-list-dialog.c           |    4 ++--
 calendar/gui/dialogs/cal-prefs-dialog.c            |    2 +-
 calendar/gui/dialogs/e-delegate-dialog.c           |    2 +-
 calendar/gui/dialogs/event-page.c                  |    2 +-
 calendar/gui/dialogs/memo-page.c                   |    2 +-
 calendar/gui/dialogs/recurrence-page.c             |    2 +-
 calendar/gui/dialogs/schedule-page.c               |    2 +-
 calendar/gui/dialogs/task-details-page.c           |    2 +-
 calendar/gui/dialogs/task-page.c                   |    2 +-
 calendar/gui/goto.c                                |    2 +-
 e-util/e-util-private.h                            |    4 ++--
 e-util/e-win32-reloc.c                             |    2 +-
 filter/e-filter-datespec.c                         |    2 +-
 mail/em-account-editor.c                           |   12 ++++++------
 mail/em-filter-editor.c                            |    2 +-
 mail/em-format-html-display.c                      |    2 +-
 mail/em-subscribe-editor.c                         |    2 +-
 mail/em-vfolder-editor.c                           |    2 +-
 mail/em-vfolder-rule.c                             |    2 +-
 mail/message-tag-followup.c                        |    2 +-
 modules/addressbook/addressbook-config.c           |   14 +++++++-------
 modules/mail/em-composer-prefs.c                   |    2 +-
 modules/mail/em-mailer-prefs.c                     |    2 +-
 modules/mail/em-network-prefs.c                    |    2 +-
 plugins/email-custom-header/email-custom-header.c  |    4 ++--
 plugins/groupwise-features/junk-settings.c         |    2 +-
 plugins/groupwise-features/proxy-login.c           |    2 +-
 plugins/groupwise-features/proxy.c                 |    6 +++---
 plugins/groupwise-features/share-folder.c          |    4 ++--
 plugins/imap-features/imap-headers.c               |    2 +-
 plugins/publish-calendar/publish-calendar.c        |    2 +-
 plugins/publish-calendar/url-editor-dialog.c       |    2 +-
 smime/gui/ca-trust-dialog.c                        |    2 +-
 smime/gui/cert-trust-dialog.c                      |    2 +-
 smime/gui/certificate-manager.c                    |    2 +-
 smime/gui/certificate-viewer.c                     |    2 +-
 smime/gui/e-cert-selector.c                        |    2 +-
 widgets/e-timezone-dialog/e-timezone-dialog.c      |    2 +-
 widgets/menus/gal-define-views-dialog.c            |    2 +-
 widgets/menus/gal-view-instance-save-as-dialog.c   |    2 +-
 widgets/menus/gal-view-new-dialog.c                |    2 +-
 widgets/misc/e-send-options.c                      |    2 +-
 widgets/table/e-table-config.c                     |    2 +-
 widgets/table/e-table-field-chooser.c              |    2 +-
 50 files changed, 68 insertions(+), 68 deletions(-)
---
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index 2ffe6fc..b68293b 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -116,7 +116,7 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam
 
 	e_contact_editor_fullname->name = NULL;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "fullname.glade",
 				      NULL);
 	gui = glade_xml_new (gladefile, NULL, NULL);
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 6fab3cb..e416a41 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -3392,7 +3392,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor)
 	e_contact_editor->load_source_id = 0;
 	e_contact_editor->load_book = NULL;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "contact-editor.glade",
 				      NULL);
 	gui = glade_xml_new (gladefile, NULL, NULL);
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 79fef05..05f2169 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -1302,7 +1302,7 @@ contact_list_editor_init (EContactListEditor *editor)
 	priv->allows_contact_lists = TRUE;
 
 	filename = g_build_filename (
-		EVOLUTION_GLADEDIR, "contact-list-editor.glade", NULL);
+		EVOLUTION_UIDIR, "contact-list-editor.glade", NULL);
 	priv->xml = glade_xml_new (filename, NULL, NULL);
 	glade_xml_signal_autoconnect (priv->xml);
 	g_free (filename);
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index 8774416..cb2bc3f 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -484,7 +484,7 @@ match_query_callback (EContact *contact, EContact *match, EABContactMatchType ty
 		if (lookup->op == E_CONTACT_MERGING_ADD) {
 			/* Compares all the values of contacts and return true, if they match */
 			flag = check_if_same (contact, match);
-			gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+			gladefile = g_build_filename (EVOLUTION_UIDIR,
 						      "eab-contact-duplicate-detected.glade",
 						      NULL);
 			ui = glade_xml_new (gladefile, NULL, NULL);
@@ -494,7 +494,7 @@ match_query_callback (EContact *contact, EContact *match, EABContactMatchType ty
 				gtk_widget_set_sensitive (GTK_WIDGET (merge_button), FALSE);
 			g_free (gladefile);
 		} else if (lookup->op == E_CONTACT_MERGING_COMMIT) {
-			gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+			gladefile = g_build_filename (EVOLUTION_UIDIR,
 						      "eab-contact-commit-duplicate-detected.glade",
 						      NULL);
 			ui = glade_xml_new (gladefile, NULL, NULL);
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 4670e88..76dfede 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -253,7 +253,7 @@ notified_alarms_dialog_new (void)
 
 	gchar *gladefile;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "alarm-notify.glade",
 				      NULL);
 	an->xml = glade_xml_new (gladefile, NULL, NULL);
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 80aa4f3..960aa11 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -1221,7 +1221,7 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm)
 	dialog.alarm = alarm;
 	dialog.ecal = ecal;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "alarm-dialog.glade",
 				      NULL);
 	dialog.xml = glade_xml_new (gladefile, NULL, NULL);
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 04c87d4..1c33575 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -268,7 +268,7 @@ alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store)
 	dialog.ecal = ecal;
 	dialog.list_store = list_store;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "alarm-list-dialog.glade",
 				      NULL);
 	dialog.xml = glade_xml_new (gladefile, NULL, NULL);
@@ -317,7 +317,7 @@ alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store)
 	dialog->ecal = ecal;
 	dialog->list_store = list_store;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "alarm-list-dialog.glade",
 				      NULL);
 	dialog->xml = glade_xml_new (gladefile, NULL, NULL);
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index e6023f9..ed7587d 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -604,7 +604,7 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs,
 	locale_supports_12_hour_format =
 		calendar_config_locale_supports_12_hour_format ();
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "cal-prefs-dialog.glade",
 				      NULL);
 	gui = glade_xml_new (gladefile, "toplevel-notebook", NULL);
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index c47fcdc..49268b8 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -129,7 +129,7 @@ e_delegate_dialog_construct (EDelegateDialog *edd, const gchar *name, const gcha
 
 	/* Load the content widgets */
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "e-delegate-dialog.glade",
 				      NULL);
 	priv->xml = glade_xml_new (gladefile, NULL, NULL);
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 4b7a529..4624c44 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -3055,7 +3055,7 @@ event_page_construct (EventPage *epage, EMeetingStore *model)
 	g_object_ref (model);
 	priv->model = model;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "event-page.glade",
 				      NULL);
 	priv->xml = glade_xml_new (gladefile, NULL, NULL);
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 70b9204..38f9dd1 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -1121,7 +1121,7 @@ memo_page_construct (MemoPage *mpage)
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (mpage));
 	flags = comp_editor_get_flags (editor);
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "memo-page.glade",
 				      NULL);
 	priv->xml = glade_xml_new (gladefile, NULL, NULL);
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 26b08b1..322dcd1 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -2371,7 +2371,7 @@ recurrence_page_construct (RecurrencePage *rpage)
 
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (rpage));
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "recurrence-page.glade",
 				      NULL);
 	priv->xml = glade_xml_new (gladefile, NULL, NULL);
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 614b1df..78bcd7a 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -394,7 +394,7 @@ schedule_page_construct (SchedulePage *spage, EMeetingStore *ems)
 	shell = comp_editor_get_shell (editor);
 	shell_settings = e_shell_get_shell_settings (shell);
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "schedule-page.glade",
 				      NULL);
 	priv->xml = glade_xml_new (gladefile, NULL, NULL);
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 9e5f9ef..67115e3 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -723,7 +723,7 @@ task_details_page_construct (TaskDetailsPage *tdpage)
 
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (tdpage));
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "task-details-page.glade",
 				      NULL);
 	priv->xml = glade_xml_new (gladefile, NULL, NULL);
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 165d4ff..73bb1c6 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1975,7 +1975,7 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client)
 	priv->model = model;
 	priv->client = client;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "task-page.glade",
 				      NULL);
 	priv->xml = glade_xml_new (gladefile, NULL, NULL);
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
index 14bfb04..ef00d75 100644
--- a/calendar/gui/goto.c
+++ b/calendar/gui/goto.c
@@ -219,7 +219,7 @@ goto_dialog (GnomeCalendar *gcal)
 	dlg = g_new0 (GoToDialog, 1);
 
 	/* Load the content widgets */
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "goto-dialog.glade",
 				      NULL);
 	dlg->xml = glade_xml_new (gladefile, NULL, NULL);
diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h
index 7c77f12..775895e 100644
--- a/e-util/e-util-private.h
+++ b/e-util/e-util-private.h
@@ -86,8 +86,8 @@ const gchar *_e_get_uidir (void) G_GNUC_CONST;
 #undef EVOLUTION_GALVIEWSDIR
 #define EVOLUTION_GALVIEWSDIR _e_get_galviewsdir ()
 
-#undef EVOLUTION_GLADEDIR
-#define EVOLUTION_GLADEDIR _e_get_gladedir ()
+#undef EVOLUTION_UIDIR
+#define EVOLUTION_UIDIR _e_get_gladedir ()
 
 #undef EVOLUTION_HELPDIR
 #define EVOLUTION_HELPDIR _e_get_helpdir ()
diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c
index 3ad8bbf..2f31d64 100644
--- a/e-util/e-win32-reloc.c
+++ b/e-util/e-win32-reloc.c
@@ -120,7 +120,7 @@ setup (void)
 	ecpsdir = replace_prefix (full_prefix, EVOLUTION_ECPSDIR);
 	etspecdir = replace_prefix (full_prefix, EVOLUTION_ETSPECDIR);
 	galviewsdir = replace_prefix (full_prefix, EVOLUTION_GALVIEWSDIR);
-	gladedir = replace_prefix (full_prefix, EVOLUTION_GLADEDIR);
+	gladedir = replace_prefix (full_prefix, EVOLUTION_UIDIR);
 	helpdir = replace_prefix (full_prefix, EVOLUTION_HELPDIR);
 	if (g_getenv ("EVOLUTION_ICONSDIR") &&
 	    g_file_test (g_getenv ("EVOLUTION_ICONSDIR"), G_FILE_TEST_IS_DIR))
diff --git a/filter/e-filter-datespec.c b/filter/e-filter-datespec.c
index d339652..a60beda 100644
--- a/filter/e-filter-datespec.c
+++ b/filter/e-filter-datespec.c
@@ -257,7 +257,7 @@ button_clicked (GtkButton *button, EFilterDatespec *fds)
 	GtkWidget *toplevel;
 	GtkDialog *dialog;
 	GladeXML *gui;
-	gchar *filter_glade = g_build_filename (EVOLUTION_GLADEDIR,
+	gchar *filter_glade = g_build_filename (EVOLUTION_UIDIR,
 					       "filter.glade",
 					       NULL);
 
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 82d37ce..cc07fbb 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -571,7 +571,7 @@ emae_display_license (EMAccountEditor *emae, CamelProvider *prov)
 	GtkResponseType response = GTK_RESPONSE_NONE;
 	gchar *gladefile;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "mail-dialogs.glade",
 				      NULL);
 	xml = glade_xml_new (gladefile, "license_dialog", NULL);
@@ -2170,7 +2170,7 @@ emae_identity_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 
 	account = em_account_editor_get_modified_account (emae);
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "mail-config.glade",
 				      NULL);
 	xml = glade_xml_new (gladefile, item->label, NULL);
@@ -2231,7 +2231,7 @@ emae_receive_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 	/*if (old)
 	  return old;*/
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "mail-config.glade",
 				      NULL);
 	xml = glade_xml_new (gladefile, item->label, NULL);
@@ -2690,7 +2690,7 @@ emae_send_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *ol
 		return NULL;
 	}
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "mail-config.glade",
 				      NULL);
 	xml = glade_xml_new (gladefile, item->label, NULL);
@@ -2735,7 +2735,7 @@ emae_defaults_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 
 	account = em_account_editor_get_modified_account (emae);
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "mail-config.glade",
 				      NULL);
 	xml = glade_xml_new (gladefile, item->label, NULL);
@@ -2795,7 +2795,7 @@ emae_security_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 	/*if (old)
 	  return old;*/
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "mail-config.glade",
 				      NULL);
 	xml = glade_xml_new (gladefile, item->label, NULL);
diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c
index c0e5725..f104cef 100644
--- a/mail/em-filter-editor.c
+++ b/mail/em-filter-editor.c
@@ -122,7 +122,7 @@ em_filter_editor_new (EMFilterContext *fc,
 	fe = g_object_new (EM_TYPE_FILTER_EDITOR, NULL);
 
 	gladefile = g_build_filename (
-		EVOLUTION_GLADEDIR, "filter.glade", NULL);
+		EVOLUTION_UIDIR, "filter.glade", NULL);
 	gui = glade_xml_new (gladefile, "rule_editor", NULL);
 	g_free (gladefile);
 
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 90bc170..786936a 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -287,7 +287,7 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button,
 		return;
 
 	gladefile = g_build_filename (
-		EVOLUTION_GLADEDIR, "mail-dialogs.glade", NULL);
+		EVOLUTION_UIDIR, "mail-dialogs.glade", NULL);
 	xml = glade_xml_new (gladefile, "message_security_dialog", NULL);
 	g_free (gladefile);
 
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index 246aacd..b07c0e1 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -829,7 +829,7 @@ em_subscribe_editor_new(void)
 	se = g_malloc0(sizeof(*se));
 	g_queue_init (&se->stores);
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "mail-dialogs.glade",
 				      NULL);
 	xml = glade_xml_new (gladefile, "subscribe_dialog", NULL);
diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c
index 073a4c5..e038f52 100644
--- a/mail/em-vfolder-editor.c
+++ b/mail/em-vfolder-editor.c
@@ -119,7 +119,7 @@ em_vfolder_editor_new (EMVFolderContext *vc)
 	ve = g_object_new (EM_TYPE_VFOLDER_EDITOR, NULL);
 
 	gladefile = g_build_filename (
-		EVOLUTION_GLADEDIR, "filter.glade", NULL);
+		EVOLUTION_UIDIR, "filter.glade", NULL);
 	gui = glade_xml_new (gladefile, "rule_editor", NULL);
 	g_free (gladefile);
 
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index a91a554..ada89d0 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -628,7 +628,7 @@ get_widget(EFilterRule *fr, ERuleContext *rc)
 	data->rc = rc;
 	data->vr = vr;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "mail-dialogs.glade",
 				      NULL);
 	gui = glade_xml_new(gladefile, "vfolder_source_frame", NULL);
diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index d52d074..557c822 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -273,7 +273,7 @@ construct (MessageTagEditor *editor)
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (editor)->vbox), 0);
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (editor)->action_area), 12);
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "mail-dialogs.glade",
 				      NULL);
 	gui = glade_xml_new (gladefile, "followup_editor", NULL);
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c
index ba4ecd7..460f9de 100644
--- a/modules/addressbook/addressbook-config.c
+++ b/modules/addressbook/addressbook-config.c
@@ -414,7 +414,7 @@ query_for_supported_bases (GtkWidget *button, AddressbookSourceDialog *sdialog)
 	GtkTreeIter iter;
 	gchar *gladefile;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      GLADE_FILE_NAME,
 				      NULL);
 	gui = glade_xml_new (gladefile, "supported-bases-dialog", NULL);
@@ -589,7 +589,7 @@ eabc_general_name(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *
 	if (old)
 		return old;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      GLADE_FILE_NAME,
 				      NULL);
 	gui = glade_xml_new (gladefile, item->label, NULL);
@@ -760,7 +760,7 @@ eabc_general_host(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *
 	if (!source_group_is_remote(sdialog->source_group))
 		return NULL;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      GLADE_FILE_NAME,
 				      NULL);
 	gui = glade_xml_new (gladefile, item->label, NULL);
@@ -847,7 +847,7 @@ eabc_general_auth(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *
 	if (!source_group_is_remote(sdialog->source_group))
 		return NULL;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      GLADE_FILE_NAME,
 				      NULL);
 	gui = glade_xml_new (gladefile, item->label, NULL);
@@ -917,7 +917,7 @@ eabc_details_search(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 	if (!source_group_is_remote(sdialog->source_group))
 		return NULL;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      GLADE_FILE_NAME,
 				      NULL);
 	gui = glade_xml_new (gladefile, item->label, NULL);
@@ -1010,7 +1010,7 @@ eabc_details_limit(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 	if (!source_group_is_remote(sdialog->source_group))
 		return NULL;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      GLADE_FILE_NAME,
 				      NULL);
 	gui = glade_xml_new (gladefile, item->label, NULL);
@@ -1200,7 +1200,7 @@ addressbook_config_edit_source (GtkWidget *parent, ESource *source)
 	gchar *xml;
 	gchar *gladefile;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      GLADE_FILE_NAME,
 				      NULL);
 	sdialog->gui = glade_xml_new (gladefile, "account-editor-notebook", NULL);
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index ac3c663..37fe3b1 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -379,7 +379,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 	client = mail_config_get_gconf_client ();
 	shell_settings = e_shell_get_shell_settings (shell);
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "mail-config.glade",
 				      NULL);
 	gui = glade_xml_new (gladefile, "composer_toplevel", NULL);
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 04f9d17..f92ff4d 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -831,7 +831,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 
 	shell_settings = e_shell_get_shell_settings (shell);
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "mail-config.glade",
 				      NULL);
 	gui = glade_xml_new (gladefile, "preferences_toplevel", NULL);
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index 4eafef4..4e4ce83 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -305,7 +305,7 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 
 	prefs->gconf = mail_config_get_gconf_client ();
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "mail-config.glade",
 				      NULL);
 	gui = glade_xml_new (gladefile, "network_preferences_toplevel", NULL);
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index e7b1f9d..d42732d 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -229,7 +229,7 @@ epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent)
 	priv = mch->priv;
 	epech_get_header_list (mch);
 
-	filename = g_build_filename (EVOLUTION_GLADEDIR,
+	filename = g_build_filename (EVOLUTION_UIDIR,
 			"org-gnome-email-custom-header.glade",
 			NULL);
 	priv->xml = glade_xml_new (filename, NULL, NULL);
@@ -886,7 +886,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 
 	gchar *gladefile;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 			"email-custom-header.glade",
 			NULL);
 	cd->xml = glade_xml_new (gladefile, "ech_configuration_box", NULL);
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index fd4e7e9..9c49cf0 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -372,7 +372,7 @@ junk_settings_construct (JunkSettings *js)
 	GladeXML *xml;
 	gchar *gladefile;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "junk-settings.glade",
 				      NULL);
 	xml = glade_xml_new (gladefile, ROOTNODE, NULL);
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index ea57051..452d7f5 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -509,7 +509,7 @@ gw_proxy_login_cb (GtkAction *action, EShellView *shell_view)
 	pld = proxy_login_new();
 	priv = pld->priv;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "proxy-login-dialog.glade",
 				      NULL);
 	priv->xml = glade_xml_new (gladefile, NULL, NULL);
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 16e639b..82746c3 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -656,7 +656,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 		g_object_set_data_full ((GObject *) account, "prd", prd, (GDestroyNotify) g_object_unref);
 		priv = prd->priv;
 
-		gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+		gladefile = g_build_filename (EVOLUTION_UIDIR,
 					      "proxy-listing.glade",
 					      NULL);
 		priv->xml_tab = glade_xml_new (gladefile, "proxy_vbox", NULL);
@@ -905,7 +905,7 @@ proxy_add_account (GtkWidget *button, EAccount *account)
 	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "proxy-add-dialog.glade",
 				      NULL);
 	priv->xml = glade_xml_new (gladefile, NULL, NULL);
@@ -1015,7 +1015,7 @@ proxy_edit_account (GtkWidget *button, EAccount *account)
 		account_mailid = g_strrstr (account_mailid, "\n") + 1;
 		edited = proxy_get_item_from_list (account, account_mailid);
 		if (edited) {
-			gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+			gladefile = g_build_filename (EVOLUTION_UIDIR,
 						      "proxy-add-dialog.glade",
 						      NULL);
 			priv->xml = glade_xml_new (gladefile, NULL, NULL);
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index ff9e1ea..3594a2e 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -512,7 +512,7 @@ notification_clicked(GtkButton *button, ShareFolder *sf)
 	sf->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_type_hint (GTK_WINDOW (sf->window), GDK_WINDOW_TYPE_HINT_DIALOG);
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "properties.glade",
 				      NULL);
 	xmln = glade_xml_new (gladefile, NROOTNODE , NULL);
@@ -678,7 +678,7 @@ share_folder_construct (ShareFolder *sf)
 	GtkWidget *box;
 	gchar *gladefile;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "properties.glade",
 				      NULL);
 	xml = glade_xml_new (gladefile, ROOTNODE, NULL);
diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c
index 309fb5d..1e94958 100644
--- a/plugins/imap-features/imap-headers.c
+++ b/plugins/imap-features/imap-headers.c
@@ -273,7 +273,7 @@ org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data)
 	if (!g_str_has_prefix (account->source->url, "imap://") && !(use_imap && g_str_has_prefix (account->source->url, "groupwise://")))
 		return NULL;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR, "imap-headers.glade", NULL);
+	gladefile = g_build_filename (EVOLUTION_UIDIR, "imap-headers.glade", NULL);
 	gladexml = glade_xml_new (gladefile, "vbox2", NULL);
 	g_free (gladefile);
 
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index 353fd54..1634f89 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -700,7 +700,7 @@ publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data)
 	GConfClient *client;
 	gchar *gladefile;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "publish-calendar.glade",
 				      NULL);
 	xml = glade_xml_new (gladefile, "toplevel", NULL);
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index c4fad2a..559a055 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -335,7 +335,7 @@ url_editor_dialog_construct (UrlEditorDialog *dialog)
 
 	gconf = gconf_client_get_default ();
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      "publish-calendar.glade",
 				      NULL);
 	gui = glade_xml_new (gladefile, "publishing toplevel", NULL);
diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c
index 365c0ba..664c1f2 100644
--- a/smime/gui/ca-trust-dialog.c
+++ b/smime/gui/ca-trust-dialog.c
@@ -79,7 +79,7 @@ ca_trust_dialog_show (ECert *cert, gboolean importing)
 
 	ctd_data = g_new0 (CATrustDialogData, 1);
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      GLADE_FILE_NAME,
 				      NULL);
 	ctd_data->gui = glade_xml_new (gladefile, NULL, NULL);
diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c
index 2e2c411..03c3ce6 100644
--- a/smime/gui/cert-trust-dialog.c
+++ b/smime/gui/cert-trust-dialog.c
@@ -119,7 +119,7 @@ cert_trust_dialog_show (ECert *cert)
 
 	ctd_data = g_new0 (CertTrustDialogData, 1);
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      GLADE_FILE_NAME,
 				      NULL);
 	ctd_data->gui = glade_xml_new (gladefile, NULL, NULL);
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index bb70269..d4ce9df 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -1002,7 +1002,7 @@ certificate_manager_config_init (EShell *shell)
 
 	cfm_data = g_new0 (CertificateManagerData, 1);
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      GLADE_FILE_NAME,
 				      NULL);
 	cfm_data->gui = glade_xml_new (gladefile, NULL, NULL);
diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c
index 75b61a6..1733c74 100644
--- a/smime/gui/certificate-viewer.c
+++ b/smime/gui/certificate-viewer.c
@@ -323,7 +323,7 @@ certificate_viewer_show (ECert *cert)
 
 	cvm_data = g_new0 (CertificateViewerData, 1);
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename (EVOLUTION_UIDIR,
 				      GLADE_FILE_NAME,
 				      NULL);
 	cvm_data->gui = glade_xml_new (gladefile, NULL, NULL);
diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c
index 1268e3b..5676244 100644
--- a/smime/gui/e-cert-selector.c
+++ b/smime/gui/e-cert-selector.c
@@ -154,7 +154,7 @@ e_cert_selector_new(gint type, const gchar *currentid)
 	ecs = g_object_new(e_cert_selector_get_type(), NULL);
 	p = ecs->priv;
 
-	gladefile = g_build_filename(EVOLUTION_GLADEDIR,
+	gladefile = g_build_filename(EVOLUTION_UIDIR,
 				     "smime-ui.glade",
 				     NULL);
 	gui = glade_xml_new(gladefile, "cert_selector_vbox", NULL);
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index b89be37..3ed9628 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -269,7 +269,7 @@ e_timezone_dialog_construct (ETimezoneDialog *etd)
 
 	/* Load the content widgets */
 
-	filename = g_build_filename (EVOLUTION_GLADEDIR,
+	filename = g_build_filename (EVOLUTION_UIDIR,
 				     "e-timezone-dialog.glade",
 				     NULL);
 	priv->xml = glade_xml_new (filename, NULL, NULL);
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
index 148960e..c217a10 100644
--- a/widgets/menus/gal-define-views-dialog.c
+++ b/widgets/menus/gal-define-views-dialog.c
@@ -241,7 +241,7 @@ gal_define_views_dialog_init (GalDefineViewsDialog *dialog)
 	GladeXML *gui;
 	GtkWidget *widget;
 
-	gchar *filename = g_build_filename (EVOLUTION_GLADEDIR,
+	gchar *filename = g_build_filename (EVOLUTION_UIDIR,
 					    "gal-define-views.glade",
 					    NULL);
 
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c
index 7687159..9ad2654 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.c
+++ b/widgets/menus/gal-view-instance-save-as-dialog.c
@@ -232,7 +232,7 @@ gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog)
 	GladeXML *gui;
 	GtkWidget *widget;
 
-	gchar *filename = g_build_filename (EVOLUTION_GLADEDIR,
+	gchar *filename = g_build_filename (EVOLUTION_UIDIR,
 					    "gal-view-instance-save-as-dialog.glade",
 					    NULL);
 
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
index da90fb0..ed1a168 100644
--- a/widgets/menus/gal-view-new-dialog.c
+++ b/widgets/menus/gal-view-new-dialog.c
@@ -76,7 +76,7 @@ gal_view_new_dialog_init (GalViewNewDialog *dialog)
 {
 	GladeXML *gui;
 	GtkWidget *widget;
-	gchar *filename = g_build_filename (EVOLUTION_GLADEDIR,
+	gchar *filename = g_build_filename (EVOLUTION_UIDIR,
 					    "gal-view-new-dialog.glade",
 					    NULL);
 
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index 8043649..b2f0c5f 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -619,7 +619,7 @@ e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type
 
 	priv = sod->priv;
 
-	filename = g_build_filename (EVOLUTION_GLADEDIR,
+	filename = g_build_filename (EVOLUTION_UIDIR,
 				     "e-send-options.glade",
 				     NULL);
 	priv->xml = glade_xml_new (filename, NULL, NULL);
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 2950451..2a2730b 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -1200,7 +1200,7 @@ setup_gui (ETableConfig *config)
 	create_global_store (config);
 
 	can_group = e_table_sort_info_get_can_group (config->state->sort_info);
-	filename = g_build_filename (EVOLUTION_GLADEDIR,
+	filename = g_build_filename (EVOLUTION_UIDIR,
 					  "e-table-config.glade",
 					  NULL);
 	gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE);
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index 231ad08..16f695e 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -140,7 +140,7 @@ e_table_field_chooser_init (ETableFieldChooser *etfc)
 {
 	GladeXML *gui;
 	GtkWidget *widget;
-	gchar *filename = g_build_filename (EVOLUTION_GLADEDIR,
+	gchar *filename = g_build_filename (EVOLUTION_UIDIR,
 					    "e-table-field-chooser.glade",
 					    NULL);
 	gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]