2011-03-21 Ginn Chen <[email protected]> gnome-2-30
authorginnchen
Mon, 21 Mar 2011 08:13:01 +0000
branchgnome-2-30
changeset 21605 5f0b58d64916
parent 21603 41ba09306fec
child 21607 27abb6364787
2011-03-21 Ginn Chen <[email protected]> * base-specs/yelp.spec: Fix CR #7029370. * patches/yelp-06-print-document-crash.diff:
ChangeLog
base-specs/yelp.spec
patches/yelp-06-print-document-crash.diff
--- a/ChangeLog	Mon Mar 21 05:18:25 2011 +0000
+++ b/ChangeLog	Mon Mar 21 08:13:01 2011 +0000
@@ -1,3 +1,8 @@
+2011-03-21  Ginn Chen  <[email protected]>
+
+	* base-specs/yelp.spec: Fix CR #7029370.
+	* patches/yelp-06-print-document-crash.diff:
+
 2011-03-21  Laszlo (Laca) Peter  <[email protected]>
 
 	* specs/SUNWobsolete-gnome.spec: update to add packages obsoleted
--- a/base-specs/yelp.spec	Mon Mar 21 05:18:25 2011 +0000
+++ b/base-specs/yelp.spec	Mon Mar 21 08:13:01 2011 +0000
@@ -34,7 +34,8 @@
 Patch4:       yelp-04-menu-entry.diff
 # date:2009-06-12 owner:stephen type:bug bugster:6845494
 Patch5:       yelp-05-trusted-extensions.diff
-
+# date:2011-03-21 owner:ginnchen type:bug bugster:7029368
+Patch6:       yelp-06-print-document-crash.diff
 
 
 URL:          www.gnome.org
@@ -97,6 +98,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %ifos linux
@@ -165,6 +167,8 @@
 %{_sysconfdir}/gconf/schemas/yelp.schemas
 
 %changelog
+* Mon Mar 21 2011 - [email protected]
+- Add yelp-06-print-document-crash.diff to fix CR 7029368.
 * Wed Oct 20 2010 - [email protected]
 - Bump to 2.30.2.
 * Mon Apr 26 2010 - [email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/yelp-06-print-document-crash.diff	Mon Mar 21 08:13:01 2011 +0000
@@ -0,0 +1,26 @@
+--- a/src/yelp-db-print.c
++++ b/src/yelp-db-print.c
+@@ -477,17 +477,17 @@ dbprint_process (YelpDbprint *dbprint)
+ 	params_max += 20;
+ 	params = g_renew (gchar *, params, params_max);
+     }
+-    params[params_i++] = "db.chunk.extension";
++    params[params_i++] = g_strdup ("db.chunk.extension");
+     params[params_i++] = g_strdup ("\"\"");
+-    params[params_i++] = "db.chunk.info_basename";
++    params[params_i++] = g_strdup ("db.chunk.info_basename");
+     params[params_i++] = g_strdup ("\"index\"");
+-    params[params_i++] = "db.chunk.max_depth";
++    params[params_i++] = g_strdup ("db.chunk.max_depth");
+     params[params_i++] = g_strdup ("0");
+-    params[params_i++] = "db2html.navbar.top";
++    params[params_i++] = g_strdup ("db2html.navbar.top");
+     params[params_i++] = g_strdup ("0");
+-    params[params_i++] = "db2html.navbar.bottom";
++    params[params_i++] = g_strdup ("db2html.navbar.bottom");
+     params[params_i++] = g_strdup ("0");
+-    params[params_i++] = "db2html.sidenav";
++    params[params_i++] = g_strdup ("db2html.sidenav");
+     params[params_i++] = g_strdup ("0");
+ 
+     params[params_i] = NULL;