Set the folder bar message here.

2001-08-19  Christopher James Lahey  <clahey@ximian.com>

	* gui/component/addressbook.c (set_folder_bar_label),
	gui/widgets/e-addressbook-model.c,
	gui/widgets/e-addressbook-model.h (update_folder_bar_message),
	gui/widgets/e-addressbook-view.c, gui/widgets/e-addressbook-view.h
	(folder_bar_message): Set the folder bar message here.

	* gui/component/select-names/e-select-names-model.c (SEPLEN): Use
	strlen(SEPARATOR) here so that if the separator changes the length
	will work properly.

svn path=/trunk/; revision=12220

2 files changed, 45 insertions, 1 deletions

diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index a6f0dfc2a5..5e8b523a5a 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -18,6 +18,7 @@
 #include <libgnomeui/gnome-uidefs.h>
 #include <bonobo/bonobo-generic-factory.h>
 #include <bonobo/bonobo-ui-util.h>
+#include <bonobo/bonobo-exception.h>
 #include <gal/util/e-util.h>
 #include <gal/widgets/e-unicode.h>
 
@@ -40,6 +41,8 @@
 #include <widgets/misc/e-search-bar.h>
 #include <widgets/misc/e-filter-bar.h>
 
+#define d(x)
+
 #define PROPERTY_FOLDER_URI          "folder_uri"
 
 #define PROPERTY_FOLDER_URI_IDX      1
@@ -791,6 +794,42 @@ set_status_message (EAddressbookView *eav, const char *message, AddressbookView
 	CORBA_exception_free (&ev);
 }
 
+static void
+set_folder_bar_label (EAddressbookView *eav, const char *message, AddressbookView *view)
+{
+	CORBA_Environment ev;
+	GNOME_Evolution_ShellView shell_view_interface;
+
+	CORBA_exception_init (&ev);
+
+	shell_view_interface = retrieve_shell_view_interface_from_control (view->control);
+	if (!shell_view_interface) {
+		CORBA_exception_free (&ev);
+		return;
+	}
+
+	d(g_message("Updating via ShellView"));
+
+	if (message == NULL || message[0] == 0) {
+		GNOME_Evolution_ShellView_setFolderBarLabel (shell_view_interface,
+							     "",
+							     &ev);
+	}
+	else {
+		GNOME_Evolution_ShellView_setFolderBarLabel (shell_view_interface,
+							     message,
+							     &ev);
+	}
+
+	if (BONOBO_EX (&ev))
+		g_warning ("Exception in label update: %s",
+			   bonobo_exception_get_text (&ev));
+
+	CORBA_exception_free (&ev);
+}
+
+
+
 BonoboControl *
 addressbook_factory_new_control (void)
 {
@@ -873,6 +912,11 @@ addressbook_factory_new_control (void)
 			    view);
 
 	gtk_signal_connect (GTK_OBJECT (view->view),
+			    "folder_bar_message",
+			    GTK_SIGNAL_FUNC(set_folder_bar_label),
+			    view);
+
+	gtk_signal_connect (GTK_OBJECT (view->view),
 			    "command_state_change",
 			    GTK_SIGNAL_FUNC(update_command_state),
 			    view);
diff --git a/addressbook/gui/component/select-names/e-select-names-model.c b/addressbook/gui/component/select-names/e-select-names-model.c
index 9dda927640..6e0482ade3 100644
--- a/addressbook/gui/component/select-names/e-select-names-model.c
+++ b/addressbook/gui/component/select-names/e-select-names-model.c
@@ -21,7 +21,7 @@
 #include "addressbook/backend/ebook/e-card-simple.h"
 
 #define SEPARATOR ", "
-#define SEPLEN    2
+#define SEPLEN    (strlen(SEPARATOR))
 
 
 enum {