equal
deleted
inserted
replaced
111 static void* gconf_client = NULL; |
111 static void* gconf_client = NULL; |
112 static int use_gproxyResolver = 0; |
112 static int use_gproxyResolver = 0; |
113 static int use_gconf = 0; |
113 static int use_gconf = 0; |
114 |
114 |
115 |
115 |
116 static int initGConf() { |
116 static int initGConf(void) { |
117 /** |
117 /** |
118 * Let's try to load GConf-2 library |
118 * Let's try to load GConf-2 library |
119 */ |
119 */ |
120 if (dlopen(JNI_LIB_NAME("gconf-2"), RTLD_GLOBAL | RTLD_LAZY) != NULL || |
120 if (dlopen(JNI_LIB_NAME("gconf-2"), RTLD_GLOBAL | RTLD_LAZY) != NULL || |
121 dlopen(VERSIONED_JNI_LIB_NAME("gconf-2", "4"), |
121 dlopen(VERSIONED_JNI_LIB_NAME("gconf-2", "4"), |
296 } |
296 } |
297 |
297 |
298 return proxy_array; |
298 return proxy_array; |
299 } |
299 } |
300 |
300 |
301 static int initGProxyResolver() { |
301 static int initGProxyResolver(void) { |
302 void *gio_handle; |
302 void *gio_handle; |
303 |
303 |
304 gio_handle = dlopen("libgio-2.0.so", RTLD_LAZY); |
304 gio_handle = dlopen("libgio-2.0.so", RTLD_LAZY); |
305 if (!gio_handle) { |
305 if (!gio_handle) { |
306 gio_handle = dlopen("libgio-2.0.so.0", RTLD_LAZY); |
306 gio_handle = dlopen("libgio-2.0.so.0", RTLD_LAZY); |