moserial r27 - in trunk: . src

[mjc svn gnome org]

Author: mjc
Date: Wed Mar 18 12:09:42 2009
New Revision: 27
URL: http://svn.gnome.org/viewvc/moserial?rev=27&view=rev

Log:
2009-03-18  Michael J. Chudobiak  <mjc svn gnome org>

        * src/MainWindow.vala:
        Renamed doConnect to connectButtonClick to avoid confusion
        with another function of the same name.

        Removed one pointless warning.

        Check connection status before showing record dialog.



Modified:
   trunk/ChangeLog
   trunk/src/MainWindow.vala

Modified: trunk/src/MainWindow.vala
==============================================================================
--- trunk/src/MainWindow.vala	(original)
+++ trunk/src/MainWindow.vala	Wed Mar 18 12:09:42 2009
@@ -179,7 +179,7 @@
 
                 //setup connectbutton
                 connectButton = (ToggleToolButton)builder.get_object("toolbar_connect");
-                connectButton.clicked += this.doConnect;
+                connectButton.clicked += this.connectButtonClick;
                 disconnectLabel = (Label)builder.get_object("disconnect_label");
                 connectLabel = (Label)builder.get_object("connect_label");
 
@@ -458,6 +458,10 @@
 
         public void record(ToggleToolButton button) {
                 if (button.get_active()) {
+			if (!ensureConnected()) {
+				button.set_active(false);
+				return;
+			}
                         button.set_label_widget(stopRecordingLabel);
                         recordDialog.show(currentPaths.recordTo);
                 } else {
@@ -481,7 +485,6 @@
                         if (!ensureConnected())
                                 stopRecording(dialog);
                 } catch (GLib.Error e) {
-                        warning(_("Error: Could not open %s\n"), filename);
                         var errorDialog = new MessageDialog (gtkWindow, DialogFlags.DESTROY_WITH_PARENT, MessageType.ERROR, ButtonsType.CLOSE, "%s: %s\n%s".printf(_("Error: Could not open file"), filename, e.message));
                         errorDialog.run();
                         errorDialog.destroy();
@@ -577,7 +580,7 @@
                 return true;
         }
 
-        private void doConnect(ToggleToolButton button) {
+        private void connectButtonClick(ToggleToolButton button) {
                 if (button.get_active()) {
                         startConnection();
                 } else {