projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2007-04-15 Sergio Villar Senin <svillar@igalia.com>
[modest]
/
src
/
modest-singletons.c
diff --git
a/src/modest-singletons.c
b/src/modest-singletons.c
index
61d0b08
..
11fb9e0
100644
(file)
--- a/
src/modest-singletons.c
+++ b/
src/modest-singletons.c
@@
-44,6
+44,7
@@
struct _ModestSingletonsPrivate {
ModestMailOperationQueue *mail_op_queue;
TnyPlatformFactory *platform_fact;
TnyDevice *device;
ModestMailOperationQueue *mail_op_queue;
TnyPlatformFactory *platform_fact;
TnyDevice *device;
+ ModestWindowMgr *window_mgr;
};
#define MODEST_SINGLETONS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_SINGLETONS, \
};
#define MODEST_SINGLETONS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_SINGLETONS, \
@@
-100,6
+101,7
@@
modest_singletons_init (ModestSingletons *obj)
priv->mail_op_queue = NULL;
priv->platform_fact = NULL;
priv->device = NULL;
priv->mail_op_queue = NULL;
priv->platform_fact = NULL;
priv->device = NULL;
+ priv->window_mgr = NULL;
priv->conf = modest_conf_new ();
if (!priv->conf) {
priv->conf = modest_conf_new ();
if (!priv->conf) {
@@
-141,75
+143,70
@@
modest_singletons_init (ModestSingletons *obj)
if (!priv->mail_op_queue) {
g_printerr ("modest: cannot create modest mail operation queue instance\n");
return;
if (!priv->mail_op_queue) {
g_printerr ("modest: cannot create modest mail operation queue instance\n");
return;
- }
-}
-
+ }
-static void
-check_object_is_dead (GObject *obj, gchar *name)
-{
- if (G_IS_OBJECT(obj))
- g_warning ("BUG: %s still has %d ref(s)\n", name, obj->ref_count);
+ priv->window_mgr = modest_window_mgr_new ();
+ if (!priv->window_mgr) {
+ g_printerr ("modest: cannot create modest window manager instance\n");
+ return;
+ }
}
static void
modest_singletons_finalize (GObject *obj)
{
ModestSingletonsPrivate *priv;
}
static void
modest_singletons_finalize (GObject *obj)
{
ModestSingletonsPrivate *priv;
- gboolean debug = modest_runtime_get_debug_flags() & MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS;
priv = MODEST_SINGLETONS_GET_PRIVATE(obj);
if (priv->account_store) {
g_object_unref (G_OBJECT(priv->account_store));
priv = MODEST_SINGLETONS_GET_PRIVATE(obj);
if (priv->account_store) {
g_object_unref (G_OBJECT(priv->account_store));
- if (debug)
- check_object_is_dead ((GObject*)priv->account_store,
- "priv->account_store");
+ modest_runtime_verify_object_death(priv->account_store,"");
priv->account_store = NULL;
}
if (priv->account_mgr) {
g_object_unref (G_OBJECT(priv->account_mgr));
priv->account_store = NULL;
}
if (priv->account_mgr) {
g_object_unref (G_OBJECT(priv->account_mgr));
- if (debug)
- check_object_is_dead ((GObject*)priv->account_mgr,
- "priv->account_mgr");
+ modest_runtime_verify_object_death(priv->account_mgr,"");
priv->account_mgr = NULL;
}
if (priv->conf) {
g_object_unref (G_OBJECT(priv->conf));
priv->account_mgr = NULL;
}
if (priv->conf) {
g_object_unref (G_OBJECT(priv->conf));
- if (debug)
- check_object_is_dead ((GObject*)priv->conf,
- "priv->conf");
+ modest_runtime_verify_object_death(priv->conf,"");
priv->conf = NULL;
}
if (priv->cache_mgr) {
g_object_unref (G_OBJECT(priv->cache_mgr));
priv->conf = NULL;
}
if (priv->cache_mgr) {
g_object_unref (G_OBJECT(priv->cache_mgr));
- if (debug)
- check_object_is_dead ((GObject*)priv->cache_mgr,
- "priv->cache_mgr");
+ modest_runtime_verify_object_death(priv->cache_mgr,"");
priv->cache_mgr = NULL;
}
if (priv->device) {
g_object_unref (G_OBJECT(priv->device));
priv->cache_mgr = NULL;
}
if (priv->device) {
g_object_unref (G_OBJECT(priv->device));
- if (debug)
- check_object_is_dead ((GObject*)priv->cache_mgr,
- "priv->device");
+ modest_runtime_verify_object_death(priv->device,"");
priv->device = NULL;
}
if (priv->platform_fact) {
g_object_unref (G_OBJECT(priv->platform_fact));
priv->device = NULL;
}
if (priv->platform_fact) {
g_object_unref (G_OBJECT(priv->platform_fact));
- if (debug)
- check_object_is_dead ((GObject*)priv->cache_mgr,
- "priv->platform_fact");
+ modest_runtime_verify_object_death(priv->platform_fact,"");
priv->platform_fact = NULL;
}
priv->platform_fact = NULL;
}
-
+ if (priv->mail_op_queue) {
+ g_object_unref (G_OBJECT(priv->mail_op_queue));
+ modest_runtime_verify_object_death(priv->mail_op_queue,"");
+ priv->mail_op_queue = NULL;
+ }
+ if (priv->window_mgr) {
+ g_object_unref (G_OBJECT(priv->window_mgr));
+ modest_runtime_verify_object_death(priv->window_mgr,"");
+ priv->window_mgr = NULL;
+ }
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
@@
-286,3
+283,10
@@
modest_singletons_get_platform_factory (ModestSingletons *self)
g_return_val_if_fail (self, NULL);
return MODEST_SINGLETONS_GET_PRIVATE(self)->platform_fact;
}
g_return_val_if_fail (self, NULL);
return MODEST_SINGLETONS_GET_PRIVATE(self)->platform_fact;
}
+
+ModestWindowMgr*
+modest_singletons_get_window_mgr (ModestSingletons *self)
+{
+ g_return_val_if_fail (self, NULL);
+ return MODEST_SINGLETONS_GET_PRIVATE(self)->window_mgr;
+}