`#if 0'ed out. (make_bold): Likewise.

* e-shell-folder-title-bar.c (label_realize_callback): `#if 0'ed
out.
(make_bold): Likewise.
(e_shell_folder_title_bar_construct): Don't call it.

* e-local-storage.c (component_async_remove_folder_callback): Only
remove the directory if the component succeeds.

svn path=/trunk/; revision=12392

3 files changed, 19 insertions, 7 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 0fd1604075..71b2101e58 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,13 @@
+2001-08-22  Ettore Perazzoli  <ettore@ximian.com>
+
+	* e-shell-folder-title-bar.c (label_realize_callback): `#if 0'ed
+	out.
+	(make_bold): Likewise.
+	(e_shell_folder_title_bar_construct): Don't call it.
+
+	* e-local-storage.c (component_async_remove_folder_callback): Only
+	remove the directory if the component succeeds.
+
 2001-08-22  Peter Williams  <peterw@ximian.com>
 
 	* e-local-storage.c (async_xfer_folder_callback): Fix the improper
diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c
index 5707c55aa1..8dcdff9342 100644
--- a/shell/e-local-storage.c
+++ b/shell/e-local-storage.c
@@ -466,9 +466,6 @@ component_async_remove_folder_callback (EvolutionShellComponentClient *shell_com
 
 	callback_data = (AsyncRemoveFolderCallbackData *) data;
 
-	result = remove_folder_directory (E_LOCAL_STORAGE (callback_data->storage),
-					  callback_data->path);
-
 	storage_result = shell_component_result_to_storage_result (result);
 
 	/* If result == HASSUBFOLDERS then recurse delete the subfolders dir? */
@@ -479,6 +476,9 @@ component_async_remove_folder_callback (EvolutionShellComponentClient *shell_com
 
 		priv = E_LOCAL_STORAGE (callback_data->storage)->priv;
 
+		result = remove_folder_directory (E_LOCAL_STORAGE (callback_data->storage),
+						  callback_data->path);
+
 		e_storage_removed_folder (E_STORAGE (callback_data->storage),
 					  callback_data->path);
 
diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c
index 1ed1dcca6e..4c13a146a0 100644
--- a/shell/e-shell-folder-title-bar.c
+++ b/shell/e-shell-folder-title-bar.c
@@ -128,8 +128,8 @@ title_button_box_realize_cb (GtkWidget *widget,
 }
 
 
-/* This is used to make the labels white.  Yes, yes, I know I shouldn't do
-   this.  Yes, yes, I know it's evil.  */
+#if 0				/* This code is kinda broken in some subtle way
+				   I haven't been able to figure out.  */
 
 static void
 label_realize_callback (GtkWidget *widget,
@@ -172,6 +172,8 @@ make_bold (GtkWidget *widget)
 			    GTK_SIGNAL_FUNC (label_realize_callback), NULL);
 }
 
+#endif
+
 static void
 set_title_bar_label_style (GtkWidget *widget)
 {
@@ -489,14 +491,14 @@ e_shell_folder_title_bar_construct (EShellFolderTitleBar *folder_title_bar)
 	gtk_misc_set_padding (GTK_MISC (priv->label), 5, 0);
 	gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.5);
 	set_title_bar_label_style (priv->label);
-	make_bold (priv->label);
+	/* make_bold (priv->label); */
 
 	priv->button_label = e_clipped_label_new ("");
 	gtk_misc_set_padding (GTK_MISC (priv->button_label), 2, 0);
 	gtk_misc_set_alignment (GTK_MISC (priv->button_label), 0.0, 0.5);
 	gtk_widget_show (priv->button_label);
 	set_title_bar_label_style (priv->button_label);
-	make_bold (priv->label);
+	/* make_bold (priv->label); */
 
 	priv->folder_bar_label = e_clipped_label_new ("");
 	gtk_misc_set_alignment (GTK_MISC (priv->folder_bar_label), 1.0, 0.5);