From 53fe0954cb52ebad13c96967077501fe28b868d3 Mon Sep 17 00:00:00 2001 From: Jon Trowbridge Date: Wed, 6 Jun 2001 22:35:22 +0000 Subject: Changed purely informational debug spew from a g_warning to a g_message. 2001-06-06 Jon Trowbridge * evolution-storage.c (impl_Storage_async_create_folder): Changed purely informational debug spew from a g_warning to a g_message. * e-shell-importer.c (show_import_wizard): The import wizard defined in import.glade only has three pages... yet we were trying to manipulate "page4" as the finish page, with the expected bad results. My guess is that the .glade file got changed, but the code didn't get updated. (start_import): We were trying to bonobo_object_unref (BONOBO_OBJECT (icd->client)), which is fine except for the fact that icd->client is just a GtkObject, not a BonoboObject. Changed to a gtk_object_unref. (start_import): Changed a purely informational bit of debug spew from a g_warning to a g_message. svn path=/trunk/; revision=10139 --- shell/ChangeLog | 18 ++++++++++++++++++ shell/e-shell-importer.c | 6 +++--- shell/evolution-storage.c | 2 +- 3 files changed, 22 insertions(+), 4 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 547613bc1d..2f4440b690 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,20 @@ +2001-06-06 Jon Trowbridge + + * evolution-storage.c (impl_Storage_async_create_folder): Changed + purely informational debug spew from a g_warning to a g_message. + + * e-shell-importer.c (show_import_wizard): The import wizard + defined in import.glade only has three pages... yet we were trying + to manipulate "page4" as the finish page, with the expected bad + results. My guess is that the .glade file got changed, but the + code didn't get updated. + (start_import): We were trying to bonobo_object_unref + (BONOBO_OBJECT (icd->client)), which is fine except for the + fact that icd->client is just a GtkObject, not a BonoboObject. + Changed to a gtk_object_unref. + (start_import): Changed a purely informational bit of debug + spew from a g_warning to a g_message. + 2001-06-06 Iain Holmes * importers/intelligent.c (create_gui): Make a few boxes, and make @@ -35,6 +52,7 @@ (insert_storages): Minor change here too. (new_folder_cb): Ditto. +>>>>>>> 1.439 2001-06-05 Jason Leach * e-shell-view-menu.c: Plug in all the folder tree right click diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index b04fd78c10..b1cea8a153 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -394,7 +394,7 @@ start_import (const char *folderpath, g_free (real_iid); /* NULL for folderpath means use Inbox */ - g_warning ("Folderpath: %s", folderpath); + g_message ("Folderpath: %s", folderpath); if (*folderpath == '/') { folderpath = strchr (folderpath + 1, '/'); } @@ -406,7 +406,7 @@ start_import (const char *folderpath, while (gtk_events_pending ()) gtk_main_iteration (); - bonobo_object_unref (BONOBO_OBJECT (icd->client)); + gtk_object_unref (GTK_OBJECT (icd->client)); gtk_object_unref (GTK_OBJECT (icd->dialog)); g_free (icd); return; @@ -680,7 +680,7 @@ show_import_wizard (BonoboUIComponent *component, gtk_signal_connect (GTK_OBJECT (data->filedialog), "prepare", GTK_SIGNAL_FUNC (prepare_file_page), data); - finish = GNOME_DRUID_PAGE_FINISH (glade_xml_get_widget (data->wizard, "page4")); + finish = GNOME_DRUID_PAGE_FINISH (glade_xml_get_widget (data->wizard, "page3")); data->filepage = importer_file_page_new (data); data->vbox = data->filepage->vbox; diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c index 482e25c834..bbe1a3be51 100644 --- a/shell/evolution-storage.c +++ b/shell/evolution-storage.c @@ -300,7 +300,7 @@ impl_Storage_async_create_folder (PortableServer_Servant servant, bonobo_object = bonobo_object_from_servant (servant); storage = EVOLUTION_STORAGE (bonobo_object); - g_warning ("Path: %s", path); + g_message ("Path: %s", path); gtk_signal_emit (GTK_OBJECT (storage), signals[CREATE_FOLDER], listener, path, type, description, parent_physical_uri); } -- cgit v1.2.3