guint properties_changed_subscriber_id;
guint signals_subscriber_id;
+
+ gboolean initialized;
};
enum
{
GDBusProxy *proxy = G_DBUS_PROXY (user_data);
+ if (!proxy->priv->initialized)
+ goto out;
+
g_signal_emit (proxy,
signals[SIGNAL_SIGNAL],
0,
sender_name,
signal_name,
parameters);
+ out:
+ ;
}
/* ---------------------------------------------------------------------------------------------------- */
GVariant *value;
error = NULL;
+ changed_properties = NULL;
+ invalidated_properties = NULL;
-#if 0 // TODO!
- /* Ignore this signal if properties are not yet available
- *
- * (can happen in the window between subscribing to PropertiesChanged() and until
- * org.freedesktop.DBus.Properties.GetAll() returns)
- */
- if (!proxy->priv->properties_available)
- return;
-#endif
+ if (!proxy->priv->initialized)
+ goto out;
if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(sa{sv}as)")))
{
g_warning ("Value for PropertiesChanged signal with type `%s' does not match `(sa{sv}as)'",
g_variant_get_type_string (parameters));
- return;
+ goto out;
}
g_variant_get (parameters,
invalidated_properties);
out:
- g_variant_unref (changed_properties);
+ if (changed_properties != NULL)
+ g_variant_unref (changed_properties);
g_free (invalidated_properties);
}
ret = FALSE;
+ subscribe_to_signals (proxy);
+
if (!(proxy->priv->flags & G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES))
{
/* load all properties synchronously */
g_variant_unref (result);
}
- subscribe_to_signals (proxy);
-
ret = TRUE;
out:
+ proxy->priv->initialized = TRUE;
return ret;
}
user_data,
NULL);
+ subscribe_to_signals (proxy);
+
if (!(proxy->priv->flags & G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES))
{
/* load all properties asynchronously */
process_get_all_reply (proxy, result);
}
- subscribe_to_signals (proxy);
-
ret = TRUE;
out:
+ proxy->priv->initialized = TRUE;
return ret;
}