diff options
| author | Ted Gould <ted@gould.cx> | 2010-08-27 17:01:44 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-08-27 17:01:44 -0500 |
| commit | 269394626c220667e6390217022de08dc8a00333 (patch) | |
| tree | 3ad60298fdd1babe803c946a8ec9cb67071949a9 /libdbusmenu-glib/client.c | |
| parent | 803503589b2e0ec2a66c64a38307a95a20a2519f (diff) | |
| parent | 8ea939e19d5f50d020e33a08237105a96ed4ae30 (diff) | |
| download | libdbusmenu-269394626c220667e6390217022de08dc8a00333.tar.gz libdbusmenu-269394626c220667e6390217022de08dc8a00333.tar.bz2 libdbusmenu-269394626c220667e6390217022de08dc8a00333.zip | |
* Upstream Merge
* Changing the timeouts
Diffstat (limited to 'libdbusmenu-glib/client.c')
| -rw-r--r-- | libdbusmenu-glib/client.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 3f06618..ca16c9a 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -876,7 +876,6 @@ build_proxies (DbusmenuClient * client) } g_object_add_weak_pointer(G_OBJECT(priv->menuproxy), (gpointer *)&priv->menuproxy); g_signal_connect(G_OBJECT(priv->menuproxy), "destroy", G_CALLBACK(proxy_destroyed), client); - dbus_g_proxy_set_default_timeout(priv->menuproxy, 2000); /* If we get here, we don't need the DBus proxy */ if (priv->dbusproxy != NULL) { @@ -1104,7 +1103,12 @@ dbusmenu_client_send_event (DbusmenuClient * client, gint id, const gchar * name g_value_copy(value, &edata->data); edata->timestamp = timestamp; - org_ayatana_dbusmenu_event_async (priv->menuproxy, id, name, value, timestamp, menuitem_call_cb, edata); + DBusGAsyncData *stuff; + stuff = g_slice_new (DBusGAsyncData); + stuff->cb = G_CALLBACK (menuitem_call_cb); + stuff->userdata = edata; + dbus_g_proxy_begin_call_with_timeout (priv->menuproxy, "Event", org_ayatana_dbusmenu_event_async_callback, stuff, _dbus_glib_async_data_free, 1000, G_TYPE_INT, id, G_TYPE_STRING, name, G_TYPE_VALUE, value, G_TYPE_UINT, timestamp, G_TYPE_INVALID); + return; } |