evolution r36587 - trunk/composer

[abharath svn gnome org]

Author: abharath
Date: Fri Oct 10 09:42:29 2008
New Revision: 36587
URL: http://svn.gnome.org/viewvc/evolution?rev=36587&view=rev

Log:
2008-10-10  Bharath Acharya  <abharath novell com>

        ** Fix for bug #555775

        * e-composer-private.c: (e_composer_private_init): Include 
        e-util-private.h for Win32 redefinition of EVOLUTION_UIDIR and
        build the filename using it.


Modified:
   trunk/composer/ChangeLog
   trunk/composer/e-composer-private.c

Modified: trunk/composer/e-composer-private.c
==============================================================================
--- trunk/composer/e-composer-private.c	(original)
+++ trunk/composer/e-composer-private.c	Fri Oct 10 09:42:29 2008
@@ -18,6 +18,7 @@
  */
 
 #include "e-composer-private.h"
+#include "e-util/e-util-private.h"
 
 static void
 composer_setup_charset_menu (EMsgComposer *composer)
@@ -118,7 +119,7 @@
 
 	e_composer_actions_init (composer);
 
-	filename = e_composer_find_data_file ("evolution-composer.ui");
+	filename = g_build_filename (EVOLUTION_UIDIR, "evolution-composer.ui", NULL);
 	gtk_ui_manager_add_ui_from_file (manager, filename, &error);
 	g_free (filename);