? abi/src/Untitled1.abw.SAVED
Index: abi/src/af/xap/unix/xap_UnixFrameImpl.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/xap/unix/xap_UnixFrameImpl.cpp,v
retrieving revision 1.81
diff -u -r1.81 xap_UnixFrameImpl.cpp
--- abi/src/af/xap/unix/xap_UnixFrameImpl.cpp	8 Sep 2004 14:36:45 -0000	1.81
+++ abi/src/af/xap/unix/xap_UnixFrameImpl.cpp	14 Sep 2004 18:45:51 -0000
@@ -1534,16 +1534,13 @@
 		return false;
 	}
 
+	int len = 255;
 	char buf[256];
 	buf[0] = 0;
 
-	const char * szAppName = m_pUnixApp->getApplicationTitleForTitleBar();
-
-	int len = 256 - strlen(szAppName) - 4;
-
 	const char * szTitle = getFrame()->getTitle(len);
 
-	sprintf(buf, "%s - %s", szTitle, szAppName);
+	sprintf(buf, "%s", szTitle);
 	if(getFrame()->getFrameMode() == XAP_NormalFrame)
 		gtk_window_set_title(GTK_WINDOW(m_wTopLevelWindow), buf);
 	return true;
Index: abi/src/af/xap/xp/xap_FrameImpl.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/xap/xp/xap_FrameImpl.cpp,v
retrieving revision 1.23
diff -u -r1.23 xap_FrameImpl.cpp
--- abi/src/af/xap/xp/xap_FrameImpl.cpp	11 Apr 2004 17:51:38 -0000	1.23
+++ abi/src/af/xap/xp/xap_FrameImpl.cpp	14 Sep 2004 18:45:53 -0000
@@ -102,7 +102,7 @@
 		m_pFrame->m_sNonDecoratedTitle = m_pFrame->m_sTitle;
 
 		if (m_pFrame->m_pDoc->isDirty())
-			m_pFrame->m_sTitle += " *";
+			m_pFrame->m_sTitle = "*" + m_pFrame->m_sTitle;
 
 		return true;
 	}
@@ -113,7 +113,7 @@
 
 	if (szName && *szName) 
 	{
-		UT_UTF8String sUntruncatedString = szName;
+		UT_UTF8String sUntruncatedString = UT_basename(szName);
 		// WL_FIXME: we probably need a string truncation function, in the ut_utf8string class..
 		UT_UTF8Stringbuf::UTF8Iterator iter = sUntruncatedString.getIterator ();
 		iter = iter.start ();
@@ -143,7 +143,7 @@
 
 	// only for non-untitled documents
 	if (m_pFrame->m_pDoc->isDirty())
-		m_pFrame->m_sTitle += " *";
+		m_pFrame->m_sTitle = "*" + m_pFrame->m_sTitle;
 
 	return true;
 }