[gnome-control-center/gnome-3-2] region: Simplify getting the current Locale
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/gnome-3-2] region: Simplify getting the current Locale
- Date: Thu, 29 Sep 2011 15:54:14 +0000 (UTC)
commit 1c5c8a71759b13bdb63deb7f01c80a54749e2ee5
Author: Bastien Nocera <hadess hadess net>
Date: Thu Sep 29 15:17:59 2011 +0100
region: Simplify getting the current Locale
panels/region/gnome-region-panel-system.c | 27 +++------------------------
1 files changed, 3 insertions(+), 24 deletions(-)
---
diff --git a/panels/region/gnome-region-panel-system.c b/panels/region/gnome-region-panel-system.c
index a0e26bf..1169950 100644
--- a/panels/region/gnome-region-panel-system.c
+++ b/panels/region/gnome-region-panel-system.c
@@ -147,28 +147,10 @@ on_localed_properties_changed (GDBusProxy *proxy,
const gchar **invalidated_properties,
GtkBuilder *dialog)
{
- GVariant *res;
GVariant *v;
- GError *error = NULL;
-
- res = g_dbus_connection_call_sync (g_dbus_proxy_get_connection (proxy),
- g_dbus_proxy_get_name (proxy),
- g_dbus_proxy_get_object_path (proxy),
- "org.freedesktop.DBus.Properties",
- "Get",
- g_variant_new ("(ss)",
- g_dbus_proxy_get_interface_name (proxy),
- "Locale"),
- NULL,
- G_DBUS_CALL_FLAGS_NONE,
- -1, NULL, &error);
- if (!res) {
- g_warning ("Failed to call Get method: %s", error->message);
- g_error_free (error);
- return;
- }
- v = g_variant_get_child_value (res, 0);
+ v = g_dbus_proxy_get_cached_property (proxy, "Locale");
+
if (v) {
const gchar **strv;
gsize len;
@@ -176,10 +158,8 @@ on_localed_properties_changed (GDBusProxy *proxy,
const gchar *lang, *messages, *time;
gchar *name;
GtkWidget *label;
- GVariant *v2;
- v2 = g_variant_get_variant (v);
- strv = g_variant_get_strv (v2, &len);
+ strv = g_variant_get_strv (v, &len);
lang = messages = time = NULL;
for (i = 0; strv[i]; i++) {
@@ -217,7 +197,6 @@ on_localed_properties_changed (GDBusProxy *proxy,
}
g_variant_unref (v);
}
- g_variant_unref (res);
update_copy_button (dialog);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]