Install the shell executable as evolution-$(BASE_VERSION) using an

* Makefile.am: Install the shell executable as
evolution-$(BASE_VERSION) using an install-exec-local hack.  Also
put libeshell in $(privlibdir) instead of $(libdir).
(eshellincludedir): Version using $(BASE_VERSION).
(INCLUDES): Update for the new locations of things.
(etspecdir): Likewise.

* e-shell-view.c (e_shell_view_construct): Get evolution.xml from
EVOLUTION_UIDIR.

* importer/Makefile.am: Install libevolution-importer in
$(privlibdir) instead of $(libdir).
(INCLUDES): Updated for the new versioned paths.  Define
EVOLUTION_UIDIR.
(libevolution_importerincludedir): Version using $(BASE_VERSION).
(gladedir): Likewise.

* glade/Makefile.am (gladedir): Version using $(BASE_VERSION).

* e-setup.c (DEFAULT_USER_PATH): New #define.
(check_evolution_directory): Use it.
(copy_default_stuff): Likewise.  Also, remove old shortcuts.xml
removal cruft.

svn path=/trunk/; revision=19565

shell/e-shell-settings-dialog.c

@@ -68,8 +68,8 @@ set_dialog_size (EShellSettingsDialog *dialog)
 					     gtk_widget_get_style (GTK_WIDGET (dialog))->font_desc,
 					     pango_context_get_language (context));
 
-	pango_layout_get_pixel_size (layout,
-				     &width, NULL);
+	pango_layout_get_pixel_size (layout, &width, NULL);
+
 	width *= 72;
 	height = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics)
 			       + pango_font_metrics_get_descent (metrics)) * 35;