--- a/gnome-pilot.spec Mon Aug 16 13:22:54 2004 +0000
+++ b/gnome-pilot.spec Mon Aug 16 14:19:42 2004 +0000
@@ -2,7 +2,7 @@
License: GPL/LGPL
Group: Applications/Communications
Version: 2.0.10
-Release: 36
+Release: 37
Distribution: Cinnabar
Vendor: Sun Microsystems, Inc.
Summary: PalmOS link utilities
@@ -15,6 +15,7 @@
Patch4: gnome-pilot-04-g11n-i18n-ui.diff
Patch5: gnome-pilot-05-automake-fix.diff
Patch6: gnome-pilot-06-C_docs.diff
+Patch7: gnome-pilot-07-help-links.diff
URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Docdir: %{_defaultdocdir}/gnome-pilot
@@ -58,6 +59,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%build
%ifos linux
@@ -138,6 +140,9 @@
%{_libdir}/*.so
%changelog
+* Mon Aug 16 2004 - [email protected]
+- Help invocation for the applet is implemented.
+
* Thu Jul 08 2004 - [email protected]
- Updated l10n content to gnome-pilot-l10n-po-1.2.tar.bz2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-pilot-07-help-links.diff Mon Aug 16 14:19:42 2004 +0000
@@ -0,0 +1,99 @@
+--- gnome-pilot-2.0.10/applet/Makefile.am 2004-08-13 07:29:51.000000000 +0530
++++ gnome-pilot-2.0.10-new/applet/Makefile.am 2004-08-13 07:30:00.000000000 +0530
+@@ -34,6 +34,10 @@ gpilot_applet_LDADD = \
+
+ INCLUDES = \
+ -I$(top_srcdir) \
++ -DPREFIX=\""$(prefix)\"" \
++ -DSYSCONFDIR=\""$(sysconfdir)\"" \
++ -DDATADIR=\""$(datadir)\"" \
++ -DLIBDIR=\""$(libdir)\"" \
+ $(GNOME_PILOT_CFLAGS) \
+ $(PILOT_APPLET_CFLAGS) \
+ -DGLADEDATADIR=\""$(gladedir)"\" \
+--- gnome-pilot-2.0.10/applet/pilot.c 2004-08-13 07:29:51.000000000 +0530
++++ gnome-pilot-2.0.10-new/applet/pilot.c 2004-08-13 07:30:00.000000000 +0530
+@@ -452,7 +452,28 @@ properties_cb (BonoboUIComponent *uic, g
+ static void
+ help_cb(BonoboUIComponent *uic, gpointer user_data, const gchar *verbname)
+ {
+- /* FIXME */
++ PilotApplet *applet = user_data;
++ GError *error = NULL;
++
++ gnome_help_display_on_screen ("gnome-pilot", NULL,
++ gtk_widget_get_screen (GTK_WIDGET (applet->applet)),
++ &error);
++
++ if (error)
++ {
++ GtkWidget *message_dialog;
++ message_dialog = gtk_message_dialog_new (NULL, 0,
++ GTK_MESSAGE_ERROR,
++ GTK_BUTTONS_OK,
++ _("There was an error displaying help: %s"),
++ error->message);
++ g_error_free (error);
++ gtk_window_set_screen (GTK_WINDOW (message_dialog),
++ gtk_widget_get_screen (GTK_WIDGET (applet)));
++ gtk_dialog_run (GTK_DIALOG (message_dialog));
++ gtk_widget_destroy (message_dialog);
++ }
++
+ return;
+ }
+
+@@ -1298,7 +1319,7 @@ pilot_applet_factory ( PanelApplet *appl
+ }
+ PANEL_APPLET_BONOBO_FACTORY( "OAFIID:GNOME_PilotApplet_Factory",
+ PANEL_TYPE_APPLET,
+- "Pilot-Applet",
++ "gnome-pilot",
+ "0",
+ (PanelAppletFactoryCallback) pilot_applet_factory,
+ NULL)
+--- gnome-pilot-2.0.10/capplet/gnome-pilot-druid.c 2004-08-13 07:29:52.000000000 +0530
++++ gnome-pilot-2.0.10-new/capplet/gnome-pilot-druid.c 2004-08-13 07:30:00.000000000 +0530
+@@ -467,7 +467,7 @@ gpd_canceled (GnomeDruid *druid, gpointe
+ static void
+ gpd_help (GnomeDruid *druid, gpointer user_data)
+ {
+- gnome_help_display_desktop (NULL, "gnome-pilot", "gnome-pilot.xml", "assistant", NULL);
++ gnome_help_display_desktop (NULL, "gnome-pilot", "gnome-pilot.xml", "gnome-pilot-introduction", NULL);
+ }
+
+ static void
+--- gnome-pilot-2.0.10/capplet/gpilotd-control-applet.c 2004-08-13 07:29:52.000000000 +0530
++++ gnome-pilot-2.0.10-new/capplet/gpilotd-control-applet.c 2004-08-16 10:52:51.000000000 +0530
+@@ -89,19 +89,23 @@ main (int argc, char *argv[])
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
+ if (argc > 1 && strcmp (argv[1], "--druid") == 0) {
+- gnome_init_with_popt_table ("gpilot-control-applet",
+- VERSION, argc, argv,
+- options,0,NULL);
++ gnome_program_init ("gnome-pilot", VERSION,
++ LIBGNOMEUI_MODULE,
++ argc, argv,
++ GNOME_PARAM_POPT_TABLE, options,
++ NULL);
+
+ druid_on = TRUE;
+ druid_prog = TRUE;
+ } else {
+ /* we're a capplet (we get CORBA for free from capplet_init) */
+- switch (gnome_init_with_popt_table ("gpilotd-control-applet", VERSION, argc, argv,
+- options,0,NULL)) {
+- case 1: return 0; break;
+- case -1: g_error (_("Error initializing gpilotd capplet")); break;
+- default: break;
++ if(!gnome_program_init ("gnome-pilot", VERSION,
++ LIBGNOMEUI_MODULE,
++ argc, argv,
++ GNOME_PARAM_POPT_TABLE, options,
++ NULL)) {
++ g_error (_("Error initializing gpilotd capplet"));
++ return 0;
+ }
+ }
+ gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-palm.png");