aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/e-shell-view.c8
-rw-r--r--widgets/e-table/ChangeLog5
-rw-r--r--widgets/e-table/e-table-text-model.c5
-rw-r--r--widgets/table/e-table-text-model.c5
-rw-r--r--widgets/text/e-table-text-model.c5
5 files changed, 22 insertions, 6 deletions
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 398c67f377..189a762af9 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -154,9 +154,11 @@ get_view (EShellView *eshell_view, EFolder *efolder, Bonobo_UIHandler uih)
corba_shell,
&ev);
} else {
- g_warning ("The bonobo component for the mail doesn't "
- "seem to implement the "
- "Evolution::ServiceRepository interface\n");
+
+ g_print ("The bonobo component for \"%s\" doesn't "
+ "seem to implement the "
+ "Evolution::ServiceRepository interface\n",
+ e_folder_get_description (efolder));
}
gtk_widget_show (w);
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog
index b5a2bf56c9..dade0d7675 100644
--- a/widgets/e-table/ChangeLog
+++ b/widgets/e-table/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-22 Matt Loper <matt@helixcode.com>
+
+ * e-table-text-model.c (e_table_text_model_destroy): Added some
+ assertions.
+
2000-03-21 Christopher James Lahey <clahey@helixcode.com>
* e-table.c: Make rectangles resize properly when receiving the
diff --git a/widgets/e-table/e-table-text-model.c b/widgets/e-table/e-table-text-model.c
index 69ffdc3568..37c13080a7 100644
--- a/widgets/e-table/e-table-text-model.c
+++ b/widgets/e-table/e-table-text-model.c
@@ -105,10 +105,13 @@ e_table_text_model_destroy (GtkObject *object)
ETableTextModel *model;
g_return_if_fail (object != NULL);
- g_return_if_fail (E_IS_TEXT_MODEL (object));
+ g_return_if_fail (E_IS_TABLE_TEXT_MODEL (object));
model = E_TABLE_TEXT_MODEL (object);
+ g_assert (model->model);
+ g_assert (GTK_IS_OBJECT (model->model));
+
if (model->cell_changed_signal_id)
gtk_signal_disconnect(GTK_OBJECT(model->model),
model->cell_changed_signal_id);
diff --git a/widgets/table/e-table-text-model.c b/widgets/table/e-table-text-model.c
index 69ffdc3568..37c13080a7 100644
--- a/widgets/table/e-table-text-model.c
+++ b/widgets/table/e-table-text-model.c
@@ -105,10 +105,13 @@ e_table_text_model_destroy (GtkObject *object)
ETableTextModel *model;
g_return_if_fail (object != NULL);
- g_return_if_fail (E_IS_TEXT_MODEL (object));
+ g_return_if_fail (E_IS_TABLE_TEXT_MODEL (object));
model = E_TABLE_TEXT_MODEL (object);
+ g_assert (model->model);
+ g_assert (GTK_IS_OBJECT (model->model));
+
if (model->cell_changed_signal_id)
gtk_signal_disconnect(GTK_OBJECT(model->model),
model->cell_changed_signal_id);
diff --git a/widgets/text/e-table-text-model.c b/widgets/text/e-table-text-model.c
index 69ffdc3568..37c13080a7 100644
--- a/widgets/text/e-table-text-model.c
+++ b/widgets/text/e-table-text-model.c
@@ -105,10 +105,13 @@ e_table_text_model_destroy (GtkObject *object)
ETableTextModel *model;
g_return_if_fail (object != NULL);
- g_return_if_fail (E_IS_TEXT_MODEL (object));
+ g_return_if_fail (E_IS_TABLE_TEXT_MODEL (object));
model = E_TABLE_TEXT_MODEL (object);
+ g_assert (model->model);
+ g_assert (GTK_IS_OBJECT (model->model));
+
if (model->cell_changed_signal_id)
gtk_signal_disconnect(GTK_OBJECT(model->model),
model->cell_changed_signal_id);