[moserial] Fixed a compile issue

[Michael J. Chudobiak <mjc src gnome org>]

commit bda270ec0858b0a76f83a1c67252639c569ca92f
Author: Michael J. Chudobiak <mjc avtechpulse com>
Date:   Wed Jun 24 08:11:24 2009 -0400

    Fixed a compile issue

 gnome-doc-utils.make    |   14 +++++++++-----
 po/Makefile.in.in       |    4 ++--
 src/SettingsDialog.vala |   12 ++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
index 147ab77..b7ea210 100644
--- a/gnome-doc-utils.make
+++ b/gnome-doc-utils.make
@@ -504,14 +504,13 @@ install-doc-docs:
 install-doc-figs:
 	@list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
 	  for lc in C $(_DOC_REAL_LINGUAS); do \
+	    figsymlink=false; \
 	    if test -f "$$lc/$$fig"; then \
 	      figfile="$$lc/$$fig"; \
 	    elif test -f "$(srcdir)/$$lc/$$fig"; then \
 	      figfile="$(srcdir)/$$lc/$$fig"; \
-	    elif test -f "C/$$fig"; then \
-	      figfile="C/$$fig"; \
 	    else \
-	      figfile="$(srcdir)/C/$$fig"; \
+	      figsymlink=true; \
 	    fi; \
 	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
 	    figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
@@ -520,8 +519,13 @@ install-doc-figs:
 	      $(mkinstalldirs) "$$figdir"; \
 	    fi; \
 	    figbase=`echo $$fig | sed -e 's/^.*\///'`; \
-	    echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-	    $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
+	    if $$figsymlink; then \
+	      echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
+	      ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
+	    else \
+	      echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
+	      $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
+	    fi; \
 	  done; \
 	done
 
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 57ef267..c7e8302 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -21,7 +21,7 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
 
 PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
 
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
 
 USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
 
diff --git a/src/SettingsDialog.vala b/src/SettingsDialog.vala
index f660157..29a9def 100644
--- a/src/SettingsDialog.vala
+++ b/src/SettingsDialog.vala
@@ -142,17 +142,17 @@ public class moserial.SettingsDialog : GLib.Object
                 	localEcho.set_active(false);
         }
 
-        public bool hide(Widget w) {
-                dialog.hide_all();
+        public bool hide (Gtk.Widget w, Gdk.Event event) {
+                dialog.hide_all ();
                 return true;
         }
 
-        public void cancel(Widget w) {
+        public void cancel (Widget w) {
                 currentSettings=null;
-                hide(w);
+		dialog.hide_all ();
         }
 
-        public void ok(Widget w) {
+        public void ok (Widget w) {
 
                 string device;
                 int baudRate;
@@ -183,6 +183,6 @@ public class moserial.SettingsDialog : GLib.Object
                 settings = new Settings(device, baudRate, dataBits, stopBits, parity, handshake, accessMode, pLocalEcho);
                 currentSettings = settings;
                 this.updateSettings(currentSettings);
-                this.hide(w);
+                dialog.hide_all ();
         }
 }