From a03cc34f33fb5723b8179b96159863e1370ba498 Mon Sep 17 00:00:00 2001
From: Jim Norman <jnorman@novell.com>
Date: Wed, 1 Feb 2006 16:50:36 +0000
Subject: [PATCH] Rename CASA-1.5.glade to CASA.glade

---
 c_gui/Common.cs                               | 8 +++-----
 c_gui/CommonGUI.cs                            | 4 ++--
 c_gui/images/{casa-1.5.glade => casa.glade}   | 7 +++----
 c_gui/images/{casa-1.5.gladep => casa.gladep} | 4 ++--
 4 files changed, 10 insertions(+), 13 deletions(-)
 rename c_gui/images/{casa-1.5.glade => casa.glade} (97%)
 rename c_gui/images/{casa-1.5.gladep => casa.gladep} (77%)

diff --git a/c_gui/Common.cs b/c_gui/Common.cs
index 4de21694..bd8688c0 100644
--- a/c_gui/Common.cs
+++ b/c_gui/Common.cs
@@ -167,8 +167,7 @@ public class Common
 	if ( (128 == platform) || (4 == platform) )
         {
         	IS_LINUX = true;        	
-        	GladeFile = "/opt/novell/CASA/images/casa-1.5.glade";
-        	//GladeFile = "./images/casa-1.5.glade";
+        	GladeFile = "/opt/novell/CASA/images/casa.glade";        	
         	
         	if( !File.Exists(GladeFile) )
 			{
@@ -181,9 +180,8 @@ public class Common
         }
         else
         {
-        	IS_WINDOWS = true;        	
-        	//Common.GladeFile = Environment.GetEnvironmentVariable("HOMEDRIVE") + "\\Program Files\\Novell\\CASA\\images\\casa-1.5.glade";
-        	GladeFile = "..\\images\\casa-1.5.glade";        	
+        	IS_WINDOWS = true;        	        	
+        	GladeFile = "..\\images\\casa.glade";        	
         	if( !File.Exists(GladeFile) )
 		{
 			Logger.DbgLog("GUI:CasaMain.SetGladeFilePath() - ERROR: Glade file could not be found.");
diff --git a/c_gui/CommonGUI.cs b/c_gui/CommonGUI.cs
index f3c8781a..e7d595f3 100644
--- a/c_gui/CommonGUI.cs
+++ b/c_gui/CommonGUI.cs
@@ -76,10 +76,10 @@ namespace Novell.CASA.GUI
 
 			//Logger.DbgLog("GUI:CasaMain.Login() - IsMasterPasswordSet returned false");    		    
 #if W32
-			Glade.XML gxmlTemp = new Glade.XML ("../images/casa-1.5.glade", "dialogLogin", null);
+			Glade.XML gxmlTemp = new Glade.XML ("../images/casa.glade", "dialogLogin", null);
 #endif
 #if LINUX
-				Glade.XML gxmlTemp = new Glade.XML ("/opt/novell/CASA/images/casa-1.5.glade", "dialogLogin", null);
+				Glade.XML gxmlTemp = new Glade.XML ("/opt/novell/CASA/images/casa.glade", "dialogLogin", null);
 #endif
 			gxmlTemp.Autoconnect (this);
 			//dialogLogin.TransientFor = windowMain;        
diff --git a/c_gui/images/casa-1.5.glade b/c_gui/images/casa.glade
similarity index 97%
rename from c_gui/images/casa-1.5.glade
rename to c_gui/images/casa.glade
index 5be7ee69..dd35911f 100644
--- a/c_gui/images/casa-1.5.glade
+++ b/c_gui/images/casa.glade
@@ -4680,7 +4680,7 @@ CSL Manojna&lt;/b&gt;</property>
 		      <property name="left_margin">0</property>
 		      <property name="right_margin">0</property>
 		      <property name="indent">0</property>
-		      <property name="text" translatable="yes"> *  Copyright (C) 2005-2006 Novell, Inc.
+		      <property name="text" translatable="yes"> *  Copyright (C) 2005-2006 Novell, Inc.  All Rights Reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -4690,11 +4690,10 @@ CSL Manojna&lt;/b&gt;</property>
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
+ *  Library Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  License along with this library; if not, Novell, Inc.
  * 
  *  To contact Novell about this file by physical or electronic mail, 
  *  you may find current contact information at www.novell.com.</property>
diff --git a/c_gui/images/casa-1.5.gladep b/c_gui/images/casa.gladep
similarity index 77%
rename from c_gui/images/casa-1.5.gladep
rename to c_gui/images/casa.gladep
index c88efd46..3bc9b902 100644
--- a/c_gui/images/casa-1.5.gladep
+++ b/c_gui/images/casa.gladep
@@ -2,8 +2,8 @@
 <!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
 
 <glade-project>
-  <name>Casa-1.5</name>
-  <program_name>casa-1.5</program_name>
+  <name>Casa</name>
+  <program_name>casa</program_name>
   <pixmaps_directory></pixmaps_directory>
   <gnome_support>FALSE</gnome_support>
 </glade-project>