commit libgnome

15 Sep 2007

Hello community,

here is the log from the commit of package libgnome
checked in at Sat Sep 15 12:05:07 CEST 2007.

--------

--- GNOME/libgnome/libgnome.changes	2007-08-24 20:57:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/libgnome/libgnome.changes	2007-09-15 01:31:03.977921000 +0200
@@ -1,0 +2,11 @@
+Sat Sep 15 01:30:53 CEST 2007 - hpj@suse.de
+
+- Update libgnome-help-bundles.patch to handle more cases.
+
+-------------------------------------------------------------------
+Fri Sep 14 21:36:30 CEST 2007 - hpj@suse.de
+
+- Add libgnome-help-bundles.patch to make apps able to locate help
+  files that live in help-bundle/ instead of help/.
+
+-------------------------------------------------------------------

New:
----
  libgnome-help-bundles.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libgnome.spec ++++++
--- /var/tmp/diff_new_pack.s26909/_old	2007-09-15 12:04:53.000000000 +0200
+++ /var/tmp/diff_new_pack.s26909/_new	2007-09-15 12:04:53.000000000 +0200
@@ -15,9 +15,9 @@
 License:        GPL v2 or later, LGPL v2 or later
 Group:          Development/Libraries/GNOME
 Version:        2.19.1
-Release:        12
+Release:        22
 Summary:        The GNOME 2.x Desktop Base Libraries
-URL:            http://www.gnome.org/
+Url:            http://www.gnome.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         %{name}-%{version}.tar.bz2
 Patch:          pixmaps.diff
@@ -27,9 +27,9 @@
 Patch6:         libgnome-uninitialized-vars.patch
 Patch7:         libgnome-sentinel.patch
 Patch8:         libgnome-va_list-empty.patch
-Autoreqprov:    on
+Patch9:         libgnome-help-bundles.patch
+AutoReqProv:    on
 Requires:       %{name}-lang = %{version}
-
 %gconf_schemas_prereq
 
 %description
@@ -75,6 +75,7 @@
 %patch6
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 autoreconf -f -i
@@ -91,7 +92,6 @@
 %find_gconf_schemas
 cat %{name}.schemas_list >%{name}.lst
 rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a
-
 %fdupes $RPM_BUILD_ROOT
 
 %clean
@@ -101,7 +101,6 @@
 
 %post
 /sbin/ldconfig
-
 %posttrans -f %{name}.schemas_posttrans
 
 %preun -f %{name}.schemas_preun
@@ -144,6 +143,11 @@
 %{_datadir}/gtk-doc/html/libgnome
 
 %changelog
+* Sat Sep 15 2007 - hpj@suse.de
+- Update libgnome-help-bundles.patch to handle more cases.
+* Fri Sep 14 2007 - hpj@suse.de
+- Add libgnome-help-bundles.patch to make apps able to locate help
+  files that live in help-bundle/ instead of help/.
 * Fri Aug 24 2007 - cgaisford@novell.com
 - updated the libgnome-preconf.dif file to disable accessibility
   by default.  This is in reference to Novell Bug #302316.

++++++ libgnome-help-bundles.patch ++++++
diff -upr libgnome-2.19.1-pre/libgnome/gnome-help.c libgnome-2.19.1-post/libgnome/gnome-help.c
--- libgnome-2.19.1-pre/libgnome/gnome-help.c	2007-06-19 16:04:29.000000000 -0500
+++ libgnome-2.19.1-post/libgnome/gnome-help.c	2007-09-14 12:27:12.000000000 -0500
@@ -126,9 +126,11 @@ gnome_help_display_with_doc_id_and_env (
 {
 	gchar *local_help_path;
 	gchar *global_help_path;
+	gchar *bundle_help_path;
 	gchar *file;
 	struct stat local_help_st;
 	struct stat global_help_st;
+	struct stat bundle_help_st;
 	gchar *uri;
 	gchar *free_doc_id = NULL;
 	gboolean retval;
@@ -184,6 +186,14 @@ gnome_help_display_with_doc_id_and_env (
 		goto out;
 	}
 
+	/* Compute the bundle help path */
+
+	bundle_help_path = gnome_program_locate_file (program,
+						      GNOME_FILE_DOMAIN_HELP_BUNDLE,
+						      doc_id,
+						      FALSE /* only_if_exists */,
+						      NULL /* ret_locations */);
+
 	/* Try to access the help paths, first the app-specific help path
 	 * and then falling back to the global help path if the first one fails.
 	 */
@@ -213,6 +223,16 @@ gnome_help_display_with_doc_id_and_env (
 					     global_help_path);
 				goto out;
 			}
+		} else if (bundle_help_path && g_stat (bundle_help_path, &bundle_help_st) == 0) {
+			if (!S_ISDIR (bundle_help_st.st_mode)) {
+				g_set_error (error,
+					     GNOME_HELP_ERROR,
+					     GNOME_HELP_ERROR_NOT_FOUND,
+					     _("Unable to show help as %s is not a directory.  "
+					       "Please check your installation."),
+					     bundle_help_path);
+				goto out;
+			}
 		} else {
 			g_set_error (error,
 				     GNOME_HELP_ERROR,
@@ -227,6 +247,9 @@ gnome_help_display_with_doc_id_and_env (
 		if (!(local_help_st.st_dev == global_help_st.st_dev
 		      && local_help_st.st_ino == global_help_st.st_ino))
 			file = locate_help_file (global_help_path, file_name);
+
+		if (!file && bundle_help_path)
+			file = locate_help_file (bundle_help_path, file_name);
 	}
 
 	if (file == NULL) {
@@ -329,6 +352,7 @@ gnome_help_display_desktop_with_env (Gno
 				     GError       **error)
 {
 	GSList *ret_locations, *li;
+	GSList *ret_locations_2;
 	char *file;
 	gboolean retval;
 	char *url;
@@ -346,6 +370,15 @@ gnome_help_display_desktop_with_env (Gno
 				   FALSE /* only_if_exists */,
 				   &ret_locations);
 
+	ret_locations_2 = NULL;
+	gnome_program_locate_file (program,
+				   GNOME_FILE_DOMAIN_HELP_BUNDLE,
+				   doc_id,
+				   FALSE /* only_if_exists */,
+				   &ret_locations_2);
+
+	ret_locations = g_slist_concat (ret_locations, ret_locations_2);
+
 	if (ret_locations == NULL) {
 		g_set_error (error,
 			     GNOME_HELP_ERROR,
diff -upr libgnome-2.19.1-pre/libgnome/gnome-program.c libgnome-2.19.1-post/libgnome/gnome-program.c
--- libgnome-2.19.1-pre/libgnome/gnome-program.c	2007-09-14 11:41:34.000000000 -0500
+++ libgnome-2.19.1-post/libgnome/gnome-program.c	2007-09-14 11:45:48.000000000 -0500
@@ -994,6 +994,11 @@ gnome_program_locate_file (GnomeProgram 
 	attr_rel = "/gnome/help";
 	search_path = FALSE;
 	break;
+    case GNOME_FILE_DOMAIN_HELP_BUNDLE:
+	prefix_rel = "/share/gnome/help-bundle";
+	attr_name = GNOME_PARAM_GNOME_DATADIR;
+	attr_rel = "/gnome/help-bundle";
+	break;
     default:
 	g_warning (G_STRLOC ": unknown file domain %u", domain);
 	return NULL;
diff -upr libgnome-2.19.1-pre/libgnome/gnome-program.h libgnome-2.19.1-post/libgnome/gnome-program.h
--- libgnome-2.19.1-pre/libgnome/gnome-program.h	2007-09-14 11:41:34.000000000 -0500
+++ libgnome-2.19.1-post/libgnome/gnome-program.h	2007-09-14 11:46:22.000000000 -0500
@@ -70,7 +70,9 @@ typedef enum {
     GNOME_FILE_DOMAIN_APP_SOUND,
     GNOME_FILE_DOMAIN_APP_PIXMAP,
     GNOME_FILE_DOMAIN_APP_CONFIG,
-    GNOME_FILE_DOMAIN_APP_HELP
+    GNOME_FILE_DOMAIN_APP_HELP,
+
+    GNOME_FILE_DOMAIN_HELP_BUNDLE
 } GnomeFileDomain;
 
 struct _GnomeProgram
diff -upr libgnome-2.19.1-pre/libgnome/libgnometypebuiltins.c libgnome-2.19.1-post/libgnome/libgnometypebuiltins.c
--- libgnome-2.19.1-pre/libgnome/libgnometypebuiltins.c	2007-07-30 10:13:43.000000000 -0500
+++ libgnome-2.19.1-post/libgnome/libgnometypebuiltins.c	2007-09-14 11:47:03.000000000 -0500
@@ -42,6 +42,7 @@ static const GEnumValue _gnome_file_doma
   { GNOME_FILE_DOMAIN_APP_PIXMAP, "GNOME_FILE_DOMAIN_APP_PIXMAP", "app-pixmap" },
   { GNOME_FILE_DOMAIN_APP_CONFIG, "GNOME_FILE_DOMAIN_APP_CONFIG", "app-config" },
   { GNOME_FILE_DOMAIN_APP_HELP, "GNOME_FILE_DOMAIN_APP_HELP", "app-help" },
+  { GNOME_FILE_DOMAIN_HELP_BUNDLE, "GNOME_FILE_DOMAIN_HELP_BUNDLE", "help-bundle" },
   { 0, NULL, NULL }
 };
 

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)