Search for ui files in the share dir

2003-05-03  Marco Pesenti Gritti  <marco@it.gnome.org>

	* src/ephy-nautilus-view.c: (ephy_nautilus_view_instance_init),
	(gnv_bonobo_control_activate_cb):

	Search for ui files in the share dir

	* src/statusbar.c: (statusbar_set_message):

	Strip \n \r from messages

	* src/toolbar.c:

	Allow reorder of bookmarks

1 files changed, 10 insertions, 1 deletions

diff --git a/src/statusbar.c b/src/statusbar.c
index 8ff6b4402..71a97274d 100755
--- a/src/statusbar.c
+++ b/src/statusbar.c
@@ -18,6 +18,7 @@
 
 #include "statusbar.h"
 #include "ephy-stock-icons.h"
+#include "ephy-string.h"
 
 #include <string.h>
 #include <time.h>
@@ -196,9 +197,17 @@ void
 statusbar_set_message (Statusbar *s,
 		       const char *message)
 {
+	char *tmp1, *tmp2;
+
 	g_return_if_fail (message != NULL);
 
+	tmp1 = ephy_str_strip_chr (message, '\r');
+	tmp2 = ephy_str_strip_chr (tmp1, '\n');
+
 	gtk_statusbar_pop (GTK_STATUSBAR (s), 0);
-	gtk_statusbar_push (GTK_STATUSBAR (s), 0, message);
+	gtk_statusbar_push (GTK_STATUSBAR (s), 0, tmp2);
+
+	g_free (tmp1);
+	g_free (tmp2);
 }