[pulseaudio-commits] 2 commits - src/modules

[Tanu Kaskinen]

 src/modules/gconf/gconf-helper.c |    2 ++
 src/modules/gconf/module-gconf.c |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c78860c97bf896c40bb1d8750835c40deeb198d1
Author: Arun Raghavan <arun at accosted.net>
Date:   Tue Apr 22 13:05:19 2014 +0530

    gconf: Avoid calling deprecated function if possible
    
    g_type_init() is need no longer be called explicitly from glib 2.36
    onwards.

diff --git a/src/modules/gconf/gconf-helper.c b/src/modules/gconf/gconf-helper.c
index fbd8cfd..3c1180c 100644
--- a/src/modules/gconf/gconf-helper.c
+++ b/src/modules/gconf/gconf-helper.c
@@ -99,7 +99,9 @@ int main(int argc, char *argv[]) {
     GConfClient *client;
     GSList *modules, *m;
 
+#if !GLIB_CHECK_VERSION(2,36,0)
     g_type_init();
+#endif
 
     if (!(client = gconf_client_get_default()))
         goto fail;

commit a30650d2cee26b4d21c7ac8c4b8cedb7b89c5663
Author: Arun Raghavan <arun at accosted.net>
Date:   Tue Apr 22 13:05:18 2014 +0530

    gconf: Remove unused variable

diff --git a/src/modules/gconf/module-gconf.c b/src/modules/gconf/module-gconf.c
index 3885746..d791b00 100644
--- a/src/modules/gconf/module-gconf.c
+++ b/src/modules/gconf/module-gconf.c
@@ -284,7 +284,6 @@ static int handle_event(struct userdata *u) {
 
             case '-': {
                 char *name;
-                struct module_info *m;
 
                 if (!(name = read_string(u)))
                     goto fail;