diff options
author | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2013-02-09 21:59:21 +0000 |
---|---|---|
committer | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2013-02-09 21:59:21 +0000 |
commit | 54f7afd8c773738597b0d0c29b65f4dfc43f3f36 (patch) | |
tree | 3d1727ddd789761258972efa153ea601d12b6434 | |
parent | 32628be6f7630c6b69becdafd1dd40201ed05cc2 (diff) | |
download | libproxy-git-54f7afd8c773738597b0d0c29b65f4dfc43f3f36.tar.gz |
pxgsettings: rename "client" object to "settings", to follow GSettings guidelines and forget GConf
-rw-r--r-- | libproxy/modules/pxgsettings.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libproxy/modules/pxgsettings.cpp b/libproxy/modules/pxgsettings.cpp index bc173c1..580a652 100644 --- a/libproxy/modules/pxgsettings.cpp +++ b/libproxy/modules/pxgsettings.cpp @@ -143,22 +143,22 @@ int main(int argc, char **argv) { g_io_add_watch(outchan, G_IO_ERR, err, NULL); g_io_add_watch(outchan, G_IO_HUP, err, NULL); - // Get GConf client - GSettings* client; + // Get GSettings obkecy + GSettings* settings; for (int i=1; i<argc; i++) { - client = g_settings_new(argv[i]); - gchar** keys = g_settings_list_keys(client); - for (int j=0; keys[j]; on_value_change(client, keys[j++],argv[i] )); - g_signal_connect(client, "changed::", (GCallback) on_value_change, argv[i]); + settings = g_settings_new(argv[i]); + gchar** keys = g_settings_list_keys(settings); + for (int j=0; keys[j]; on_value_change(settings, keys[j++],argv[i] )); + g_signal_connect(settings, "changed::", (GCallback) on_value_change, argv[i]); } g_main_loop_run(loop); // Cleanup - while (G_IS_OBJECT(client)) { - g_object_unref(client); + while (G_IS_OBJECT(settings)) { + g_object_unref(settings); } g_io_channel_shutdown(inchan, FALSE, NULL); g_io_channel_shutdown(outchan, FALSE, NULL); |