New function (probably should just be static).

2001-05-30  Jason Leach  <jleach@ximian.com>

	* e-shell-view.c (e_shell_view_set_current_shortcuts_group_num):
	New function (probably should just be static).
	(e_shell_view_load_settings): Load the current shortcut group here
	using the above new function.
	(e_shell_view_save_settings): Save current shortcut group in here.

2001-05-30  Jason Leach  <jleach@ximian.com>

	* e-shell-folder-title-bar.c: New 'folder_bar_label' member for
	EShellFolderTitleBar, it's for information that's shown to the
	left of the icon like the dates in the calendar (or, potentially
	total and unread numbers for mailer).
	(e_shell_folder_title_bar_set_folder_bar_label): New function,
	lets others set the title bar extra label.

	* Evolution-ShellView.idl: New method 'setFolderBarLabel' for our
	exposed ShellView interface.

	* evolution-shell-view.c (class_init): New signal
	"set_folder_bar_label" for EvolutionShellViewClass.

	* evolution-shell-view.c (impl_ShellView_set_folder_bar_label):
	Emit the new signal here.

	* e-shell-view.c (setup_corba_interface): Connect the signal here.

	* e-shell-view.c (corba_interface_set_folder_bar_label): New
	function, callback for the above signals, does the actual extra
	label setting for the folder title bar.

	* e-shell-folder-commands.c (e_shell_command_add_to_shortcut_bar):
	Fix a warning here.

svn path=/trunk/; revision=10059

1 files changed, 23 insertions, 0 deletions

diff --git a/shell/evolution-shell-view.c b/shell/evolution-shell-view.c
index 82e471c35f..e5a377afe0 100644
--- a/shell/evolution-shell-view.c
+++ b/shell/evolution-shell-view.c
@@ -44,6 +44,7 @@ enum {
 	UNSET_MESSAGE,
 	CHANGE_VIEW,
 	SET_TITLE,
+	SET_FOLDER_BAR_LABEL,
 	LAST_SIGNAL
 };
 static int signals[LAST_SIGNAL] = { 0 };
@@ -121,6 +122,18 @@ impl_ShellView_set_title (PortableServer_Servant servant,
 			 title);
 }
 
+static void
+impl_ShellView_set_folder_bar_label (PortableServer_Servant servant,
+				const CORBA_char  *text,
+				CORBA_Environment *ev)
+{
+	BonoboObject *bonobo_object;
+
+	bonobo_object = bonobo_object_from_servant (servant);
+	gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[SET_FOLDER_BAR_LABEL],
+			 text);
+}
+
 
 /* GtkObject methods.  */
 static void
@@ -155,6 +168,7 @@ corba_class_init (void)
 	epv->unsetMessage      = impl_ShellView_unset_message;
 	epv->changeCurrentView = impl_ShellView_change_current_view;
 	epv->setTitle          = impl_ShellView_set_title;
+	epv->setFolderBarLabel = impl_ShellView_set_folder_bar_label;
 
 	vepv = &ShellView_vepv;
 	vepv->_base_epv               = base_epv;
@@ -206,6 +220,15 @@ class_init (EvolutionShellViewClass *klass)
 				  GTK_TYPE_NONE, 1,
 				  GTK_TYPE_STRING);
 
+	signals[SET_FOLDER_BAR_LABEL]
+		= gtk_signal_new ("set_folder_bar_label",
+				  GTK_RUN_FIRST,
+				  object_class->type,
+				  GTK_SIGNAL_OFFSET (EvolutionShellViewClass, set_folder_bar_label),
+				  gtk_marshal_NONE__POINTER,
+				  GTK_TYPE_NONE, 1,
+				  GTK_TYPE_STRING);
+
 	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
 
 	parent_class = gtk_type_class (bonobo_object_get_type ());