rpms/libbonoboui/devel help-error.patch, NONE, 1.1 libbonoboui.spec, 1.56, 1.57

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/libbonoboui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24083

Modified Files:
	libbonoboui.spec 
Added Files:
	help-error.patch 
Log Message:
show a dialog if help is missing


help-error.patch:

--- NEW FILE help-error.patch ---
diff -up libbonoboui-2.19.6/bonobo/bonobo-ui-util.c.help-error libbonoboui-2.19.6/bonobo/bonobo-ui-util.c
--- libbonoboui-2.19.6/bonobo/bonobo-ui-util.c.help-error	2007-02-27 09:07:59.000000000 -0500
+++ libbonoboui-2.19.6/bonobo/bonobo-ui-util.c	2007-09-08 16:19:23.000000000 -0400
@@ -593,8 +593,20 @@ bonobo_help_display_cb (BonoboUIComponen
 		cl->program, doc_id, doc_id, NULL, &error);
 
 	if (error) {
-		/* FIXME: better error handling ? */
-		g_warning ("Error: '%s'", error->message);
+		GtkWidget *dialog;
+
+		dialog = gtk_message_dialog_new (NULL, 0, 
+                                                 GTK_MESSAGE_ERROR,
+						 GTK_BUTTONS_OK,
+						 _("Could not display help for this application"));
+		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+							  error->message);
+		g_signal_connect_swapped (dialog, "response",
+					  G_CALLBACK (gtk_widget_destroy),
+					  dialog);
+
+		gtk_window_present (GTK_WINDOW (dialog));
+
 		g_error_free (error);
 	}
 }


Index: libbonoboui.spec
===================================================================
RCS file: /cvs/extras/rpms/libbonoboui/devel/libbonoboui.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- libbonoboui.spec	23 Aug 2007 18:15:50 -0000	1.56
+++ libbonoboui.spec	8 Sep 2007 20:39:40 -0000	1.57
@@ -14,9 +14,11 @@
 Summary: Bonobo user interface components
 Name: libbonoboui
 Version: 2.19.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libbonoboui/2.19/%{name}-%{version}.tar.bz2
+# http://bugzilla.gnome.org/show_bug.cgi?id=125046
+Patch0: help-error.patch
 License: GPLv2+ and LGPLv2+
 # bonobo-browser is GPL, libbonoboui is LGPL
 Group: System Environment/Libraries
@@ -71,6 +73,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .help-error
 
 %build
 
@@ -119,6 +122,9 @@
 %{_datadir}/gtk-doc/html/libbonoboui
 
 %changelog
+* Sat Sep  8 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-4
+- Display a dialog if help cannot be found
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.6-3
 - Rebuild for ppc toolchain bug