New callback for the show_folder_properties signal.

* evolution-test-component.c
(storage_show_folder_properties_callback): New callback for the
show_folder_properties signal.
(setup_custom_storage): Add two property items, and connect the
callback to the signal.

* e-storage-set-view.c: Renamed private member container into
ui_container; new member ui_component.
(init): Initialize ui_component to NULL.
(impl_destroy): Unref if not NULL.
(e_storage_set_view_construct): If @ui_container is not NULL,
weakref it and create a new ui_component that uses it as its
container.
(ui_container_destroy_notify): New, weakref destroy callback for
priv->ui_container.
(remove_property_items): New helper function.
(setup_folder_properties_items_if_corba_storage_clicked): New
helper function.
(folder_property_item_verb_callback): New callback for the verbs
associated to the folder property items.
(popup_folder_menu): Set up the per-storage folder property items
using setup_folder_properties_items_if_corba_storage_clicked() and
remove them with remove_property_items() after the menu has been
popped down.  Don't invoke populate_folder_context_menu if there
is no handler for this node [this avoids a spurious warning].

* e-corba-storage.c (e_corba_storage_show_folder_properties): New.
(e_corba_storage_get_folder_property_items): New.
(e_corba_storage_free_property_items_list): New.

* evolution-storage.c: New private member folder_property_items.
(init): Init to NULL.
(destroy): Free.
(impl_showFolderProperties): New, implementation for the
Storage::showFolderProperties CORBA method.
(class_init): Set up the "show_folder_properties" signal here.
(impl_Storage__get_propertyItems): New, getter for the
Storage::propertyItems property.
(corba_class_init): Install the new methods.
(evolution_storage_add_property_item): New function to add
property items to the storage.

* evolution-storage.h: New signal show_folder_properties.

* e-storage-set.c (e_storage_set_create_new_view): Renamed from
e_storage_set_new_view().

* Evolution-Storage.idl: Added attribute folderPropertyItems and
method ::showFolderProperties.

svn path=/trunk/; revision=17714

1 files changed, 91 insertions, 2 deletions

diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c
index 0fe5bdc3f4..95da96ed24 100644
--- a/shell/e-corba-storage.c
+++ b/shell/e-corba-storage.c
@@ -26,11 +26,17 @@
 
 #include "e-corba-storage.h"
 
+#include "e-shell-constants.h"
+
+#include "Evolution.h"
+
 #include <glib.h>
-#include <bonobo/bonobo-main.h>
 #include <gal/util/e-util.h>
 
-#include "Evolution.h"
+#include <bonobo/bonobo-main.h>
+#include <bonobo/bonobo-exception.h>
+
+#include <gdk/gdkx.h>
 
 
 #define PARENT_TYPE E_TYPE_STORAGE
@@ -626,4 +632,87 @@ e_corba_storage_get_corba_objref (ECorbaStorage *corba_storage)
 }
 
 
+GSList *
+e_corba_storage_get_folder_property_items (ECorbaStorage *corba_storage)
+{
+	GNOME_Evolution_Storage_FolderPropertyItemList *corba_items;
+	CORBA_Environment ev;
+	GSList *list;
+	int i;
+
+	g_return_val_if_fail (E_IS_CORBA_STORAGE (corba_storage), NULL);
+
+	CORBA_exception_init (&ev);
+
+	corba_items = GNOME_Evolution_Storage__get_folderPropertyItems (corba_storage->priv->storage_interface,
+									&ev);
+
+	if (BONOBO_EX (&ev)) {
+		CORBA_exception_free (&ev);
+		return NULL;
+	}
+
+	list = NULL;
+	for (i = 0; i < corba_items->_length; i ++) {
+		ECorbaStoragePropertyItem *item;
+
+		item = g_new (ECorbaStoragePropertyItem, 1);
+		item->label   = g_strdup (corba_items->_buffer[i].label);
+		item->tooltip = g_strdup (corba_items->_buffer[i].tooltip);
+		item->icon    = NULL; /* We don't care for now -- FIXME */
+
+		list = g_slist_prepend (list, item);
+	}
+	list = g_slist_reverse (list);
+
+	CORBA_free (corba_items);
+	CORBA_exception_free (&ev);
+
+	return list;
+}
+
+void
+e_corba_storage_free_property_items_list (GSList *list)
+{
+	GSList *p;
+
+	for (p = list; p != NULL; p = p->next) {
+		ECorbaStoragePropertyItem *item;
+
+		item = (ECorbaStoragePropertyItem *) p->data;
+
+		if (item->icon != NULL)
+			gdk_pixbuf_unref (item->icon);
+		g_free (item->label);
+		g_free (item->tooltip);
+		g_free (item);
+	}
+
+	g_slist_free (list);
+}
+
+void
+e_corba_storage_show_folder_properties (ECorbaStorage *corba_storage,
+					const char *path,
+					int property_item_id,
+					GdkWindow *parent_window)
+{
+	CORBA_Environment ev;
+
+	g_return_if_fail (E_IS_CORBA_STORAGE (corba_storage));
+	g_return_if_fail (path != NULL && path[0] == E_PATH_SEPARATOR);
+
+	CORBA_exception_init (&ev);
+
+	GNOME_Evolution_Storage_showFolderProperties (corba_storage->priv->storage_interface,
+						      path, property_item_id,
+						      GDK_WINDOW_XWINDOW (parent_window),
+						      &ev);
+	if (BONOBO_EX (&ev))
+		g_warning ("Error in Storage::showFolderProperties -- %s", BONOBO_EX_ID (&ev));
+
+	CORBA_exception_free (&ev);
+}
+
+
 E_MAKE_TYPE (e_corba_storage, "ECorbaStorage", ECorbaStorage, class_init, init, PARENT_TYPE)