diff options
| author | Ted Gould <ted@gould.cx> | 2010-08-27 16:18:49 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-08-27 16:18:49 -0500 |
| commit | 29baf47586cc0ef0da264784f5414a462f46c8f5 (patch) | |
| tree | c4a1d54f38344823e06a9f30e47fec4badb377bc /libdbusmenu-glib/client.c | |
| parent | 92e08cdf99b606521adb3fe68c19b4a81c4e469d (diff) | |
| parent | 0b3dc82b5f2885d7ef3dca837f7fa02b0e73012b (diff) | |
| download | libdbusmenu-29baf47586cc0ef0da264784f5414a462f46c8f5.tar.gz libdbusmenu-29baf47586cc0ef0da264784f5414a462f46c8f5.tar.bz2 libdbusmenu-29baf47586cc0ef0da264784f5414a462f46c8f5.zip | |
* Upstream Merge
* Fixing the passing of the value to the results signal
* Adding a test for checking event results signal
Diffstat (limited to 'libdbusmenu-glib/client.c')
| -rw-r--r-- | libdbusmenu-glib/client.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 43bde5f..3f06618 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -876,6 +876,7 @@ 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) { @@ -1058,10 +1059,10 @@ menuitem_call_cb (DBusGProxy * proxy, GError * error, gpointer userdata) event_data_t * edata = (event_data_t *)userdata; if (error != NULL) { - g_warning("Unable to call menu item %d: %s", GPOINTER_TO_INT(userdata), error->message); + g_warning("Unable to call event '%s' on menu item %d: %s", edata->event, dbusmenu_menuitem_get_id(edata->menuitem), error->message); } - g_signal_emit(edata->client, signals[EVENT_RESULT], 0, edata->menuitem, edata->event, edata->data, edata->timestamp, error, TRUE); + g_signal_emit(edata->client, signals[EVENT_RESULT], 0, edata->menuitem, edata->event, &edata->data, edata->timestamp, error, TRUE); g_value_unset(&edata->data); g_free(edata->event); |