Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
svn path=/trunk/; revision=2181
dispatcher_update_account (dispatcher, account);
}
dispatcher_update_account (dispatcher, account);
}
+
+static GObject*
+dispatcher_constructor (GType type, guint n_construct_params,
+ GObjectConstructParam *construct_params)
+{
+ GObject *retval;
+
+ if (dispatcher == NULL)
+ {
+ retval = G_OBJECT_CLASS (empathy_dispatcher_parent_class)->constructor
+ (type, n_construct_params, construct_params);
+
+ dispatcher = EMPATHY_DISPATCHER (retval);
+ g_object_add_weak_pointer (retval, (gpointer *) &dispatcher);
+ }
+ else
+ {
+ retval = g_object_ref (dispatcher);
+ }
+
+ return retval;
+}
+
static void
dispatcher_finalize (GObject *object)
{
static void
dispatcher_finalize (GObject *object)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = dispatcher_finalize;
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = dispatcher_finalize;
+ object_class->constructor = dispatcher_constructor;
signals[OBSERVE] =
g_signal_new ("observe",
signals[OBSERVE] =
g_signal_new ("observe",
-empathy_get_dispatcher (void)
+empathy_dispatcher_dup_singleton (void)
- if (!dispatcher) {
- dispatcher = g_object_new (EMPATHY_TYPE_DISPATCHER, NULL);
- g_object_add_weak_pointer (G_OBJECT (dispatcher), (gpointer) &dispatcher);
- } else {
- g_object_ref (dispatcher);
- }
-
- return dispatcher;
+ return EMPATHY_DISPATCHER (g_object_new (EMPATHY_TYPE_DISPATCHER, NULL));
empathy_dispatcher_call_with_contact ( EmpathyContact *contact,
EmpathyDispatcherRequestCb *callback, gpointer user_data)
{
empathy_dispatcher_call_with_contact ( EmpathyContact *contact,
EmpathyDispatcherRequestCb *callback, gpointer user_data)
{
- EmpathyDispatcher *dispatcher = empathy_get_dispatcher();
+ EmpathyDispatcher *dispatcher = empathy_dispatcher_dup_singleton();
EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
McAccount *account;
TpConnection *connection;
EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
McAccount *account;
TpConnection *connection;
ConnectionData *connection_data;
DispatcherRequestData *request_data;
ConnectionData *connection_data;
DispatcherRequestData *request_data;
- dispatcher = empathy_get_dispatcher();
+ dispatcher = empathy_dispatcher_dup_singleton();
priv = GET_PRIV (dispatcher);
account = empathy_contact_get_account (contact);
priv = GET_PRIV (dispatcher);
account = empathy_contact_get_account (contact);
empathy_dispatcher_chat_with_contact_id (McAccount *account, const gchar
*contact_id, EmpathyDispatcherRequestCb *callback, gpointer user_data)
{
empathy_dispatcher_chat_with_contact_id (McAccount *account, const gchar
*contact_id, EmpathyDispatcherRequestCb *callback, gpointer user_data)
{
- EmpathyDispatcher *dispatcher = empathy_get_dispatcher ();
+ EmpathyDispatcher *dispatcher = empathy_dispatcher_dup_singleton ();
EmpathyContactFactory *factory;
EmpathyContact *contact;
EmpathyContactFactory *factory;
EmpathyContact *contact;
ConnectionData *connection_data;
const gchar *names[] = { roomname, NULL };
ConnectionData *connection_data;
const gchar *names[] = { roomname, NULL };
- dispatcher = empathy_get_dispatcher();
+ dispatcher = empathy_dispatcher_dup_singleton();
priv = GET_PRIV (dispatcher);
connection = g_hash_table_lookup (priv->accounts, account);
priv = GET_PRIV (dispatcher);
connection = g_hash_table_lookup (priv->accounts, account);
const gchar *content_type, EmpathyDispatcherRequestCb *callback,
gpointer user_data)
{
const gchar *content_type, EmpathyDispatcherRequestCb *callback,
gpointer user_data)
{
- EmpathyDispatcher *dispatcher = empathy_get_dispatcher();
+ EmpathyDispatcher *dispatcher = empathy_dispatcher_dup_singleton();
EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
McAccount *account = empathy_contact_get_account (contact);
TpConnection *connection = g_hash_table_lookup (priv->accounts, account);
EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
McAccount *account = empathy_contact_get_account (contact);
TpConnection *connection = g_hash_table_lookup (priv->accounts, account);
gpointer user_data);
/* Get the dispatcher singleton */
gpointer user_data);
/* Get the dispatcher singleton */
-EmpathyDispatcher * empathy_get_dispatcher (void);
+EmpathyDispatcher * empathy_dispatcher_dup_singleton (void);
GType empathy_dispatcher_tube_get_type (void);
/* tube stuff */
GType empathy_dispatcher_tube_get_type (void);
/* tube stuff */
- priv->dispatcher = empathy_get_dispatcher ();
+ priv->dispatcher = empathy_dispatcher_dup_singleton ();
priv->contact_manager = empathy_contact_manager_dup_singleton ();
g_signal_connect (priv->dispatcher, "approve",
G_CALLBACK (event_manager_approve_channel_cb), manager);
priv->contact_manager = empathy_contact_manager_dup_singleton ();
g_signal_connect (priv->dispatcher, "approve",
G_CALLBACK (event_manager_approve_channel_cb), manager);
- dispatcher = empathy_get_dispatcher ();
+ dispatcher = empathy_dispatcher_dup_singleton ();
g_signal_connect (dispatcher, "dispatch", G_CALLBACK (dispatch_cb), NULL);
gtk_main ();
g_signal_connect (dispatcher, "dispatch", G_CALLBACK (dispatch_cb), NULL);
gtk_main ();