[mb-commits] r8247 - in libmusicbrainz/branches/xmlws: examples src

Author: luks
Date: 2006-07-22 19:29:52 +0000 (Sat, 22 Jul 2006)
New Revision: 8247

Modified:
   libmusicbrainz/branches/xmlws/examples/findartist.cpp
   libmusicbrainz/branches/xmlws/examples/findtrack.cpp
   libmusicbrainz/branches/xmlws/examples/getartist.cpp
   libmusicbrainz/branches/xmlws/examples/getartist_c.c
   libmusicbrainz/branches/xmlws/examples/getuser.cpp
   libmusicbrainz/branches/xmlws/src/webservice.cpp
Log:
Removing WebService::init() from the examples. Compatibility with libneon 0.25

Modified: libmusicbrainz/branches/xmlws/examples/findartist.cpp
===================================================================
--- libmusicbrainz/branches/xmlws/examples/findartist.cpp       2006-07-22 
18:52:44 UTC (rev 8246)
+++ libmusicbrainz/branches/xmlws/examples/findartist.cpp       2006-07-22 
19:29:52 UTC (rev 8247)
@@ -16,8 +16,6 @@
 int
 main(int argc, char **argv)
 {
-       WebService::init();
-       
        if (argc < 2) {
                cout << "Usage: findartist 'artist name'" << endl;
                return 1;

Modified: libmusicbrainz/branches/xmlws/examples/findtrack.cpp
===================================================================
--- libmusicbrainz/branches/xmlws/examples/findtrack.cpp        2006-07-22 
18:52:44 UTC (rev 8246)
+++ libmusicbrainz/branches/xmlws/examples/findtrack.cpp        2006-07-22 
19:29:52 UTC (rev 8247)
@@ -16,8 +16,6 @@
 int
 main(int argc, char **argv)
 {
-       WebService::init();
-       
        if (argc < 2) {
                cout << "Usage: findtrack 'track name' ['artist name']"  << 
endl;
                return 1;

Modified: libmusicbrainz/branches/xmlws/examples/getartist.cpp
===================================================================
--- libmusicbrainz/branches/xmlws/examples/getartist.cpp        2006-07-22 
18:52:44 UTC (rev 8246)
+++ libmusicbrainz/branches/xmlws/examples/getartist.cpp        2006-07-22 
19:29:52 UTC (rev 8247)
@@ -16,8 +16,6 @@
 int
 main(int argc, char **argv)
 {
-       WebService::init();
-       
        if (argc < 2) {
                cout << "Usage: getartist 'artist id'" << endl;
                return 1;

Modified: libmusicbrainz/branches/xmlws/examples/getartist_c.c
===================================================================
--- libmusicbrainz/branches/xmlws/examples/getartist_c.c        2006-07-22 
18:52:44 UTC (rev 8246)
+++ libmusicbrainz/branches/xmlws/examples/getartist_c.c        2006-07-22 
19:29:52 UTC (rev 8247)
@@ -21,8 +21,6 @@
                return 1;
        }
        
-       mb_webservice_init();
-       
        query = mb_query_new(NULL, NULL);
        
        artist = mb_query_get_artist_by_id(query, argv[1], NULL);

Modified: libmusicbrainz/branches/xmlws/examples/getuser.cpp
===================================================================
--- libmusicbrainz/branches/xmlws/examples/getuser.cpp  2006-07-22 18:52:44 UTC 
(rev 8246)
+++ libmusicbrainz/branches/xmlws/examples/getuser.cpp  2006-07-22 19:29:52 UTC 
(rev 8247)
@@ -17,8 +17,6 @@
 int
 main(int argc, char **argv)
 {
-       WebService::init();
-       
        string username;
        cout << "User name: ";
        cin >> username;

Modified: libmusicbrainz/branches/xmlws/src/webservice.cpp
===================================================================
--- libmusicbrainz/branches/xmlws/src/webservice.cpp    2006-07-22 18:52:44 UTC 
(rev 8246)
+++ libmusicbrainz/branches/xmlws/src/webservice.cpp    2006-07-22 19:29:52 UTC 
(rev 8247)
@@ -79,6 +79,8 @@
                                systemProxyHost = string(uri.host); 
                        if (uri.port)
                                systemProxyPort = uri.port;
+// neon 0.26
+#ifdef NE_FEATURE_I18N 
                        if (uri.userinfo) {
                                char *pos = strchr(uri.userinfo, ':');
                                if (pos) {
@@ -90,6 +92,20 @@
                                        systemProxyUserName = 
string(uri.userinfo);
                                }
                        }
+// neon 0.25
+#else
+                       if (uri.authinfo) {
+                               char *pos = strchr(uri.authinfo, ':');
+                               if (pos) {
+                                       *pos = '\0';
+                                       systemProxyUserName = 
string(uri.authinfo);
+                                       systemProxyPassword = string(pos + 1);
+                               }
+                               else {
+                                       systemProxyUserName = 
string(uri.authinfo);
+                               }
+                       }
+#endif
                }
                ne_uri_free(&uri);
        }