projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* let the dbus-invoked msgs use the same uids as other messages,
[modest]
/
src
/
modest-singletons.c
diff --git
a/src/modest-singletons.c
b/src/modest-singletons.c
index
5998e5e
..
e756b11
100644
(file)
--- a/
src/modest-singletons.c
+++ b/
src/modest-singletons.c
@@
-166,7
+166,13
@@
modest_singletons_finalize (GObject *obj)
ModestSingletonsPrivate *priv;
priv = MODEST_SINGLETONS_GET_PRIVATE(obj);
ModestSingletonsPrivate *priv;
priv = MODEST_SINGLETONS_GET_PRIVATE(obj);
-
+
+ if (priv->window_mgr) {
+ modest_runtime_verify_object_last_ref(priv->window_mgr,"");
+ g_object_unref (G_OBJECT(priv->window_mgr));
+ priv->window_mgr = NULL;
+ }
+
if (priv->account_store) {
modest_runtime_verify_object_last_ref(priv->account_store,"");
g_object_unref (G_OBJECT(priv->account_store));
if (priv->account_store) {
modest_runtime_verify_object_last_ref(priv->account_store,"");
g_object_unref (G_OBJECT(priv->account_store));
@@
-179,12
+185,6
@@
modest_singletons_finalize (GObject *obj)
priv->email_clipboard = NULL;
}
priv->email_clipboard = NULL;
}
- if (priv->conf) {
- modest_runtime_verify_object_last_ref(priv->conf,"");
- g_object_unref (G_OBJECT(priv->conf));
- priv->conf = NULL;
- }
-
if (priv->cache_mgr) {
modest_runtime_verify_object_last_ref(priv->cache_mgr,"");
g_object_unref (G_OBJECT(priv->cache_mgr));
if (priv->cache_mgr) {
modest_runtime_verify_object_last_ref(priv->cache_mgr,"");
g_object_unref (G_OBJECT(priv->cache_mgr));
@@
-218,13
+218,13
@@
modest_singletons_finalize (GObject *obj)
g_object_unref (G_OBJECT(priv->account_mgr));
priv->account_mgr = NULL;
}
g_object_unref (G_OBJECT(priv->account_mgr));
priv->account_mgr = NULL;
}
-
- if (priv->window_mgr) {
- modest_runtime_verify_object_last_ref(priv->window_mgr,"");
- g_object_unref (G_OBJECT(priv->window_mgr));
- priv->window_mgr = NULL;
+
+ if (priv->conf) {
+ modest_runtime_verify_object_last_ref(priv->conf,"");
+ g_object_unref (G_OBJECT(priv->conf));
+ priv->conf = NULL;
}
}
-
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
G_OBJECT_CLASS(parent_class)->finalize (obj);
}