- if (modest_signal_mgr_is_connected (priv->signal_handlers,
- G_OBJECT (priv->account_store),
- "account_inserted"))
- priv->signal_handlers = modest_signal_mgr_disconnect (priv->signal_handlers,
- G_OBJECT (priv->account_store),
- "account_inserted");
- if (modest_signal_mgr_is_connected (priv->signal_handlers,
- G_OBJECT (priv->account_store),
- "account_removed"))
- priv->signal_handlers = modest_signal_mgr_disconnect (priv->signal_handlers,
- G_OBJECT (priv->account_store),
- "account_removed");
- if (modest_signal_mgr_is_connected (priv->signal_handlers,
- G_OBJECT (priv->account_store),
- "account_changed"))
- priv->signal_handlers = modest_signal_mgr_disconnect (priv->signal_handlers,
- G_OBJECT (priv->account_store),
- "account_changed");
+ if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),
+ priv->account_inserted_signal))
+ g_signal_handler_disconnect (G_OBJECT (priv->account_store),
+ priv->account_inserted_signal);
+ if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),
+ priv->account_removed_signal))
+ g_signal_handler_disconnect (G_OBJECT (priv->account_store),
+ priv->account_removed_signal);
+ if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),
+ priv->account_changed_signal))
+ g_signal_handler_disconnect (G_OBJECT (priv->account_store),
+ priv->account_changed_signal);