diff options
| author | Not Zed <NotZed@Ximian.com> | 2003-04-09 22:20:34 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2003-04-09 22:20:34 +0800 |
| commit | 0c38cc93b1f23af21ae327b60cbcfc781d46e9ec (patch) | |
| tree | 8b17a9701e9918640018de62ec007c5ba788a406 /mail/mail-callbacks.c | |
| parent | c9f72e4ab116c93f3a66b2fb846e8502cbd69175 (diff) | |
| download | gsoc2013-evolution-0c38cc93b1f23af21ae327b60cbcfc781d46e9ec.tar.gz gsoc2013-evolution-0c38cc93b1f23af21ae327b60cbcfc781d46e9ec.tar.zst gsoc2013-evolution-0c38cc93b1f23af21ae327b60cbcfc781d46e9ec.zip | |
** See bug #40921
2003-04-09 Not Zed <NotZed@Ximian.com>
** See bug #40921
* subscribe-dialog.c (subscribe_dialog_finalise): add a finalise
funciton which actually free's resources.
(get_short_folderinfo_got): dont call activity callback implicitly
here, do it from the callers callback.
(subscribe_get_short_folderinfo): dont call activity callback
here.
(fe_got_children): check implicitly if we were cancelled. also
add back the node sort, and also call the activity callback from
here instead of breaking layers of abstraction as above.
(folder_etree_cancel_all): new method, force a cancel of all ops,
but dont free anything.
(store_data_free): dont unref the widget anymore, not needed.
call cancel all on the ftree if its still active.
(sc_close_pressed): destroy the subscribe dialogue as well as the
app, it doesn't seem to get destroyed otherwise.
(sc_activity_cb): do nothing if we have been cancelled.
(subscribe_dialog_destroy): trigger a cancel of all outstanding
ops. only free most data in the finalise method.
(subscribe_dialog_class_init): hook onto finalise.
(store_data_get_widget): dont ref the widget.
* mail-callbacks.c (manage_subscriptions): sink the dialog.
svn path=/trunk/; revision=20784
Diffstat (limited to 'mail/mail-callbacks.c')
| -rw-r--r-- | mail/mail-callbacks.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index c51a73c27e..331fc9cf26 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -3068,7 +3068,8 @@ manage_subscriptions (BonoboUIComponent *uih, void *user_data, const char *path) g_object_weak_ref ((GObject *) SUBSCRIBE_DIALOG (subscribe_dialog)->app, (GWeakNotify) subscribe_dialog_destroy, subscribe_dialog); - + g_object_ref(subscribe_dialog); + gtk_object_sink((GtkObject *)subscribe_dialog); subscribe_dialog_show (subscribe_dialog); } else { gdk_window_raise (SUBSCRIBE_DIALOG (subscribe_dialog)->app->window); |