evolution-exchange r1652 - in trunk: . storage

[tml svn gnome org]

Author: tml
Date: Tue May 13 16:39:15 2008
New Revision: 1652
URL: http://svn.gnome.org/viewvc/evolution-exchange?rev=1652&view=rev

Log:
2008-05-13  Tor Lillqvist  <tml novell com>

	More outstanding Win32 portability changes from a couple of years
	ago.

	* storage/exchange-change-password.c: Construct glade file
	pathname at run-time. Don't use compile-time gladedir on Windows.



Modified:
   trunk/ChangeLog
   trunk/storage/exchange-change-password.c

Modified: trunk/storage/exchange-change-password.c
==============================================================================
--- trunk/storage/exchange-change-password.c	(original)
+++ trunk/storage/exchange-change-password.c	Tue May 13 16:39:15 2008
@@ -32,7 +32,15 @@
 #include <gtk/gtkentry.h>
 #include <gtk/gtklabel.h>
 
-#define FILENAME CONNECTOR_GLADEDIR "/exchange-change-password.glade"
+#include "exchange-storage.h"
+
+#ifdef G_OS_WIN32
+
+#undef CONNECTOR_GLADEDIR
+#define CONNECTOR_GLADEDIR _exchange_storage_gladedir
+
+#endif
+
 #define ROOTNODE "pass_dialog"
 #define STARTNODE "pass_vbox"
 
@@ -80,8 +88,13 @@
 	GtkResponseType response;
 	GtkLabel *top_label;
 	char *new_pass;
+	gchar *gladefile;
 
-	xml = glade_xml_new (FILENAME, ROOTNODE, NULL);
+	gladefile = g_build_filename (CONNECTOR_GLADEDIR,
+				      "exchange-change-password.glade",
+				      NULL);
+	xml = glade_xml_new (gladefile, ROOTNODE, NULL);
+	g_free (gladefile);
 	top_widget = glade_xml_get_widget (xml, ROOTNODE);
 
         cur_entry = GTK_ENTRY (glade_xml_get_widget (xml, "current_pass_entry"));