luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 01:06:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

GDBus: Don't take a GError for g_dbus_proxy_get_cached_property_names()

Browse Source 
We stopped doing this for get_cached_property() so no reason to do it
here.

Signed-off-by: David Zeuthen <davidz@redhat.com>
This commit is contained in:
David Zeuthen 2010-05-13 17:10:15 -04:00
parent 3ca28ef718
commit 0e2c708bb2
3 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gio/gdbusproxy.c
View File

@ -445,6 +445,10 @@ static void
g_dbus_proxy_init (GDBusProxy *proxy) g_dbus_proxy_init (GDBusProxy *proxy)
{ {
proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, G_TYPE_DBUS_PROXY, GDBusProxyPrivate); proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, G_TYPE_DBUS_PROXY, GDBusProxyPrivate);
proxy->priv->properties = g_hash_table_new_full (g_str_hash,
g_str_equal,
g_free,
(GDestroyNotify) g_variant_unref);
} }
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */
@ -452,18 +456,16 @@ g_dbus_proxy_init (GDBusProxy *proxy)
/** /**
* g_dbus_proxy_get_cached_property_names: * g_dbus_proxy_get_cached_property_names:
* @proxy: A #GDBusProxy. * @proxy: A #GDBusProxy.
* @error: Return location for error or %NULL.
* *
* Gets the names of all cached properties on @proxy. * Gets the names of all cached properties on @proxy.
* *
* Returns: A %NULL-terminated array of strings or %NULL if @error is set. Free with * Returns: A %NULL-terminated array of strings or %NULL if @proxy has
* g_strfreev(). * no cached properties. Free the returned array with g_strfreev().
* *
* Since: 2.26 * Since: 2.26
*/ */
gchar ** gchar **
g_dbus_proxy_get_cached_property_names (GDBusProxy *proxy, g_dbus_proxy_get_cached_property_names (GDBusProxy *proxy)
GError **error)
{ {
gchar **names; gchar **names;
GPtrArray *p; GPtrArray *p;
@ -471,18 +473,10 @@ g_dbus_proxy_get_cached_property_names (GDBusProxy *proxy,
const gchar *key; const gchar *key;
g_return_val_if_fail (G_IS_DBUS_PROXY (proxy), NULL); g_return_val_if_fail (G_IS_DBUS_PROXY (proxy), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
names = NULL; names = NULL;
if (g_hash_table_size (proxy->priv->properties) == 0)
if (proxy->priv->flags & G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES) goto out;
{
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
_("Properties are not available (proxy created with G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES)"));
goto out;
}
p = g_ptr_array_new (); p = g_ptr_array_new ();
@ -790,11 +784,6 @@ process_get_all_reply (GDBusProxy *proxy,
goto out; goto out;
} }
proxy->priv->properties = g_hash_table_new_full (g_str_hash,
g_str_equal,
g_free,
(GDestroyNotify) g_variant_unref);
g_variant_iter_init (&iter, g_variant_get_child_value (result, 0)); g_variant_iter_init (&iter, g_variant_get_child_value (result, 0));
while ((item = g_variant_iter_next_value (&iter)) != NULL) while ((item = g_variant_iter_next_value (&iter)) != NULL)
{ {

3
gio/gdbusproxy.h
View File

@ -127,8 +127,7 @@ GVariant *g_dbus_proxy_get_cached_property (GDBusProxy *pr
void g_dbus_proxy_set_cached_property (GDBusProxy *proxy, void g_dbus_proxy_set_cached_property (GDBusProxy *proxy,
const gchar *property_name, const gchar *property_name,
GVariant *value); GVariant *value);
gchar **g_dbus_proxy_get_cached_property_names (GDBusProxy *proxy, gchar **g_dbus_proxy_get_cached_property_names (GDBusProxy *proxy);
GError **error);
void g_dbus_proxy_call (GDBusProxy *proxy, void g_dbus_proxy_call (GDBusProxy *proxy,
const gchar *method_name, const gchar *method_name,
GVariant *parameters, GVariant *parameters,

2
gio/tests/gdbus-example-watch-proxy.c
View File

@ -26,7 +26,7 @@ print_properties (GDBusProxy *proxy)
g_print (" properties:\n"); g_print (" properties:\n");
property_names = g_dbus_proxy_get_cached_property_names (proxy, NULL); property_names = g_dbus_proxy_get_cached_property_names (proxy);
for (n = 0; property_names != NULL && property_names[n] != NULL; n++) for (n = 0; property_names != NULL && property_names[n] != NULL; n++)
{ {
const gchar *key = property_names[n]; const gchar *key = property_names[n];