Merge branch 'release/debian/1_5.3.0GA-1'HEADdebian/1_5.3.0GA-1master

1 files changed, 17 insertions, 13 deletions

diff --git a/app/wlib/gtklib/main.c b/app/wlib/gtklib/main.c
index 470f17b..7022a0a 100644
--- a/app/wlib/gtklib/main.c
+++ b/app/wlib/gtklib/main.c
@@ -18,7 +18,7 @@
  *

  *  You should have received a copy of the GNU General Public License

  *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

 

 #include <stdio.h>

@@ -46,10 +46,10 @@ char *wExecutableName;
  * Initialize the application name for later use

  *

  * \param _appName IN Name of application

- * \return   

+ * \return

  */

- 

-void 

+

+void

 wInitAppName(char *_appName)

 {

 	appName = g_strdup( _appName );

@@ -59,7 +59,7 @@ char *
 wlibGetAppName()

 {

 	return( appName );

-}	

+}

 

 /*

  *******************************************************************************

@@ -76,17 +76,19 @@ int main( int argc, char *argv[] )
 	wWin_p win;

 	const char *ld;

 

-	if ( getenv( "GTKLIB_NOLOCALE" ) == 0 )

+	if ( getenv( "GTKLIB_NOLOCALE" ) == 0 ) {

 		setlocale( LC_ALL, "en_US" );

+	}

 	gtk_init( &argc, &argv );

 

-	if ((win=wMain( argc, argv )) == NULL)

+	if ((win=wMain( argc, argv )) == NULL) {

 		exit(1);

-    wExecutableName = argv[ 0 ];

+	}

+	wExecutableName = argv[ 0 ];

 	ld = wGetAppLibDir();

-	

+

 #ifdef WINDOWS

-	

+

 #else

 	// set up help search path on unix boxes

 	if (ld != NULL) {

@@ -94,14 +96,16 @@ int main( int argc, char *argv[] )
 		const char *hp;

 

 		sprintf( buff, "HELPPATH=/usr/lib/help:%s:", ld );

-		if ( (hp = getenv("HELPPATH")) != NULL )

+		if ( (hp = getenv("HELPPATH")) != NULL ) {

 			strcat( buff, hp );

+		}

 		putenv( buff );

 	}

 #endif

-	

-	if (!win->shown)

+

+	if (!win->shown) {

 		wWinShow( win, TRUE );

+	}

 

 	gtk_main();

 	exit(0);