[Galago-commits] r1976 - in branches/libgalago/glib-port: .
libgalago
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Wed Jun 22 23:26:45 PDT 2005
Author: chipx86
Date: 2005-06-22 23:26:38 -0700 (Wed, 22 Jun 2005)
New Revision: 1976
Modified:
branches/libgalago/glib-port/ChangeLog
branches/libgalago/glib-port/libgalago/galago-account.c
Log:
Make GalagoAccount mostly compile, except for the lack of a GALAGO_TYPE_PRESENCE macro currently.
Modified: branches/libgalago/glib-port/ChangeLog
===================================================================
--- branches/libgalago/glib-port/ChangeLog 2005-06-23 06:19:57 UTC (rev 1975)
+++ branches/libgalago/glib-port/ChangeLog 2005-06-23 06:26:38 UTC (rev 1976)
@@ -1,3 +1,9 @@
+Wed Jun 22 23:25:27 PDT 2005 Christian Hammond <chipx86 at chipx86.com>
+
+ * libgalago/galago-account.c:
+ - Make GalagoAccount mostly compile, except for the lack of a
+ GALAGO_TYPE_PRESENCE macro currently.
+
Wed Jun 22 23:18:51 PDT 2005 Christian Hammond <chipx86 at chipx86.com>
* libgalago/galago-service.c:
Modified: branches/libgalago/glib-port/libgalago/galago-account.c
===================================================================
--- branches/libgalago/glib-port/libgalago/galago-account.c 2005-06-23 06:19:57 UTC (rev 1975)
+++ branches/libgalago/glib-port/libgalago/galago-account.c 2005-06-23 06:26:38 UTC (rev 1976)
@@ -380,7 +380,7 @@
account->priv->connected = connected;
- galago_signal_context_freeze(signal_context);
+ /* TODO: Freeze signals */
presence = galago_account_get_presence(account, FALSE);
@@ -392,7 +392,7 @@
if (presence != NULL)
{
- galago_context_push(galago_object_get_context(presence));
+ galago_context_push(galago_object_get_context(GALAGO_OBJECT(presence)));
if (connected)
{
@@ -419,7 +419,7 @@
galago_context_pop();
}
- galago_signal_context_thaw(signal_context);
+ /* TODO: Thaw signals */
if (galago_account_is_native(account) && galago_is_connected() &&
galago_core_is_feed())
@@ -430,8 +430,7 @@
NULL);
}
- galago_signal_emit(account, (connected ? "connected" : "disconnected"));
- galago_signal_emit(account, "updated");
+ g_signal_emit(account, signals[connected ? CONNECTED : DISCONNECTED], 0);
}
GalagoService *
@@ -534,8 +533,7 @@
NULL);
}
- galago_signal_emit(account, "display-name-changed");
- galago_signal_emit(account, "updated");
+ g_signal_emit(account, signals[DISPLAY_NAME_CHANGED], 0);
}
const char *
@@ -594,8 +592,7 @@
if (galago_account_is_native(account))
_galago_dbus_account_add_contact(account, contact);
- galago_signal_emit(account, "contact-added", contact);
- galago_signal_emit(account, "updated");
+ g_signal_emit(account, signals[CONTACT_ADDED], 0, contact);
}
void
@@ -616,14 +613,12 @@
galago_core_is_feed())
{
galago_dbus_send_message(account, "RemoveContact",
- galago_value_new(GALAGO_VALUE_TYPE_OBJECT,
- &contact,
- GALAGO_TYPE_ACCOUNT),
+ galago_value_new_object(GALAGO_TYPE_ACCOUNT,
+ G_OBJECT(contact)),
NULL);
}
- galago_signal_emit(account, "contact-removed", contact);
- galago_signal_emit(account, "updated");
+ g_signal_emit(account, signals[CONTACT_REMOVED], 0, contact);
}
GalagoAccount *
@@ -647,17 +642,15 @@
!galago_account_is_native(account) && !galago_is_daemon() &&
galago_is_connected())
{
- GalagoSignalContext *signal_context = GALAGO_SIGNAL_CONTEXT(account);
+ galago_context_push(galago_object_get_context(GALAGO_OBJECT(account)));
+ /* TODO: Freeze signals */
- galago_context_push(galago_object_get_context(account));
- galago_signal_context_freeze(signal_context);
-
contact = galago_dbus_send_message_with_reply(account, "GetContact",
- galago_value_new(GALAGO_VALUE_TYPE_OBJECT, NULL, GALAGO_TYPE_ACCOUNT),
+ galago_value_new_object(GALAGO_TYPE_ACCOUNT, NULL),
galago_value_new(GALAGO_VALUE_TYPE_STRING, &username, NULL),
NULL);
- galago_signal_context_thaw(signal_context);
+ /* TODO: Thaw signals */
galago_context_pop();
}
@@ -673,19 +666,18 @@
if (query && !galago_account_is_native(account) && !galago_is_daemon() &&
galago_is_connected())
{
- GalagoSignalContext *signal_context = GALAGO_SIGNAL_CONTEXT(account);
GList *temp;
- galago_context_push(galago_object_get_context(account));
- galago_signal_context_freeze(signal_context);
+ galago_context_push(galago_object_get_context(GALAGO_OBJECT(account)));
+ /* TODO: Freeze signals */
temp = galago_dbus_send_message_with_reply(account, "GetContacts",
- galago_value_new_list(GALAGO_VALUE_TYPE_OBJECT, NULL,
- GALAGO_TYPE_ACCOUNT),
+ galago_value_new_list(GALAGO_TYPE_OBJECT, NULL,
+ (void *)GALAGO_TYPE_ACCOUNT),
NULL);
g_list_free(temp);
- galago_signal_context_thaw(signal_context);
+ /* TODO: Thaw signals */
galago_context_pop();
}
@@ -715,8 +707,7 @@
if (galago_account_is_native(account))
_galago_dbus_account_set_presence(account, presence);
- galago_signal_emit(account, "presence-set", presence);
- galago_signal_emit(account, "updated");
+ g_signal_emit(account, signals[PRESENCE_SET], 0, presence);
}
GalagoPresence *
@@ -729,15 +720,12 @@
!galago_account_is_native(account) && !galago_is_daemon() &&
galago_is_connected())
{
- GalagoSignalContext *signal_context = GALAGO_SIGNAL_CONTEXT(account);
-
- galago_signal_context_freeze(signal_context);
+ /* TODO: Freeze signals */
account->priv->presence =
galago_dbus_send_message_with_reply(account, "GetPresence",
- galago_value_new(GALAGO_VALUE_TYPE_OBJECT, NULL,
- GALAGO_TYPE_PRESENCE),
+ galago_value_new_object(GALAGO_TYPE_PRESENCE, NULL),
NULL);
- galago_signal_context_thaw(signal_context);
+ /* TODO: Thaw signals */
}
return account->priv->presence;
@@ -766,8 +754,7 @@
if (galago_account_is_native(account))
_galago_dbus_account_set_avatar(account, avatar);
- galago_signal_emit(account, "avatar-set", avatar);
- galago_signal_emit(account, "updated");
+ g_signal_emit(account, signals[AVATAR_SET], 0, avatar);
}
GalagoAvatar *
@@ -780,15 +767,12 @@
!galago_account_is_native(account) && !galago_is_daemon() &&
galago_is_connected())
{
- GalagoSignalContext *signal_context = GALAGO_SIGNAL_CONTEXT(account);
-
- galago_signal_context_freeze(signal_context);
+ /* TODO: Freeze signals */
account->priv->avatar =
galago_dbus_send_message_with_reply(account, "GetAvatar",
- galago_value_new(GALAGO_VALUE_TYPE_OBJECT, NULL,
- GALAGO_TYPE_AVATAR),
+ galago_value_new_object(GALAGO_TYPE_AVATAR, NULL),
NULL);
- galago_signal_context_thaw(signal_context);
+ /* TODO: Thaw signals */
}
return account->priv->avatar;
@@ -812,9 +796,8 @@
else
{
galago_dbus_send_message(account, "SetPresence",
- galago_value_new(GALAGO_VALUE_TYPE_OBJECT,
- &presence,
- GALAGO_TYPE_PRESENCE),
+ galago_value_new_object(GALAGO_TYPE_PRESENCE,
+ G_OBJECT(presence)),
NULL);
}
}
@@ -832,9 +815,8 @@
else
{
galago_dbus_send_message(account, "SetAvatar",
- galago_value_new(GALAGO_VALUE_TYPE_OBJECT,
- &avatar,
- GALAGO_TYPE_AVATAR),
+ galago_value_new_object(GALAGO_TYPE_AVATAR,
+ G_OBJECT(avatar)),
NULL);
}
}
@@ -847,7 +829,7 @@
return;
galago_dbus_send_message(account, "AddContact",
- galago_value_new(GALAGO_VALUE_TYPE_OBJECT, &contact,
- GALAGO_TYPE_ACCOUNT),
+ galago_value_new_object(GALAGO_TYPE_ACCOUNT,
+ G_OBJECT(contact)),
NULL);
}
More information about the galago-commits
mailing list