[Removing Evolution::LocalStorage interface, abstracting the unread counts

2001-08-03  Jason Leach  <jleach@ximian.com>

        [Removing Evolution::LocalStorage interface, abstracting the
        unread counts from a folder's name, also abstract unread counts
        from a shortcut's name.  Fixes #4489 and #5497]

        * e-shortcuts.c (shortcut_item_new): Take an unread_count argument
        now.
        (shortcut_item_update): Ditto.

        * e-shortcuts-view-model.c (get_name_with_unread): Get a string
        containing a shortcut name and it's unread, because these are
        abstracted now.
        (load_group_into_model): Use the above function to make shortcuts
        that have unread counts.

        * e-storage-set-view.c (update_folder_with_unread_hash): Keep a
        hash of folder names with unread counts, because the folder name
        and it's unread count are to be separated, only the ETree is
        supposed to present it as one string.

        * e-shell-view.c: Renamed EShellView::view_title_bar to
        folder_title_bar, to closer match the

        * e-shell-view-menu.c (new_shortcut_dialog_folder_selected_cb):
        Make a shortcut with the unread count.

        * e-shell-folder-commands.c (e_shell_command_add_to_shortcut_bar):
        Make a shortcut with the unread count.

        * e-local-storage.c: Updated for API changes.

        * e-folder.c (e_folder_get_unread_count): New function, does what
        it says.
        (e_folder_set_unread_count): Ditto.

        * e-corba-storage.c (impl_StorageListener_new_folder): Renamed to
        match the IDL function name.
        (impl_StorageListener_update_folder): Ditto.
        (impl_StorageListener_removed_folder): Ditto.

        * Evolution-Storage.idl (struct Folder): Replace the boolean
        highlighted with a long unread_count.
        (updateFolder): Brought in from the now dead
        Evolution::LocalStorage.

        * Evolution-Shell.idl (getLocalStorage): Return a Storage instead
        of a LocalStorage.

        * Evolution-LocalStorage.idl: Removed, no longer needed, only used
        function, updateFolder, has been moved into Evolution::Storage
        interface.

        * evolution-local-storage.[ch]: Ditto.

        * evolution-storage.c (impl_Storage_updateFolder): Implementation
        of the updateFolder taken from ::LocalStorage.
        (class_init): New "update_folder" signal, taken from
        evolution-local-storage.c too.
        (evolution_storage_update_folder): Take an @unread_count int
        instead of a @highlighted boolean.
        (evolution_storage_new_folder): Same for here.
        (evolution_storage_update_folder_by_uri): And here.

        * evolution-storage-listener.h: "update_folder" signal no longer
        sends a @highlighted boolean.

2001-08-03  Jason Leach  <jleach@ximian.com>

        * e-shell-view-menu.c (update_offline_menu_item): Use Jakub's new
        "Work Online" icon and fix a typo.

svn path=/trunk/; revision=11633

1 files changed, 22 insertions, 20 deletions

diff --git a/shell/e-shell.c b/shell/e-shell.c
index c2aef7d71e..fb128c6081 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -356,12 +356,12 @@ impl_Shell_selectUserFolder (PortableServer_Servant servant,
 	gtk_widget_show (folder_selection_dialog);
 }
 
-static GNOME_Evolution_LocalStorage
+static GNOME_Evolution_Storage
 impl_Shell_getLocalStorage (PortableServer_Servant servant,
 			    CORBA_Environment *ev)
 {
 	BonoboObject *bonobo_object;
-	GNOME_Evolution_LocalStorage local_storage_interface;
+	GNOME_Evolution_Storage local_storage_interface;
 	EShell *shell;
 	EShellPrivate *priv;
 
@@ -509,6 +509,9 @@ setup_components (EShell *shell,
 	if (ev._major != CORBA_NO_EXCEPTION)
 		g_error ("Eeek!  Cannot perform OAF query for Evolution components.");
 
+	if (info_list->_length == 0)
+		g_warning ("No Evolution components installed.");
+
 	for (i = 0; i < info_list->_length; i++) {
 		const OAF_ServerInfo *info;
 		GdkPixbuf *icon_pixbuf;
@@ -548,9 +551,6 @@ setup_components (EShell *shell,
 			gtk_main_iteration ();
 	}
 
-	if (info_list->_length == 0)
-		g_warning ("No Evolution components installed.");
-
 	CORBA_free (info_list);
 
 	CORBA_exception_free (&ev);
@@ -589,13 +589,13 @@ set_owner_on_components (EShell *shell)
 /* EShellView destruction callback.  */
 
 static int
-view_deleted_cb (GtkObject *object,
-		 GdkEvent *ev,
-		 gpointer data)
+view_delete_event_cb (GtkWidget *widget,
+		      GdkEventAny *ev,
+		      void *data)
 {
 	EShell *shell;
 
-	g_assert (E_IS_SHELL_VIEW (object));
+	g_assert (E_IS_SHELL_VIEW (widget));
 
 	shell = E_SHELL (data);
 	e_shell_save_settings (shell);
@@ -606,21 +606,21 @@ view_deleted_cb (GtkObject *object,
 
 static void
 view_destroy_cb (GtkObject *object,
-		 gpointer data)
+		 void *data)
 {
 	EShell *shell;
-	int nviews;
+	int num_views;
 
 	g_assert (E_IS_SHELL_VIEW (object));
 
 	shell = E_SHELL (data);
 
-	nviews = g_list_length (shell->priv->views);
+	num_views = g_list_length (shell->priv->views);
 
 	/* If this is our last view, save settings now because in the
 	   callback for no_views_left shell->priv->views will be NULL
 	   and settings won't be saved because of that */
-	if (nviews - 1 == 0)
+	if (num_views - 1 == 0)
 		e_shell_save_settings (shell);
 
 	shell->priv->views = g_list_remove (shell->priv->views, object);
@@ -676,11 +676,11 @@ destroy (GtkObject *object)
 
 		view = E_SHELL_VIEW (p->data);
 
-		gtk_signal_disconnect_by_func (
-			GTK_OBJECT (view),
-			GTK_SIGNAL_FUNC (view_destroy_cb), shell);
 		gtk_signal_disconnect_by_func (GTK_OBJECT (view),
-					       GTK_SIGNAL_FUNC (view_deleted_cb),
+					       GTK_SIGNAL_FUNC (view_delete_event_cb),
+					       shell);
+		gtk_signal_disconnect_by_func (GTK_OBJECT (view),
+					       GTK_SIGNAL_FUNC (view_destroy_cb),
 					       shell);
 
 		gtk_object_destroy (GTK_OBJECT (view));
@@ -800,7 +800,6 @@ e_shell_construct (EShell *shell,
 	CORBA_Object corba_object;
 	CORBA_Environment ev;
 	gchar *shortcut_path;
-
 	g_return_val_if_fail (shell != NULL, E_SHELL_CONSTRUCT_RESULT_INVALIDARG);
 	g_return_val_if_fail (E_IS_SHELL (shell), E_SHELL_CONSTRUCT_RESULT_INVALIDARG);
 	g_return_val_if_fail (local_directory != NULL, E_SHELL_CONSTRUCT_RESULT_INVALIDARG);
@@ -966,13 +965,16 @@ e_shell_create_view (EShell *shell,
 	view = e_shell_view_new (shell);
 
 	gtk_widget_show (GTK_WIDGET (view));
-	gtk_signal_connect (GTK_OBJECT (view), "delete-event",
-			    GTK_SIGNAL_FUNC (view_deleted_cb), shell);
+	gtk_signal_connect (GTK_OBJECT (view), "delete_event",
+			    GTK_SIGNAL_FUNC (view_delete_event_cb), shell);
 	gtk_signal_connect (GTK_OBJECT (view), "destroy",
 			    GTK_SIGNAL_FUNC (view_destroy_cb), shell);
 
 	if (uri != NULL)
 		if (!e_shell_view_display_uri (E_SHELL_VIEW (view), uri))
+			/* FIXME: Consider popping a dialog box up
+			   about how the provided URI does not
+			   exist/could not be displayed */
 			e_shell_view_display_uri (E_SHELL_VIEW (view), DEFAULT_URI);
 
 	shell->priv->views = g_list_prepend (shell->priv->views, view);