gui/calendar-commands.c gui/e-cal-list-view.c gui/e-calendar-table.c

2005-11-26  Tor Lillqvist  <tml@novell.com>

	* gui/calendar-commands.c
	* gui/e-cal-list-view.c
	* gui/e-calendar-table.c
	* gui/e-memo-table.c
	* gui/e-memos.c
	* gui/e-tasks.c
	* gui/gnome-cal.c
	* gui/goto.c
	* gui/memos-control.c
	* gui/tasks-control.c
	* gui/alarm-notify/alarm-notify-dialog.c
	* gui/alarm-notify/notify-main.c
	* gui/dialogs/alarm-dialog.c
	* gui/dialogs/alarm-list-dialog.c
	* gui/dialogs/cal-attachment.c
	* gui/dialogs/cal-prefs-dialog.c
	* gui/dialogs/comp-editor.c
	* gui/dialogs/e-delegate-dialog.c
	* gui/dialogs/event-editor.c
	* gui/dialogs/meeting-page.c
	* gui/dialogs/memo-page.c
	* gui/dialogs/recurrence-page.c
	* gui/dialogs/schedule-page.c
	* gui/dialogs/task-details-page.c
	* gui/dialogs/task-page.c
	* gui/dialogs/url-editor-dialog.c: Include e-util-private.h to get
	redefinition of compile-time pathnames as calls to functions on
	Windows. Construct the pathnames of files and directories under
	the installation prefix at run-time to enable install-anywhere on
	Windows. No effect on functionality on Unix.

svn path=/trunk/; revision=30679

14 files changed, 113 insertions, 25 deletions

diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 4712d3f7ef..e730b00065 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -51,6 +51,7 @@
 #include <libecal/e-cal-time-util.h>
 #include "e-util/e-dialog-widgets.h"
 #include "e-util/e-icon-factory.h"
+#include "e-util/e-util-private.h"
 #include <libebook/e-destination.h>
 #include <libedataserverui/e-name-selector.h>
 #include "../calendar-config.h"
@@ -910,13 +911,18 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm)
 	Dialog dialog;
 	int response_id;
 	GList *icon_list;
+	char *gladefile;
 	
 	g_return_val_if_fail (alarm != NULL, FALSE);
 
 	dialog.alarm = alarm;
 	dialog.ecal = ecal;
 	
-	dialog.xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-dialog.glade", NULL, NULL);
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      "alarm-dialog.glade",
+				      NULL);
+	dialog.xml = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
 	if (!dialog.xml) {
 		g_message (G_STRLOC ": Could not load the Glade XML file!");
 		return FALSE;
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 32dfa76a4f..01ef06abfe 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -44,6 +44,7 @@
 #include <libecal/e-cal-time-util.h>
 #include "e-util/e-dialog-widgets.h"
 #include "e-util/e-icon-factory.h"
+#include "e-util/e-util-private.h"
 #include "alarm-dialog.h"
 #include "alarm-list-dialog.h"
 
@@ -218,11 +219,17 @@ alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store)
 	Dialog dialog;
 	int response_id;
 	GList *icon_list;
+	char *gladefile;
 	
 	dialog.ecal = ecal;
 	dialog.list_store = list_store;	
 
-	dialog.xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-list-dialog.glade", NULL, NULL);
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      "alarm-list-dialog.glade",
+				      NULL);
+	dialog.xml = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
+
 	if (!dialog.xml) {
 		g_message (G_STRLOC ": Could not load the Glade XML file!");
 		return FALSE;
diff --git a/calendar/gui/dialogs/cal-attachment.c b/calendar/gui/dialogs/cal-attachment.c
index f9ecb9f329..db97973ad6 100644
--- a/calendar/gui/dialogs/cal-attachment.c
+++ b/calendar/gui/dialogs/cal-attachment.c
@@ -40,6 +40,7 @@
 #include <libgnome/gnome-i18n.h>
 
 #include "e-util/e-mktemp.h"
+#include "e-util/e-util-private.h"
 #include <camel/camel.h>
 
 #include "comp-editor.h"
@@ -565,6 +566,7 @@ cal_attachment_edit (CalAttachment *attachment, GtkWidget *parent)
 	DialogData *dialog_data;
 	GladeXML *editor_gui;
 	char *type;
+	char *xmlfile;
 	
 	g_return_if_fail (attachment != NULL);
 	g_return_if_fail (E_IS_CAL_ATTACHMENT (attachment));
@@ -578,8 +580,12 @@ cal_attachment_edit (CalAttachment *attachment, GtkWidget *parent)
 		return;
 	}
 	
-	editor_gui = glade_xml_new (EVOLUTION_GLADEDIR "/cal-attachment.glade",
-				    NULL, NULL);
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      "cal-attachment.glade",
+				      NULL);
+	editor_gui = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
+
 	if (editor_gui == NULL) {
 		g_warning ("Cannot load `cal-attachment.glade'");
 		return;
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 94eae52a37..7a2222a9bd 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -47,6 +47,7 @@
 #include <libgnomeui/gnome-color-picker.h>
 #include <glade/glade.h>
 #include <e-util/e-dialog-widgets.h>
+#include <e-util/e-util-private.h>
 #include <misc/e-dateedit.h>
 
 
@@ -104,12 +105,18 @@ cal_prefs_dialog_new (void)
 {
 	DialogData *dialog_data;
 	EvolutionConfigControl *config_control;
+	char *gladefile;
 
 	dialog_data = g_new0 (DialogData, 1);
 
 	/* Load the content widgets */
 
-	dialog_data->xml = glade_xml_new (EVOLUTION_GLADEDIR "/cal-prefs-dialog.glade", NULL, NULL);
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      "cal-prefs-dialog.glade",
+				      NULL);
+	dialog_data->xml = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
+
 	if (!dialog_data->xml) {
 		g_message ("cal_prefs_dialog_construct(): Could not load the Glade XML file!");
 		return NULL;
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index b1e9f69f84..86c8116bdb 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -42,6 +42,7 @@
 #include <libgnomeui/gnome-messagebox.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-icon-factory.h>
+#include <e-util/e-util-private.h>
 #include <evolution-shell-component-utils.h>
 
 #include <camel/camel-url.h>
@@ -1400,6 +1401,7 @@ comp_editor_init (CompEditor *editor)
 {
 	CompEditorPrivate *priv;
 	BonoboUIContainer *container;
+	char *xmlfile;
 
 	priv = g_new0 (CompEditorPrivate, 1);
 	editor->priv = priv;
@@ -1425,9 +1427,14 @@ comp_editor_init (CompEditor *editor)
 
 	bonobo_ui_component_freeze (editor->uic, NULL);
 
+	xmlfile = g_build_filename (EVOLUTION_UIDIR,
+				    "evolution-editor.xml",
+				    NULL);
 	bonobo_ui_util_set_ui (editor->uic, PREFIX,
-			       EVOLUTION_UIDIR "/evolution-editor.xml",
+			       xmlfile,
 			       "evolution-editor", NULL);
+	g_free (xmlfile);
+
 	e_pixmaps_update (editor->uic, pixmaps);
 	bonobo_ui_component_thaw (editor->uic, NULL);
 
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index f1fcf790d9..657d0fa6c5 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -33,6 +33,7 @@
 #include <misc/e-map.h>
 #include <libebook/e-destination.h>
 #include <libedataserverui/e-name-selector.h>
+#include "e-util/e-util-private.h"
 #include "e-delegate-dialog.h"
 
 struct _EDelegateDialogPrivate {
@@ -123,6 +124,7 @@ e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char
 	EDestination *dest;
 	ENameSelectorModel *name_selector_model;
 	ENameSelectorDialog *name_selector_dialog;
+	char *gladefile;
 
 	g_return_val_if_fail (edd != NULL, NULL);
 	g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);
@@ -131,8 +133,12 @@ e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char
 
 	/* Load the content widgets */
 
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/e-delegate-dialog.glade",
-				   NULL, NULL);
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      "e-delegate-dialog.glade",
+				      NULL);
+	priv->xml = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
+
 	if (!priv->xml) {
 		g_message ("e_delegate_dialog_construct(): Could not load the Glade XML file!");
 		goto error;
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index d686ab0b03..91faa0cdd3 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -32,6 +32,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <misc/e-dateedit.h>
 #include <e-util/e-icon-factory.h>
+#include <e-util/e-util-private.h>
 #include <evolution-shell-component-utils.h>
 #include "event-page.h"
 #include "recurrence-page.h"
@@ -395,6 +396,7 @@ event_editor_init (EventEditor *ee)
 	EventEditorPrivate *priv;
 	CompEditor *editor = COMP_EDITOR(ee);
 	gboolean status;
+	char *xmlfile;
 
 	priv = g_new0 (EventEditorPrivate, 1);
 	ee->priv = priv;
@@ -408,9 +410,13 @@ event_editor_init (EventEditor *ee)
 
 	bonobo_ui_component_add_verb_list_with_data (editor->uic, verbs, ee);
 
+	xmlfile = g_build_filename (EVOLUTION_UIDIR,
+				    "evolution-event-editor.xml",
+				    NULL);
 	bonobo_ui_util_set_ui (editor->uic, PREFIX,
-			       EVOLUTION_UIDIR "/evolution-event-editor.xml",
+			       xmlfile,
 			       "evolution-event-editor", NULL);
+	g_free (xmlfile);
 
 	/* Hide send options */
 	bonobo_ui_component_set_prop (
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index 0b31e474ab..0911bb26ea 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -41,6 +41,7 @@
 #include <misc/e-dateedit.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-dialog-widgets.h>
+#include <e-util/e-util-private.h>
 
 #include "../calendar-component.h"
 #include "../e-meeting-attendee.h"
@@ -672,7 +673,7 @@ existing_attendee (EMeetingAttendee *ia, ECalComponent *comp)
 		const char *address;
 		
 		address = itip_strip_mailto (attendee->value);
-		if (address && !g_strcasecmp (ia_address, address)) {
+		if (address && !g_ascii_strcasecmp (ia_address, address)) {
 			e_cal_component_free_attendee_list (attendees);
 			return TRUE;
 		}
@@ -1035,11 +1036,16 @@ meeting_page_construct (MeetingPage *mpage, EMeetingStore *ems,
 	GtkWidget *sw;
 	EAccount *a;
 	GtkTreeSelection *selection;
+	char *gladefile;
 	
 	priv = mpage->priv;
 
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR 
-				   "/meeting-page.glade", NULL, NULL);
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR, 
+				      "meeting-page.glade",
+				      NULL);
+	priv->xml = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
+
 	if (!priv->xml) {
 		g_message (G_STRLOC ": Could not load the Glade XML file!");
 		return NULL;
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 0a2644b699..c7682f13f9 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -41,6 +41,7 @@
 #include "common/authentication.h"
 #include "e-util/e-dialog-widgets.h"
 #include "e-util/e-categories-config.h"
+#include "e-util/e-util-private.h"
 #include "../calendar-config.h"
 #include "comp-editor.h"
 #include "comp-editor-util.h"
@@ -550,11 +551,16 @@ MemoPage *
 memo_page_construct (MemoPage *tpage)
 {
 	MemoPagePrivate *priv;
+	char *gladefile;
 
 	priv = tpage->priv;
 
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/memo-page.glade",
-				   NULL, NULL);
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      "memo-page.glade",
+				      NULL);
+	priv->xml = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
+
 	if (!priv->xml) {
 		g_message ("memo_page_construct(): "
 			   "Could not load the Glade XML file!");
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 5d53e50433..2ec7145dcf 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -43,6 +43,7 @@
 #include <glade/glade.h>
 #include <libedataserver/e-time-utils.h>
 #include <e-util/e-dialog-widgets.h>
+#include <e-util/e-util-private.h>
 #include <misc/e-dateedit.h>
 #include <libecal/e-cal-recur.h>
 #include <libecal/e-cal-time-util.h>
@@ -2355,11 +2356,16 @@ RecurrencePage *
 recurrence_page_construct (RecurrencePage *rpage)
 {
 	RecurrencePagePrivate *priv;
+	char *gladefile;
 
 	priv = rpage->priv;
 
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR 
-				   "/recurrence-page.glade", NULL, NULL);
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      "recurrence-page.glade",
+				      NULL);
+	priv->xml = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
+
 	if (!priv->xml) {
 		g_message ("recurrence_page_construct(): "
 			   "Could not load the Glade XML file!");
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 9b0e0a0ee9..42141f296c 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -34,6 +34,7 @@
 #include <libgnomeui/gnome-dialog-util.h>
 #include <glade/glade.h>
 #include <e-util/e-dialog-widgets.h>
+#include <e-util/e-util-private.h>
 #include <misc/e-dateedit.h>
 #include "../calendar-config.h"
 #include "../e-meeting-time-sel.h"
@@ -408,11 +409,16 @@ SchedulePage *
 schedule_page_construct (SchedulePage *spage, EMeetingStore *ems)
 {
 	SchedulePagePrivate *priv;
+	char *gladefile;
 	
 	priv = spage->priv;
 
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR 
-				   "/schedule-page.glade", NULL, NULL);
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      "schedule-page.glade",
+				      NULL);
+	priv->xml = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
+
 	if (!priv->xml) {
 		g_message ("schedule_page_construct(): "
 			   "Could not load the Glade XML file!");
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 01b0c3e0f2..d8449db72d 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -32,6 +32,7 @@
 #include <misc/e-dateedit.h>
 #include <misc/e-url-entry.h>
 #include "e-util/e-dialog-widgets.h"
+#include "e-util/e-util-private.h"
 #include "../calendar-config.h"
 #include "../e-timezone-entry.h"
 #include "comp-editor-util.h"
@@ -768,11 +769,16 @@ TaskDetailsPage *
 task_details_page_construct (TaskDetailsPage *tdpage)
 {
 	TaskDetailsPagePrivate *priv;
+	char *gladefile;
 
 	priv = tdpage->priv;
 
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR 
-				   "/task-details-page.glade", NULL, NULL);
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      "task-details-page.glade",
+				      NULL);
+	priv->xml = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
+
 	if (!priv->xml) {
 		g_message ("task_details_page_construct(): "
 			   "Could not load the Glade XML file!");
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 3d4cb500b6..155d391de9 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -42,6 +42,7 @@
 #include "e-util/e-popup.h"
 #include "e-util/e-dialog-widgets.h"
 #include "e-util/e-categories-config.h"
+#include "e-util/e-util-private.h"
 #include "../e-timezone-entry.h"
 #include "../calendar-config.h"
 #include "comp-editor.h"
@@ -1784,14 +1785,19 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client)
 	EAccount *def_account;
 	GList *address_strings = NULL, *l;
 	EAccount *a;
+	char *gladefile;
 	
 	priv = tpage->priv;
 	g_object_ref (model);
 	priv->model = model;
 	priv->client = client;
 
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/task-page.glade",
-				   NULL, NULL);
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      "task-page.glade",
+				      NULL);
+	priv->xml = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
+
 	if (!priv->xml) {
 		g_message ("task_page_construct(): "
 			   "Could not load the Glade XML file!");
diff --git a/calendar/gui/dialogs/url-editor-dialog.c b/calendar/gui/dialogs/url-editor-dialog.c
index 5e29af48de..e7759955fe 100644
--- a/calendar/gui/dialogs/url-editor-dialog.c
+++ b/calendar/gui/dialogs/url-editor-dialog.c
@@ -43,6 +43,7 @@
 #include <glade/glade.h>
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-icon-factory.h>
+#include <e-util/e-util-private.h>
 #include <misc/e-dateedit.h>
 #include <stdlib.h>
 #include <string.h>
@@ -66,9 +67,15 @@ gboolean
 url_editor_dialog_new (DialogData *dialog_data, EPublishUri *uri)
 {
 	int b;
-
+	char *gladefile;
 	UrlDialogData *url_dlg_data = g_new0 (UrlDialogData, 1);
-	url_dlg_data->xml = glade_xml_new (EVOLUTION_GLADEDIR "/url-editor-dialog.glade", NULL, NULL);
+
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      "url-editor-dialog.glade",
+				      NULL);
+	url_dlg_data->xml = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
+
 	if (!url_dlg_data->xml) {
 		g_message ("url_editor_dialog_construct(): Could not load the Glade XML file!");
 		return FALSE;
@@ -365,7 +372,7 @@ url_editor_dialog_fb_url_changed (GtkEntry *url_entry, void *data)
 				    URL_LIST_LOCATION_COLUMN, &url_name, 
 				    -1);
 
-		if (!strcasecmp (url_name, entry_contents)) {
+		if (!g_ascii_strcasecmp (url_name, entry_contents)) {
 			gtk_widget_set_sensitive ((GtkWidget *) url_dlg_data->ok, FALSE);
 			return;
 		}