From c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Mon, 12 Jan 2009 04:12:01 +0000
Subject: Merge revisions 36866:37046 from trunk.

svn path=/branches/kill-bonobo/; revision=37050
---
 shell/ChangeLog              | 47 ++++++++++++++++++++++++++++++++++++++++++++
 shell/importer/intelligent.c |  1 -
 shell/main.c                 |  3 ++-
 3 files changed, 49 insertions(+), 2 deletions(-)

(limited to 'shell')

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 05f0b2399c..ec2a0ca6aa 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,50 @@
+2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
+
+	* e-shell-window-commands.c (command_open_faq):
+	Call e_show_uri() instead of gnome_url_show().
+
+2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	* e-shell.c:
+	* evolution-shell-component-utils.c:
+	* importer/intelligent.c:
+	* main.c:
+	Remove unneeded #include <libgnome/gnome-util.h>.
+
+2009-01-09  Takao Fujiwara  <takao.fujiwara@sun.com>
+
+	Reviewed by Matthew Barnes  <mbarnes@redhat.com>
+
+	* Fix for bug #566011
+
+	* e-user-creatable-items-handler.c
+	(e_user_creatable_items_handler_class_ini):
+	Include <glib/gi18n-lib.h> instead of <glib/gi18n.h> and
+	add bindtextdomain().
+
+2009-01-01  Andre Klapper  <a9016009@gmx.de>
+
+	* e-shell-window-commands.c:
+	update Copyright to 2009.
+
+2008-12-28  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Related to bug #562155
+
+	* main.c (idle_cb):
+	Only call e_shell_set_crash_recovery() if the EShell Bonobo object
+	was constructed successfully, otherwise it will be NULL.  This fixes
+	a warning shown in the terminal output of bug #562155, but the bug
+	is not reproducible so it's not clear whether this fixes the bug.
+
+2008-12-14  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #564416
+
+	* e-shell-nm.c:
+	We've been listening for obsolete D-Bus signals.
+	Update to NetworkManager's current D-Bus API.
+
 2008-12-10  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #563250
diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c
index c7cb6b3b0c..6503fc8ad6 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.c
@@ -29,7 +29,6 @@
 #include <gtk/gtk.h>
 
 #include <libgnome/gnome-config.h>
-/*#include <libgnome/gnome-util.h>*/
 #include <glib/gi18n.h>
 
 #include <bonobo/bonobo-object.h>
diff --git a/shell/main.c b/shell/main.c
index 3c51bc1c46..b57ef0777d 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -49,7 +49,6 @@
 #include <gconf/gconf-client.h>
 
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
 #include <libgnome/gnome-sound.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <libgnomeui/gnome-client.h>
@@ -456,6 +455,8 @@ set_paths (void)
 		g_warning ("Could not set PATH for Evolution and its child processes");
 
 	g_free (path);
+	g_free (exe_folder_utf8);
+	g_free (components_folder_utf8);
 
 	g_free (top_folder_utf8);
 }
-- 
cgit v1.2.3