[Xfce4-commits] Fix build with valac 0.7.10

[Vincent Legout]

Updating branch refs/heads/master
         to f2a9658dbb61d49567f0de93e571b1c36bca5cbb (commit)
       from 0522fd5b656c3a9a4ec5366c33cba56bf176dd52 (commit)

commit f2a9658dbb61d49567f0de93e571b1c36bca5cbb
Author: Vincent Legout <vinc...@legout.info>
Date:   Wed Feb 10 18:21:36 2010 +0800

    Fix build with valac 0.7.10
    
    Use out string instead of string* in mpdclient.vapi
    Update playlist.vala and dbbrowser.vala to reflect this change

 src/dbbrowser.vala |    4 ++--
 src/mpdclient.vapi |    6 +++---
 src/playlist.vala  |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/dbbrowser.vala b/src/dbbrowser.vala
index c29dbc4..df29ea6 100644
--- a/src/dbbrowser.vala
+++ b/src/dbbrowser.vala
@@ -151,7 +151,7 @@ namespace Xfmpc {
                                i ++;
                        }
 
-                       while (this.mpdclient.database_read (wdir, &filename, 
&basename, out is_dir)) {
+                       while (this.mpdclient.database_read (wdir, out 
filename, out basename, out is_dir)) {
                                is_bold = playlist.has_filename (filename, 
is_dir);
                                append (filename, basename, is_dir, is_bold);
 
@@ -229,7 +229,7 @@ namespace Xfmpc {
                        this.is_searching = true;
                        clear ();
 
-                       while (this.mpdclient.database_search (query, 
&filename, &basename)) {
+                       while (this.mpdclient.database_search (query, out 
filename, out basename)) {
                                is_bold = playlist.has_filename (filename, 
false);
                                append (filename, basename, false, is_bold);
                                i++;
diff --git a/src/mpdclient.vapi b/src/mpdclient.vapi
index d0c5ce0..8081147 100644
--- a/src/mpdclient.vapi
+++ b/src/mpdclient.vapi
@@ -7,9 +7,9 @@ namespace Xfmpc {
        [CCode (cheader_filename = "mpdclient.h")]
        public class Mpdclient {
                public bool connect ();
-               public bool database_read (string dir, string *filename, string 
*basename, out bool is_dir);
+               public bool database_read (string dir, out string filename, out 
string basename, out bool is_dir);
                public bool database_refresh ();
-               public bool database_search (string query, string *filename, 
string *basename);
+               public bool database_search (string query, out string filename, 
out string basename);
                public void disconnect ();
                public static unowned Xfmpc.Mpdclient get_default ();
                public unowned string get_album ();
@@ -34,7 +34,7 @@ namespace Xfmpc {
                public bool playlist_clear ();
                public int playlist_get_length ();
                public int playlist_get_total_time ();
-               public bool playlist_read (out int id, out int pos, string 
*filename, string *song, string *length);
+               public bool playlist_read (out int id, out int pos, out string 
filename, out string song, out string length);
                public bool pp ();
                public bool previous ();
                public bool queue_add (string path);
diff --git a/src/playlist.vala b/src/playlist.vala
index 74a63bd..e9a0eb4 100644
--- a/src/playlist.vala
+++ b/src/playlist.vala
@@ -240,7 +240,7 @@ namespace Xfmpc {
 
                        this.store.clear ();
 
-                       while (this.mpdclient.playlist_read (out id, out pos, 
&filename, &song, &length)) {
+                       while (this.mpdclient.playlist_read (out id, out pos, 
out filename, out song, out length)) {
                                append (id, pos, filename, song, length);
                        }
 
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits