GNOME.org
 

[moserial] Fixed bug 588022 - Fixes to compile with Vala 0.7.x

commit 83e1f3019371ff944544a7e169be2a2d64beca1e
Author: Marlodavampire <brooss teambb gmail com>
Date:   Mon Aug 17 08:23:12 2009 -0400

    Fixed bug 588022 - Fixes to compile with Vala 0.7.x

 NEWS                           |    7 ++++++-
 src/MainWindow.vala            |    6 +++---
 src/PreferencesDialog.vala     |    6 +++---
 src/ReceiveChooserDialog.vala  |    6 +++---
 src/ReceiveProgressDialog.vala |    2 +-
 src/RecordDialog.vala          |    6 +++---
 src/Rzwrapper.vala             |    4 ++--
 src/SendChooserDialog.vala     |    6 +++---
 src/SendProgressDialog.vala    |    2 +-
 src/SerialConnection.vala      |    2 +-
 src/Szwrapper.vala             |    4 ++--
 src/XmodemFilenameDialog.vala  |    4 ++--
 12 files changed, 30 insertions(+), 25 deletions(-)
---
diff --git a/NEWS b/NEWS
index 8beb217..07ee359 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,9 @@
-version 2.27.4
+Version 2.27.5
+--------------
+
+	* Fixed bug 588022 - Fixes to compile with Vala 0.7.x
+
+Version 2.27.4
 --------------
 
 	* Fixed bug 591473. Re-populate port list every time the settings
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 937e6fe..85ed7bb 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -433,7 +433,7 @@ public class moserial.MainWindow : Gtk.Window //Have to extend Gtk.Winow to get
         public void sendComplete(GLib.Object o) {
 	        sz.updateStatus-=sendProgressDialog.updateStatus;
         	sendProgressDialog.transferCanceled-=sz.transferCanceled;
-                sendProgressDialog.hide(sendProgressDialog);
+                sendProgressDialog.hide();
         }
 
         private void doReceiveChooser(ToolButton button) {
@@ -476,7 +476,7 @@ public class moserial.MainWindow : Gtk.Window //Have to extend Gtk.Winow to get
         public void receiveComplete(GLib.Object o) {
                 rz.updateStatus-=receiveProgressDialog.updateStatus;
                 receiveProgressDialog.transferCanceled-=rz.transferCanceled;
-                receiveProgressDialog.hide(receiveProgressDialog);
+                receiveProgressDialog.hide();
         }
 
         public void record(ToggleToolButton button) {
@@ -620,7 +620,7 @@ public class moserial.MainWindow : Gtk.Window //Have to extend Gtk.Winow to get
                 }
         }
 
-	private void updateIncoming(SerialConnection sc, uchar[1000] data, int size) {
+	private void updateIncoming(SerialConnection sc, uchar[] data, int size) {
                 if (rz.running) {
                         for (int x=0; x<size; x++) {
 	                        rz.writeChar(data[x]);
diff --git a/src/PreferencesDialog.vala b/src/PreferencesDialog.vala
index 35fec36..886ecca 100644
--- a/src/PreferencesDialog.vala
+++ b/src/PreferencesDialog.vala
@@ -36,7 +36,7 @@ public class moserial.PreferencesDialog : GLib.Object
                 dialog.delete_event += hide;
         }
         public void ok(Button button) {
-        	hide(button);
+        	hide();
         	bool pSystemFont;
         	string pFont;
         	string pFontColor;
@@ -106,9 +106,9 @@ public class moserial.PreferencesDialog : GLib.Object
         }
         public void cancel(Widget w) {
                 //currentPreferences=null;
-                hide(w);
+                hide();
         }
-        public bool hide(Widget w) {
+        public bool hide() {
                 dialog.hide_all();
                 return true;
         }
diff --git a/src/ReceiveChooserDialog.vala b/src/ReceiveChooserDialog.vala
index 89e246b..53f7cb4 100644
--- a/src/ReceiveChooserDialog.vala
+++ b/src/ReceiveChooserDialog.vala
@@ -25,17 +25,17 @@ public class moserial.ReceiveChooserDialog : GLib.Object
                 dialog.run();
         }
 
-        public bool hide(Widget w) {
+        public bool hide() {
                 dialog.hide();
                 return true;
         }
 
         private void response(Widget w, int r){
         	if(r == Gtk.ResponseType.CANCEL) {
-        		hide(w);
+        		hide();
 	        }
 	        else if(r == Gtk.ResponseType.ACCEPT) {
-		        hide(w);
+		        hide();
 		        path = dialog.get_current_folder();
 		        startTransfer();
 	        }
diff --git a/src/ReceiveProgressDialog.vala b/src/ReceiveProgressDialog.vala
index 905fde8..b16531c 100644
--- a/src/ReceiveProgressDialog.vala
+++ b/src/ReceiveProgressDialog.vala
@@ -24,7 +24,7 @@ public class moserial.ReceiveProgressDialog : GLib.Object
                 status.set_text("");
         }
 
-        public bool hide(GLib.Object o) {
+        public bool hide() {
                 dialog.hide_all();
                 return true;
         }
diff --git a/src/RecordDialog.vala b/src/RecordDialog.vala
index e270faa..2aefc0d 100644
--- a/src/RecordDialog.vala
+++ b/src/RecordDialog.vala
@@ -31,7 +31,7 @@ public class moserial.RecordDialog : GLib.Object
                 dialog.run();
         }
 
-        public bool hide(Widget w) {
+        public bool hide() {
                 dialog.hide();
                 return true;
         }
@@ -39,7 +39,7 @@ public class moserial.RecordDialog : GLib.Object
         private void response(Widget w, int r){
         	if(r == Gtk.ResponseType.CANCEL) {
         		fileName=null;
-        		hide(w);
+        		hide();
         		stopRecording();
 	        }
 	        else if(r == Gtk.ResponseType.ACCEPT) {
@@ -57,7 +57,7 @@ public class moserial.RecordDialog : GLib.Object
 		        		direction=SerialStreamRecorder.Direction.BOTH;
 		        		break;
 		        }
-		        hide(w);
+		        hide();
 		        startRecording(this.fileName, direction);
 	        }
 	        else {
diff --git a/src/Rzwrapper.vala b/src/Rzwrapper.vala
index 63cce75..b119100 100644
--- a/src/Rzwrapper.vala
+++ b/src/Rzwrapper.vala
@@ -122,7 +122,7 @@ public class moserial.Rzwrapper: GLib.Object
 	}
 	private bool readError(GLib.IOChannel source, GLib.IOCondition condition) {
                 if(running) {
-		        char[1000] m_buf = new char[1000];
+		        char[] m_buf = new char[1000];
 			string message="";
 			string messages="";
 		        size_t bytesRead=0;
@@ -187,7 +187,7 @@ public class moserial.Rzwrapper: GLib.Object
         }
         private bool readBytes(GLib.IOChannel source, GLib.IOCondition condition) {
                 if(running) {
-		        char[1000] m_buf = new char[1000];
+		        char[] m_buf = new char[1000];
 
 		        size_t bytesRead=0;
 		        if(!(condition == IOCondition.IN))
diff --git a/src/SendChooserDialog.vala b/src/SendChooserDialog.vala
index 3c6a870..898c570 100644
--- a/src/SendChooserDialog.vala
+++ b/src/SendChooserDialog.vala
@@ -24,17 +24,17 @@ public class moserial.SendChooserDialog : GLib.Object
                 dialog.run();
         }
 
-        public bool hide(Widget w) {
+        public bool hide() {
                 dialog.hide();
                 return true;
         }
 
         private void response(Widget w, int r){
         	if(r == Gtk.ResponseType.CANCEL) {
-        		hide(w);
+        		hide();
 	        }
 	        else if(r == Gtk.ResponseType.ACCEPT) {
-		        hide(w);
+		        hide();
 		        filename = dialog.get_filename();
 		        startTransfer();
 	        }
diff --git a/src/SendProgressDialog.vala b/src/SendProgressDialog.vala
index f1b9c77..fab875b 100644
--- a/src/SendProgressDialog.vala
+++ b/src/SendProgressDialog.vala
@@ -24,7 +24,7 @@ public class moserial.SendProgressDialog : GLib.Object
                 status.set_text(_("Waiting for remote host"));
         }
 
-        public bool hide(GLib.Object o) {
+        public bool hide() {
                 dialog.hide_all();
                 return true;
         }
diff --git a/src/SerialConnection.vala b/src/SerialConnection.vala
index b3fcc13..21b8888 100644
--- a/src/SerialConnection.vala
+++ b/src/SerialConnection.vala
@@ -128,7 +128,7 @@ public class moserial.SerialConnection : GLib.Object
         }
 
         private bool readBytes(GLib.IOChannel source, GLib.IOCondition condition) {
-                uchar[1000] m_buf = new uchar[1000];
+                uchar[] m_buf = new uchar[1000];
                 int bytesRead=(int)POSIX.File.read(m_fd, m_buf, 1000);
 		rx += (ulong) bytesRead;
                 if (bytesRead<0)
diff --git a/src/Szwrapper.vala b/src/Szwrapper.vala
index 5e87e97..17b7378 100644
--- a/src/Szwrapper.vala
+++ b/src/Szwrapper.vala
@@ -114,7 +114,7 @@ public class moserial.Szwrapper: GLib.Object
         		Gtk.main_iteration_do(true);
         	if(running) {
         	
-                	char[1000] m_buf = new char[1000];
+                	char[] m_buf = new char[1000];
 			string messages="";
 			string message="";
         	        size_t bytesRead=0;
@@ -185,7 +185,7 @@ public class moserial.Szwrapper: GLib.Object
 			Gtk.main_iteration_do(true);
 	         if(running) {
 
-		        char[1024] m_buf = new char[1024];
+		        char[] m_buf = new char[1024];
 
 		        size_t bytesRead=0;
 		        if(!(condition == IOCondition.IN))
diff --git a/src/XmodemFilenameDialog.vala b/src/XmodemFilenameDialog.vala
index cbb3d0a..1c16005 100644
--- a/src/XmodemFilenameDialog.vala
+++ b/src/XmodemFilenameDialog.vala
@@ -18,14 +18,14 @@ public class moserial.XmodemFilenameDialog : GLib.Object
                 dialog.run();
         }
 
-        public bool hide(Widget w) {
+        public bool hide() {
                 dialog.hide();
                 return true;
         }
         
         private void response(Widget w, int r){
         	filename = xmodemFilename.get_text();
-		hide(w);
+		hide();
 		if(filename=="")
 			filename="xmodem.file";
         }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]