gnome-main-menu r404 - in trunk: . libslab main-menu/etc

[sreeves svn gnome org]

Author: sreeves
Date: Wed Mar 26 16:24:05 2008
New Revision: 404
URL: http://svn.gnome.org/viewvc/gnome-main-menu?rev=404&view=rev

Log:
Fix for BNC#366732 - use better template files


Added:
   trunk/main-menu/etc/empty.ots   (contents, props changed)
   trunk/main-menu/etc/empty.ott   (contents, props changed)
Removed:
   trunk/main-menu/etc/empty.ods
Modified:
   trunk/ChangeLog
   trunk/libslab/bookmark-agent.c
   trunk/main-menu/etc/Makefile.am

Modified: trunk/libslab/bookmark-agent.c
==============================================================================
--- trunk/libslab/bookmark-agent.c	(original)
+++ trunk/libslab/bookmark-agent.c	Wed Mar 26 16:24:05 2008
@@ -56,7 +56,8 @@
 #define USER_DOCS_STORE_FILE_NAME "documents.xbel"
 #define USER_DIRS_STORE_FILE_NAME "places.xbel"
 #define SYSTEM_STORE_FILE_NAME    "system-items.xbel"
-#define CALC_TEMPLATE_FILE_NAME   "empty.ods"
+#define CALC_TEMPLATE_FILE_NAME   "empty.ots"
+#define WRITER_TEMPLATE_FILE_NAME "empty.ott"
 
 #define GTK_BOOKMARKS_FILE ".gtk-bookmarks"
 
@@ -1057,11 +1058,13 @@
 		dir = g_build_filename (g_get_home_dir (), "Documents", NULL);
 
 		if (! strcmp (uri, "BLANK_SPREADSHEET")) {
-			file = g_strconcat (_("New Spreadsheet"), ".ods", NULL);
+			file = g_strconcat (_("New Spreadsheet"), ".ots", NULL);
 			template = find_package_data_file (CALC_TEMPLATE_FILE_NAME);
 		}
-		else
-			file = g_strconcat (_("New Document"), ".odt", NULL);
+		else {
+			file = g_strconcat (_("New Document"), ".ott", NULL);
+			template = find_package_data_file (WRITER_TEMPLATE_FILE_NAME);
+		}
 
 		path = g_build_filename (dir, file, NULL);
 

Modified: trunk/main-menu/etc/Makefile.am
==============================================================================
--- trunk/main-menu/etc/Makefile.am	(original)
+++ trunk/main-menu/etc/Makefile.am	Wed Mar 26 16:24:05 2008
@@ -14,7 +14,7 @@
 @INTLTOOL_DESKTOP_RULE@
 
 bookmarkdir = $(datadir)/gnome-main-menu
-bookmark_DATA = applications.xbel documents.xbel system-items.xbel places.xbel empty.ods
+bookmark_DATA = applications.xbel documents.xbel system-items.xbel places.xbel empty.ots empty.ott
 
 $(server_DATA).in: $(server_DATA).in.in
 	sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@

Added: trunk/main-menu/etc/empty.ots
==============================================================================
Binary file. No diff available.

Added: trunk/main-menu/etc/empty.ott
==============================================================================
Binary file. No diff available.