[Telepathy-commits] [telepathy-glib/master] examples: use convenient sliced-GValue constructors

[Simon McVittie]

---
 examples/client/extended-client.c           |    5 +----
 examples/cm/channelspecific/room-manager.c  |   11 ++++-------
 examples/cm/echo-message-parts/im-manager.c |   12 ++++--------
 examples/cm/echo/im-manager.c               |   11 ++++-------
 4 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/examples/client/extended-client.c b/examples/client/extended-client.c
index e380302..42dd1d7 100644
--- a/examples/client/extended-client.c
+++ b/examples/client/extended-client.c
@@ -53,7 +53,6 @@ conn_ready (TpConnection *conn,
   GPtrArray *hats;
   guint i;
   GHashTable *asv;
-  GValue *value;
 
   if (!tp_proxy_has_interface_by_id (conn,
         EXAMPLE_IFACE_QUARK_CONNECTION_INTERFACE_HATS))
@@ -76,10 +75,8 @@ conn_ready (TpConnection *conn,
 
   asv = g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
       (GDestroyNotify) tp_g_value_slice_free);
-  value = tp_g_value_slice_new (G_TYPE_STRING);
-  g_value_set_static_string (value, "Shadowman");
   g_hash_table_insert (asv, "previous-owner",
-      value);
+      tp_g_value_slice_new_static_string ("Shadowman"));
   example_cli_connection_interface_hats_run_set_hat (conn, -1,
       "red", EXAMPLE_HAT_STYLE_FEDORA, asv, &error, NULL);
   g_hash_table_destroy (asv);
diff --git a/examples/cm/channelspecific/room-manager.c b/examples/cm/channelspecific/room-manager.c
index 7666927..6853354 100644
--- a/examples/cm/channelspecific/room-manager.c
+++ b/examples/cm/channelspecific/room-manager.c
@@ -264,15 +264,12 @@ example_csh_room_manager_foreach_channel_class (TpChannelManager *manager,
 {
     GHashTable *table = g_hash_table_new_full (g_str_hash, g_str_equal,
         NULL, (GDestroyNotify) tp_g_value_slice_free);
-    GValue *value;
 
-    value = tp_g_value_slice_new (G_TYPE_STRING);
-    g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_TEXT);
-    g_hash_table_insert (table, TP_IFACE_CHANNEL ".ChannelType", value);
+    g_hash_table_insert (table, TP_IFACE_CHANNEL ".ChannelType",
+        tp_g_value_slice_new_static_string (TP_IFACE_CHANNEL_TYPE_TEXT));
 
-    value = tp_g_value_slice_new (G_TYPE_UINT);
-    g_value_set_uint (value, TP_HANDLE_TYPE_ROOM);
-    g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType", value);
+    g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType",
+        tp_g_value_slice_new_uint (TP_HANDLE_TYPE_ROOM));
 
     func (manager, table, allowed_properties, user_data);
 
diff --git a/examples/cm/echo-message-parts/im-manager.c b/examples/cm/echo-message-parts/im-manager.c
index 5562b30..f944e3c 100644
--- a/examples/cm/echo-message-parts/im-manager.c
+++ b/examples/cm/echo-message-parts/im-manager.c
@@ -280,15 +280,11 @@ example_echo_2_im_manager_foreach_channel_class (TpChannelManager *manager,
 {
   GHashTable *table = g_hash_table_new_full (g_str_hash, g_str_equal,
       NULL, (GDestroyNotify) tp_g_value_slice_free);
-  GValue *value;
 
-  value = tp_g_value_slice_new (G_TYPE_STRING);
-  g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_TEXT);
-  g_hash_table_insert (table, TP_IFACE_CHANNEL ".ChannelType", value);
-
-  value = tp_g_value_slice_new (G_TYPE_UINT);
-  g_value_set_uint (value, TP_HANDLE_TYPE_CONTACT);
-  g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType", value);
+  g_hash_table_insert (table, TP_IFACE_CHANNEL ".ChannelType",
+      tp_g_value_slice_new_static_string (TP_IFACE_CHANNEL_TYPE_TEXT));
+  g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType",
+      tp_g_value_slice_new_uint (TP_HANDLE_TYPE_CONTACT));
 
   func (manager, table, allowed_properties, user_data);
 
diff --git a/examples/cm/echo/im-manager.c b/examples/cm/echo/im-manager.c
index 9be1838..81c89ec 100644
--- a/examples/cm/echo/im-manager.c
+++ b/examples/cm/echo/im-manager.c
@@ -280,15 +280,12 @@ example_echo_im_manager_foreach_channel_class (TpChannelManager *manager,
 {
   GHashTable *table = g_hash_table_new_full (g_str_hash, g_str_equal,
       NULL, (GDestroyNotify) tp_g_value_slice_free);
-  GValue *value;
 
-  value = tp_g_value_slice_new (G_TYPE_STRING);
-  g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_TEXT);
-  g_hash_table_insert (table, TP_IFACE_CHANNEL ".ChannelType", value);
+  g_hash_table_insert (table, TP_IFACE_CHANNEL ".ChannelType",
+      tp_g_value_slice_new_static_string (TP_IFACE_CHANNEL_TYPE_TEXT));
 
-  value = tp_g_value_slice_new (G_TYPE_UINT);
-  g_value_set_uint (value, TP_HANDLE_TYPE_CONTACT);
-  g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType", value);
+  g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType",
+      tp_g_value_slice_new_uint (TP_HANDLE_TYPE_CONTACT));
 
   func (manager, table, allowed_properties, user_data);
 
-- 
1.5.6.5