diff options
| author | JP Rosevear <jpr@ximian.com> | 2002-05-27 01:10:48 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2002-05-27 01:10:48 +0800 |
| commit | 08f9758626f41561d7420ece2e59489b24f29324 (patch) | |
| tree | 1072718d789afb1ece51bf8098e227632eab842d /calendar/gui/e-comp-editor-registry.c | |
| parent | a1d69a1b83b4a1de9f54fef9a4e0da7703de9a55 (diff) | |
| download | gsoc2013-evolution-08f9758626f41561d7420ece2e59489b24f29324.tar gsoc2013-evolution-08f9758626f41561d7420ece2e59489b24f29324.tar.gz gsoc2013-evolution-08f9758626f41561d7420ece2e59489b24f29324.tar.bz2 gsoc2013-evolution-08f9758626f41561d7420ece2e59489b24f29324.tar.lz gsoc2013-evolution-08f9758626f41561d7420ece2e59489b24f29324.tar.xz gsoc2013-evolution-08f9758626f41561d7420ece2e59489b24f29324.tar.zst gsoc2013-evolution-08f9758626f41561d7420ece2e59489b24f29324.zip | |
update proto
2002-05-26 JP Rosevear <jpr@ximian.com>
* gui/dialogs/comp-editor.h: update proto
* gui/dialogs/comp-editor.c (comp_editor_get_comp): new function
to get base comp
* gui/e-comp-editor-registry.c (e_comp_editor_registry_add): get
the base comp, not the current comp, don't unref it
(foreach_close_cb): block the signal, unblock it if the editor
could not be closed
(e_comp_editor_registry_close_all): fix preconditions
(editor_destroy_cb): get the base comp, not the current comp,
don't unref it
svn path=/trunk/; revision=17020
Diffstat (limited to 'calendar/gui/e-comp-editor-registry.c')
| -rw-r--r-- | calendar/gui/e-comp-editor-registry.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/calendar/gui/e-comp-editor-registry.c b/calendar/gui/e-comp-editor-registry.c index 46548a57c6..f619a1d0d1 100644 --- a/calendar/gui/e-comp-editor-registry.c +++ b/calendar/gui/e-comp-editor-registry.c @@ -128,7 +128,7 @@ e_comp_editor_registry_add (ECompEditorRegistry *reg, CompEditor *editor, gboole priv = reg->priv; - comp = comp_editor_get_current_comp (editor); + comp = comp_editor_get_comp (editor); cal_component_get_uid (comp, &uid); rdata = g_new0 (ECompEditorRegistryData, 1); @@ -138,8 +138,7 @@ e_comp_editor_registry_add (ECompEditorRegistry *reg, CompEditor *editor, gboole g_hash_table_insert (priv->editors, rdata->uid, rdata); gtk_signal_connect (GTK_OBJECT (editor), "destroy", editor_destroy_cb, reg); - - gtk_object_unref (GTK_OBJECT (comp)); + } CompEditor * @@ -168,12 +167,14 @@ foreach_close_cb (gpointer key, gpointer value, gpointer data) rdata = value; - gtk_signal_disconnect_by_data (GTK_OBJECT (rdata->editor), data); + gtk_signal_handler_block_by_data (GTK_OBJECT (rdata->editor), data); comp_editor_focus (rdata->editor); - if (!comp_editor_close (rdata->editor)) + if (!comp_editor_close (rdata->editor)) { + gtk_signal_handler_unblock_by_data (GTK_OBJECT (rdata->editor), data); return FALSE; - + } + g_free (rdata->uid); g_free (rdata); @@ -185,8 +186,8 @@ e_comp_editor_registry_close_all (ECompEditorRegistry *reg) { ECompEditorRegistryPrivate *priv; - g_return_if_fail (reg != NULL); - g_return_if_fail (E_IS_COMP_EDITOR_REGISTRY (reg)); + g_return_val_if_fail (reg != NULL, FALSE); + g_return_val_if_fail (E_IS_COMP_EDITOR_REGISTRY (reg), FALSE); priv = reg->priv; @@ -209,7 +210,7 @@ editor_destroy_cb (GtkWidget *widget, gpointer data) reg = E_COMP_EDITOR_REGISTRY (data); priv = reg->priv; - comp = comp_editor_get_current_comp (COMP_EDITOR (widget)); + comp = comp_editor_get_comp (COMP_EDITOR (widget)); cal_component_get_uid (comp, &uid); rdata = g_hash_table_lookup (priv->editors, uid); @@ -218,7 +219,5 @@ editor_destroy_cb (GtkWidget *widget, gpointer data) g_hash_table_remove (priv->editors, rdata->uid); g_free (rdata->uid); g_free (rdata); - - gtk_object_unref (GTK_OBJECT (comp)); } |