2004-03-05 Takao Fujiwara <takao.fujiwara>
* Porting patches from quicksilver
* Added gnome-netstatus-01-g11n-i18n-ui.diff,
gnome-panel-13-g11n-i18n-ui.diff,
gnome-panel-14-g11n-potfiles.diff,
gnome-pilot-04-g11n-i18n-ui.diff
* Updated gnome-panel-02-default-setup.diff
* Deleted gnome-pilot-04-trans-pilot-menu.diff,
gnome-netstatus-01-i18n.diff
--- a/ChangeLog Fri Mar 05 13:18:47 2004 +0000
+++ b/ChangeLog Fri Mar 05 14:53:03 2004 +0000
@@ -1,3 +1,13 @@
+2004-03-05 Takao Fujiwara <takao.fujiwara>
+ * Porting patches from quicksilver
+ * Added gnome-netstatus-01-g11n-i18n-ui.diff,
+ gnome-panel-13-g11n-i18n-ui.diff,
+ gnome-panel-14-g11n-potfiles.diff,
+ gnome-pilot-04-g11n-i18n-ui.diff
+ * Updated gnome-panel-02-default-setup.diff
+ * Deleted gnome-pilot-04-trans-pilot-menu.diff,
+ gnome-netstatus-01-i18n.diff
+
2004-03-05 Vijaykumar Patwari <[email protected]>
* gnome-cups-manager.spec
--- a/gnome-netstatus.spec Fri Mar 05 13:18:47 2004 +0000
+++ b/gnome-netstatus.spec Fri Mar 05 14:53:03 2004 +0000
@@ -16,7 +16,7 @@
Source1: gnome-netstatus-docs-0.1.tar.bz2
Source2: gnome-netstatus-l10n-po-0.9.tar.bz2
Source3: gnome-netstatus-l10n-online-help-qs.tar.bz2
-Patch1: gnome-netstatus-01-i18n.diff
+Patch1: gnome-netstatus-01-g11n-i18n-ui.diff
Patch2: gnome-netstatus-02-right-click-help.diff
Patch3: gnome-netstatus-03-sys-sockio-headers.diff
URL: http://www.gnome.org
@@ -95,7 +95,7 @@
- replace "tar jxf" with "bzcat | tar -xf -"
- run gnome-doc-common and autoheader in build
- specify libexecdir in configure args
-
+
* Fri Feb 27 2004 - <[email protected]>
- Fix gnome-netstatus-02-right-click-help.diff as it was not applying... should have bee tested !
- Fix gnome-netstatus-01-i18n.diff : zh_HK bug in patch.... hmmm
--- a/gnome-panel.spec Fri Mar 05 13:18:47 2004 +0000
+++ b/gnome-panel.spec Fri Mar 05 14:53:03 2004 +0000
@@ -31,6 +31,8 @@
Patch10: gnome-panel-10-show-city-option.diff
Patch11: gnome-panel-11-multi-timezones.diff
Patch12: gnome-panel-12-lockdown.diff
+Patch13: gnome-panel-13-g11n-i18n-ui.diff
+Patch14: gnome-panel-14-g11n-potfiles.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -99,6 +101,8 @@
%endif
%patch12 -p1
+%patch13 -p1
+%patch14 -p1
cp %SOURCE2 icons
bzcat %SOURCE3 | tar xvf -
@@ -207,6 +211,11 @@
%{_mandir}/man3/*
%changelog
+* Fri Mar 05 2004 - [email protected]
+- Added gnome-panel-13-g11n-i18n-ui.diff to fix 5004633
+- Added gnome-panel-14-g11n-potfiles.diff
+- Updated gnome-panel-02-default-setup.diff to fix 4991948
+
* Fri Mar 05 2004 - [email protected]
- Fix to lockdown patch for Menu Bars
--- a/gnome-pilot.spec Fri Mar 05 13:18:47 2004 +0000
+++ b/gnome-pilot.spec Fri Mar 05 14:53:03 2004 +0000
@@ -11,7 +11,7 @@
Patch1: gnome-pilot-01-potfiles-in.diff
Patch2: gnome-pilot-02-menu-entry.diff
Patch3: gnome-pilot-03-add-all-linguas.diff
-Patch4: gnome-pilot-04-trans-pilot-menu.diff
+Patch4: gnome-pilot-04-g11n-i18n-ui.diff
URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Docdir: %{_defaultdocdir}/gnome-pilot
@@ -53,6 +53,9 @@
%patch4 -p1
%build
+LC_ALL=
+LANG=
+export LC_ALL LANG
libtoolize --force
aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros
automake -a -c -f
@@ -104,6 +107,7 @@
%{_datadir}/omf/*
%{_sysconfdir}/gconf/schemas/pilot.schemas
%{_libdir}/*.so.*
+%{_datadir}/gnome-2.0/ui/*
%files -n gnome-pilot-devel
%defattr(-, root, root)
@@ -112,6 +116,10 @@
%{_libdir}/*.so
%changelog
+* Fri Mar 05 2004 - [email protected]
+- Modified %files section in spec file to fix 4932068
+- Changed gnome-pilot-04-trans-pilot-menu.diff to gnome-pilot-04-g11n-i18n-ui.diff
+
* Wed Feb 18 2004 - [email protected]
- Updated distro to Cinnabar, added l10n stuff
- Port patchs 03/04, and libtoolize it
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-netstatus-01-g11n-i18n-ui.diff Fri Mar 05 14:53:03 2004 +0000
@@ -0,0 +1,34 @@
+diff -urN ../gnome-netstatus-0.16/configure.in ./configure.in
+--- ../gnome-netstatus-0.16/configure.in 2004-02-17 10:17:37.000000000 +1300
++++ ./configure.in 2004-02-24 14:18:42.000000000 +1300
+@@ -20,7 +20,7 @@
+ AC_PATH_PROG(GCONFTOOL, gconftool-2)
+ AC_PROG_INTLTOOL
+
+-ALL_LINGUAS="ar az cs de el es fr ga hr it ja ko mn ms nl pl pt ru sk sq sr sr@Latn sv tr vi wa zh_CN"
++ALL_LINGUAS="ar az cs de el es fr ga hr it ja ko mn ms nl pl pt ru sk sq sr sr@Latn sv tr vi wa zh_CN zh_TW pt_BR"
+ AM_GLIB_GNU_GETTEXT
+
+ GNOME_COMPILE_WARNINGS(yes)
+@@ -98,6 +98,15 @@
+ icons/Makefile
+ help/Makefile
+ help/C/Makefile
++help/de/Makefile
++help/es/Makefile
++help/fr/Makefile
++help/it/Makefile
++help/sv/Makefile
++help/ja/Makefile
++help/ko/Makefile
++help/zh_CN/Makefile
++help/zh_TW/Makefile
+ packaging/Makefile
+ packaging/gnome-netstatus.spec
+ ])
+diff -urN ../gnome-netstatus-0.16/help/Makefile.am ./help/Makefile.am
+--- ../gnome-netstatus-0.16/help/Makefile.am 2004-02-11 05:18:54.000000000 +1300
++++ ./help/Makefile.am 2004-02-24 14:19:23.000000000 +1300
+@@ -1 +1 @@
+-SUBDIRS = C
++SUBDIRS = C de es fr it ja ko sv zh_CN zh_TW
--- a/patches/gnome-netstatus-01-i18n.diff Fri Mar 05 13:18:47 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-diff -urN ../gnome-netstatus-0.16/configure.in ./configure.in
---- ../gnome-netstatus-0.16/configure.in 2004-02-17 10:17:37.000000000 +1300
-+++ ./configure.in 2004-02-24 14:18:42.000000000 +1300
-@@ -20,7 +20,7 @@
- AC_PATH_PROG(GCONFTOOL, gconftool-2)
- AC_PROG_INTLTOOL
-
--ALL_LINGUAS="ar az cs de el es fr ga hr it ja ko mn ms nl pl pt ru sk sq sr sr@Latn sv tr vi wa zh_CN"
-+ALL_LINGUAS="ar az cs de el es fr ga hr it ja ko mn ms nl pl pt ru sk sq sr sr@Latn sv tr vi wa zh_CN zh_TW pt_BR"
- AM_GLIB_GNU_GETTEXT
-
- GNOME_COMPILE_WARNINGS(yes)
-@@ -98,6 +98,15 @@
- icons/Makefile
- help/Makefile
- help/C/Makefile
-+help/de/Makefile
-+help/es/Makefile
-+help/fr/Makefile
-+help/it/Makefile
-+help/sv/Makefile
-+help/ja/Makefile
-+help/ko/Makefile
-+help/zh_CN/Makefile
-+help/zh_TW/Makefile
- packaging/Makefile
- packaging/gnome-netstatus.spec
- ])
-diff -urN ../gnome-netstatus-0.16/help/Makefile.am ./help/Makefile.am
---- ../gnome-netstatus-0.16/help/Makefile.am 2004-02-11 05:18:54.000000000 +1300
-+++ ./help/Makefile.am 2004-02-24 14:19:23.000000000 +1300
-@@ -1 +1 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it ja ko sv zh_CN zh_TW
--- a/patches/gnome-panel-02-default-setup.diff Fri Mar 05 13:18:47 2004 +0000
+++ b/patches/gnome-panel-02-default-setup.diff Fri Mar 05 14:53:03 2004 +0000
@@ -1,6 +1,6 @@
-diff -urN ../gnome-panel-2.5.90/applets/wncklet/window-list.schemas.in ./applets/wncklet/window-list.schemas.in
---- ../gnome-panel-2.5.90/applets/wncklet/window-list.schemas.in 2003-07-09 22:36:54.000000000 +1200
-+++ ./applets/wncklet/window-list.schemas.in 2004-02-24 10:51:05.000000000 +1300
+diff -urN gnome-panel-2.5.91-orig/applets/wncklet/window-list.schemas.in gnome-panel-2.5.91/applets/wncklet/window-list.schemas.in
+--- gnome-panel-2.5.91-orig/applets/wncklet/window-list.schemas.in 2004-03-05 18:31:38.000000000 +0900
++++ gnome-panel-2.5.91/applets/wncklet/window-list.schemas.in 2004-03-05 18:32:04.000000000 +0900
@@ -19,7 +19,7 @@
<key>/schemas/apps/window_list_applet/prefs/group_windows</key>
<owner>window-list-applet</owner>
@@ -10,9 +10,9 @@
<locale name="C">
<short>When to group windows</short>
<long>
-diff -urN ../gnome-panel-2.5.90/gnome-panel/panel-default-setup.entries ./gnome-panel/panel-default-setup.entries
---- ../gnome-panel-2.5.90/gnome-panel/panel-default-setup.entries 2004-01-10 01:56:30.000000000 +1300
-+++ ./gnome-panel/panel-default-setup.entries 2004-02-24 10:57:02.000000000 +1300
+diff -urN gnome-panel-2.5.91-orig/gnome-panel/panel-default-setup.entries gnome-panel-2.5.91/gnome-panel/panel-default-setup.entries
+--- gnome-panel-2.5.91-orig/gnome-panel/panel-default-setup.entries 2004-03-05 18:31:38.000000000 +0900
++++ gnome-panel-2.5.91/gnome-panel/panel-default-setup.entries 2004-03-05 18:37:52.000000000 +0900
@@ -10,9 +10,6 @@
<value>
<list type="string">
@@ -67,7 +67,7 @@
</value>
</list>
</value>
-@@ -70,39 +61,6 @@
+@@ -70,50 +61,10 @@
</entrylist>
@@ -107,7 +107,18 @@
<!-- Bottom Panel -->
<entrylist base="/apps/panel/default_setup/toplevels/bottom_panel">
-@@ -131,26 +89,26 @@
+ <entry>
+- <key>name</key>
+- <schema_key>/schemas/apps/panel/toplevels/name</schema_key>
+- <value>
+- <string>Bottom Panel</string>
+- </value>
+- </entry>
+- <entry>
+ <key>expand</key>
+ <schema_key>/schemas/apps/panel/toplevels/expand</schema_key>
+ <value>
+@@ -131,26 +82,26 @@
<key>size</key>
<schema_key>/schemas/apps/panel/toplevels/size</schema_key>
<value>
@@ -139,7 +150,7 @@
</value>
</entry>
<entry>
-@@ -176,21 +134,21 @@
+@@ -176,21 +127,21 @@
</entry>
</entrylist>
@@ -165,7 +176,7 @@
</value>
</entry>
<entry>
-@@ -215,137 +173,50 @@
+@@ -215,137 +166,50 @@
</value>
</entry>
<entry>
@@ -243,9 +254,7 @@
<entry>
- <key>toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-+ <key>action_type</key>
-+ <schema_key>/schemas/apps/panel/objects/action_type</schema_key>
- <value>
+- <value>
- <string>top_panel</string>
- </value>
- </entry>
@@ -285,7 +294,9 @@
- <entry>
- <key>object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-- <value>
++ <key>action_type</key>
++ <schema_key>/schemas/apps/panel/objects/action_type</schema_key>
+ <value>
- <string>bonobo-applet</string>
+ <string>minimize</string>
</value>
@@ -315,7 +326,7 @@
</value>
</entry>
<entry>
-@@ -355,18 +226,11 @@
+@@ -355,18 +219,11 @@
<bool>true</bool>
</value>
</entry>
@@ -336,7 +347,7 @@
<entry>
<key>object_type</key>
<schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-@@ -378,42 +242,42 @@
+@@ -378,42 +235,42 @@
<key>toplevel_id</key>
<schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
<value>
@@ -387,7 +398,7 @@
<entry>
<key>object_type</key>
<schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-@@ -439,7 +303,7 @@
+@@ -439,7 +296,7 @@
<key>panel_right_stick</key>
<schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
<value>
@@ -396,7 +407,7 @@
</value>
</entry>
<entry>
-@@ -451,16 +315,16 @@
+@@ -451,16 +308,16 @@
</entry>
<entry>
<key>bonobo_iid</key>
@@ -417,7 +428,7 @@
<entry>
<key>object_type</key>
<schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-@@ -486,7 +350,7 @@
+@@ -486,7 +343,7 @@
<key>panel_right_stick</key>
<schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
<value>
@@ -426,7 +437,7 @@
</value>
</entry>
<entry>
-@@ -498,16 +362,16 @@
+@@ -498,16 +355,16 @@
</entry>
<entry>
<key>bonobo_iid</key>
@@ -447,7 +458,7 @@
<entry>
<key>object_type</key>
<schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-@@ -526,7 +390,7 @@
+@@ -526,7 +383,7 @@
<key>position</key>
<schema_key>/schemas/apps/panel/objects/position</schema_key>
<value>
@@ -456,7 +467,7 @@
</value>
</entry>
<entry>
-@@ -545,9 +409,9 @@
+@@ -545,9 +402,9 @@
</entry>
<entry>
<key>bonobo_iid</key>
@@ -468,3 +479,17 @@
</value>
</entry>
</entrylist>
+diff -urN gnome-panel-2.5.91-orig/gnome-panel/panel-toplevel.schemas.in gnome-panel-2.5.91/gnome-panel/panel-toplevel.schemas.in
+--- gnome-panel-2.5.91-orig/gnome-panel/panel-toplevel.schemas.in 2004-03-05 18:31:38.000000000 +0900
++++ gnome-panel-2.5.91/gnome-panel/panel-toplevel.schemas.in 2004-03-05 18:43:27.000000000 +0900
+@@ -7,8 +7,9 @@
+ <key>/schemas/apps/panel/toplevels/name</key>
+ <owner>panel</owner>
+ <type>string</type>
+- <default></default>
++ <default>Bottom Panel</default>
+ <locale name="C">
++ <default>Bottom Panel</default>
+ <short>Name to identify panel</short>
+ <long>
+ This is a human readable name which you can use to identify
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-panel-13-g11n-i18n-ui.diff Fri Mar 05 14:53:03 2004 +0000
@@ -0,0 +1,37 @@
+diff -urN gnome-panel-2.5.91-orig/applets/clock/Makefile.am gnome-panel-2.5.91/applets/clock/Makefile.am
+--- gnome-panel-2.5.91-orig/applets/clock/Makefile.am 2004-03-05 16:43:19.000000000 +0900
++++ gnome-panel-2.5.91/applets/clock/Makefile.am 2004-03-05 16:44:31.000000000 +0900
+@@ -12,7 +12,8 @@
+ -DLIBDIR=\""$(libdir)"\" \
+ -DSYSCONFDIR=\""$(sysconfdir)"\" \
+ -DPREFIX=\""$(prefix)"\" \
+- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
++ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
++ -DBONOBO_EXPLICIT_TRANSLATION_DOMAIN=\"$(BONOBO_EXPLICIT_TRANSLATION_DOMAIN)\"
+
+ if HAVE_LIBECAL
+ CALENDAR_SOURCES = \
+diff -urN gnome-panel-2.5.91-orig/configure.in gnome-panel-2.5.91/configure.in
+--- gnome-panel-2.5.91-orig/configure.in 2004-03-05 16:43:19.000000000 +0900
++++ gnome-panel-2.5.91/configure.in 2004-03-05 16:45:28.000000000 +0900
+@@ -194,6 +194,9 @@
+ AC_DEFINE_UNQUOTED(BONOBO_EXPLICIT_TRANSLATION_DOMAIN, "$BONOBO_EXPLICIT_TRANSLATION_DOMAIN")
+ AC_SUBST(BONOBO_EXPLICIT_TRANSLATION_DOMAIN)
+
++BONOBO_EXPLICIT_TRANSLATION_DOMAIN=$GETTEXT_PACKAGE
++AC_SUBST(BONOBO_EXPLICIT_TRANSLATION_DOMAIN)
++
+ ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he hi hr hu id it ja ko li lt lv mk ml mn ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@ije sr@Latn sv ta th tr uk wa vi yi zh_CN zh_TW"
+ AM_GLIB_GNU_GETTEXT
+
+diff -urN gnome-panel-2.5.91-orig/gnome-panel/Makefile.am gnome-panel-2.5.91/gnome-panel/Makefile.am
+--- gnome-panel-2.5.91-orig/gnome-panel/Makefile.am 2004-03-05 16:43:19.000000000 +0900
++++ gnome-panel-2.5.91/gnome-panel/Makefile.am 2004-03-05 16:45:50.000000000 +0900
+@@ -10,6 +10,7 @@
+ -DPANEL_DEBUG \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DGLADEDIR=\""$(datadir)/gnome/panel"\" \
++ -DBONOBO_EXPLICIT_TRANSLATION_DOMAIN=\"$(BONOBO_EXPLICIT_TRANSLATION_DOMAIN)\" \
+ $(DISABLE_DEPRECATED_CFLAGS) \
+ $(STANDARD_PROPERTIES_CFLAGS) \
+ $(ALLOW_CRACKPOT_MENU_CODE) \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-panel-14-g11n-potfiles.diff Fri Mar 05 14:53:03 2004 +0000
@@ -0,0 +1,22 @@
+diff -urN gnome-panel-2.5.91-orig/po/POTFILES.in gnome-panel-2.5.91/po/POTFILES.in
+--- gnome-panel-2.5.91-orig/po/POTFILES.in 2004-03-05 16:11:42.000000000 +0900
++++ gnome-panel-2.5.91/po/POTFILES.in 2004-03-05 16:14:04.000000000 +0900
+@@ -5,6 +5,10 @@
+ applets/clock/calendar-client.c
+ applets/clock/clock.c
+ applets/clock/clock.schemas.in
++applets/clock/cut-n-paste/eggcellrenderertext.c
++applets/clock/multi-timezone.c
++applets/clock/timezone-selection.c
++applets/clock/timezone.glade
+ applets/fish/GNOME_FishApplet.xml
+ applets/fish/GNOME_FishApplet_Factory.server.in.in
+ applets/fish/fish.c
+@@ -57,6 +61,7 @@
+ gnome-panel/panel-frame.c
+ gnome-panel/panel-general.schemas.in
+ gnome-panel/panel-global.schemas.in
++gnome-panel/panel-menu.c
+ gnome-panel/panel-menu-bar.c
+ gnome-panel/panel-menu-button.c
+ gnome-panel/panel-object.schemas.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-pilot-04-g11n-i18n-ui.diff Fri Mar 05 14:53:03 2004 +0000
@@ -0,0 +1,242 @@
+--- ../gnome-pilot-2.0.10.old/applet/GNOME_PilotApplet.server.in.in 2004-02-18 16:37:00.000000000 +0000
++++ ./applet/GNOME_PilotApplet.server.in.in 2004-02-18 16:45:49.000000000 +0000
+@@ -22,7 +22,8 @@
+ <item value="IDL:Bonobo/Unknown:1.0"/>
+ </oaf_attribute>
+
+- <oaf_attribute name="name" type="string" value="Pilot Applet"/>
++ <oaf_attribute name="name" type="string" _value="Pilot Applet"/>
++ <oaf_attribute name="description" type="string" _value="Pilot Applet"/>
+
+ <oaf_attribute name="panel:category" type="string" _value="Utility"/>
+ <oaf_attribute name="panel:icon" type="string" value="sync_icon.png"/>
+--- ../gnome-pilot-2.0.10.old/applet/GNOME_PilotAppletOff.xml 1970-01-01 01:00:00.000000000 +0100
++++ ./applet/GNOME_PilotAppletOff.xml 2004-02-18 16:53:23.000000000 +0000
+@@ -0,0 +1,15 @@
++<Root>
++ <popups>
++ <popup name="button3">
++ <menuitem name="Restore" verb="Restore" _label="Restore..." pixtype="stock" pixname="gtk-properties"/>
++ <menuitem name="Restart" verb="Restart" _label="Restart" pixtype="stock" pixname="gtk-execute"/>
++ <menuitem name="Log" verb="Log" _label="Last log..." pixtype="stock" pixname="gtk-new"/>
++ <menuitem name="Pause Daemon" verb="Pause Daemon" _label="Pause Daemon" pixtype="stock" pixname="stop"/>
++ <separator/>
++ <menuitem name="Props" verb="Props" _label="Preferences..." pixtype="stock" pixname="gtk-properties"/>
++ <menuitem name="Item 2" verb="Help" _label="Help" pixtype="stock" pixname="gtk-help"/>
++ <menuitem name="Item 3" verb="About" _label="About..." pixtype="stock" pixname="gnome-stock-about"/>
++ </popup>
++ </popups>
++</Root>
++
+--- ../gnome-pilot-2.0.10.old/applet/GNOME_PilotAppletOn.xml 1970-01-01 01:00:00.000000000 +0100
++++ ./applet/GNOME_PilotAppletOn.xml 2004-02-18 16:53:27.000000000 +0000
+@@ -0,0 +1,15 @@
++<Root>
++ <popups>
++ <popup name="button3">
++ <menuitem name="Restore" verb="Restore" _label="Restore..." pixtype="stock" pixname="gtk-properties"/>
++ <menuitem name="Restart" verb="Restart" _label="Restart" pixtype="stock" pixname="gtk-execute"/>
++ <menuitem name="Log" verb="Log" _label="Last log..." pixtype="stock" pixname="gtk-new"/>
++ <menuitem name="Continue" verb="Continue" _label="Continue" pixtype="stock" pixname="refresh"/>
++ <separator/>
++ <menuitem name="Props" verb="Props" _label="Preferences..." pixtype="stock" pixname="gtk-properties"/>
++ <menuitem name="Item 2" verb="Help" _label="Help" pixtype="stock" pixname="gtk-help"/>
++ <menuitem name="Item 3" verb="About" _label="About..." pixtype="stock" pixname="gnome-stock-about"/>
++ </popup>
++ </popups>
++</Root>
++
+--- ../gnome-pilot-2.0.10.old/applet/Makefile.am 2004-02-18 16:37:00.000000000 +0000
++++ ./applet/Makefile.am 2004-02-18 16:48:12.000000000 +0000
+@@ -54,6 +54,9 @@
+
+ @INTLTOOL_SERVER_RULE@
+
++uidir = $(datadir)/gnome-2.0/ui
++ui_DATA = GNOME_PilotAppletOn.xml GNOME_PilotAppletOff.xml
++
+ schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+ schemas_in_files = pilot.schemas.in
+ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+@@ -69,6 +72,7 @@
+
+ EXTRA_DIST = \
+ GNOME_PilotApplet.server.in.in \
++ $(ui_DATA) \
+ $(pixmap_DATA) \
+ $(glade_DATA) \
+ $(gobfiles) \
+--- ../gnome-pilot-2.0.10.old/applet/pilot.c 2004-02-18 16:37:00.000000000 +0000
++++ ./applet/pilot.c 2004-02-18 16:52:05.000000000 +0000
+@@ -664,36 +664,33 @@
+ install_popup_menu (PilotApplet *self, gboolean on_off)
+ {
+ char *menu_xml;
+- const char *menu_template =
+- "<popup name=\"button3\">"
+- "<menuitem name=\"Restore\" verb=\"Restore\" _label=\"Restore...\""
+- " pixtype=\"stock\" pixname=\"gtk-properties\"/>"
+- "<menuitem name=\"State\" verb=\"State\" _label=\"%s\""
+- " pixtype=\"stock\" pixname=\"%s\"/>"
+- "<menuitem name=\"Restart\" verb=\"Restart\" _label=\"Restart\""
+- " pixtype=\"stock\" pixname=\"gtk-execute\"/>"
+- "<menuitem name=\"Log\" verb=\"Log\" _label=\"Last log...\""
+- " pixtype=\"stock\" pixname=\"gtk-new\"/>"
+- "<separator/>"
+- "<menuitem name=\"Props\" verb=\"Props\" _label=\"Preferences...\""
+- " pixtype=\"stock\" pixname=\"gtk-properties\"/>"
+- "<menuitem name=\"Item 2\" verb=\"Help\" _label=\"Help\""
+- " pixtype=\"stock\" pixname=\"gtk-help\"/>"
+- "<menuitem name=\"Item 3\" verb=\"About\" _label=\"About...\""
+- " pixtype=\"stock\" pixname=\"gnome-stock-about\"/>"
+- "</popup>";
+
+ if (on_off)
+- menu_xml = g_strdup_printf (menu_template, _("Continue"), "refresh");
++ panel_applet_setup_menu_from_file (self->applet,
++ NULL, /* opt_datadir */
++ "GNOME_PilotAppletOn.xml",
++ NULL,
++ pilot_applet_menu_verbs,
++ self);
+ else
+- menu_xml = g_strdup_printf (menu_template, _("Pause Daemon"), "stop");
++ panel_applet_setup_menu_from_file (self->applet,
++ NULL, /* opt_datadir */
++ "GNOME_PilotAppletOff.xml",
++ NULL,
++ pilot_applet_menu_verbs,
++ self);
+
++ /*
++ menu_xml = g_strdup_printf (menu_template, _("Continue"), "refresh");
++ else
++ menu_xml = g_strdup_printf (menu_template, _("Pause Daemon"), "stop");
+ panel_applet_setup_menu ( self->applet,
+ menu_xml,
+ pilot_applet_menu_verbs,
+ self);
+
+ g_free (menu_xml);
++ */
+ }
+
+ static void
+--- ../gnome-pilot-2.0.10.old/configure.in 2004-02-18 16:55:57.000000000 +0000
++++ ./configure.in 2004-02-18 16:57:24.000000000 +0000
+@@ -145,7 +145,103 @@
+ AC_MSG_ERROR([GOB2 not found and the gob outputfiles are not present, check http://www.5z.com/jirka/gob.html and read the HACKING file])
+ fi
+ else
+- GOB2_CHECK(2.0.3)
++# Extract the first word of "gob2", so it can be a program name with args.
++set dummy gob2; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_GOB2+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $GOB2 in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GOB2="$GOB2" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_GOB2="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++
++ ;;
++esac
++fi
++GOB2=$ac_cv_path_GOB2
++
++if test -n "$GOB2"; then
++ echo "$as_me:$LINENO: result: $GOB2" >&5
++echo "${ECHO_T}$GOB2" >&6
++else
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++ if test ! x$GOB2 = x; then
++ if test ! x2.0.3 = x; then
++ echo "$as_me:$LINENO: checking for gob-2 >= 2.0.3" >&5
++echo $ECHO_N "checking for gob-2 >= 2.0.3... $ECHO_C" >&6
++ g_r_ve=`echo 2.0.3|sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++ g_r_ma=`echo 2.0.3|sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++ g_r_mi=`echo 2.0.3|sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++ g_ve=`$GOB2 --version 2>&1|sed 's/Gob version \([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++ g_ma=`$GOB2 --version 2>&1|sed 's/Gob version \([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++ g_mi=`$GOB2 --version 2>&1|sed 's/Gob version \([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++
++ if test $g_ve -eq $g_r_ve; then
++ if test $g_ma -ge $g_r_ma; then
++ if test $g_mi -ge $g_r_mi; then
++ echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6
++ else
++ if test $g_ma -gt $g_r_ma; then
++ echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6
++ else
++ { { echo "$as_me:$LINENO: error: \"found $g_ve.$g_ma.$g_mi requires $g_r_ve.$g_r_ma.$g_r_mi\"" >&5
++echo "$as_me: error: \"found $g_ve.$g_ma.$g_mi requires $g_r_ve.$g_r_ma.$g_r_mi\"" >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++ fi
++ else
++ { { echo "$as_me:$LINENO: error: \"found $g_ve.$g_ma.$g_mi requires $g_r_ve.$g_r_ma.$g_r_mi\"" >&5
++echo "$as_me: error: \"found $g_ve.$g_ma.$g_mi requires $g_r_ve.$g_r_ma.$g_r_mi\"" >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++ else
++ if test $g_ve -gt $g_r_ve; then
++ echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6
++ else
++ { { echo "$as_me:$LINENO: error: major version $g_ve found but $g_r_ve required" >&5
++echo "$as_me: error: major version $g_ve found but $g_r_ve required" >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++ fi
++
++ unset gob_version
++ unset g_ve
++ unset g_ma
++ unset g_mi
++ unset g_r_ve
++ unset g_r_ma
++ unset g_r_mi
++ fi
++
++
++ else
++ { echo "$as_me:$LINENO: WARNING: Cannot find GOB-2, check http://www.5z.com/jirka/gob.html" >&5
++echo "$as_me: WARNING: Cannot find GOB-2, check http://www.5z.com/jirka/gob.html" >&2;}
++ fi
++
++
+ fi
+
+ dnl ***********
+--- ../gnome-pilot-2.0.10.old/po/POTFILES.in 2004-02-18 16:55:57.000000000 +0000
++++ ./po/POTFILES.in 2004-02-18 16:57:42.000000000 +0000
+@@ -1,6 +1,8 @@
+ # List of source files containing translatable strings.
+ # Please keep this file sorted alphabetically.
+ applet/GNOME_PilotApplet.server.in.in
++applet/GNOME_PilotAppletOn.xml
++applet/GNOME_PilotAppletOff.xml
+ applet/pilot-applet.glade
+ applet/pilot.c
+ applet/pilot.schemas.in
--- a/patches/gnome-pilot-04-trans-pilot-menu.diff Fri Mar 05 13:18:47 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,242 +0,0 @@
---- ../gnome-pilot-2.0.10.old/applet/GNOME_PilotApplet.server.in.in 2004-02-18 16:37:00.000000000 +0000
-+++ ./applet/GNOME_PilotApplet.server.in.in 2004-02-18 16:45:49.000000000 +0000
-@@ -22,7 +22,8 @@
- <item value="IDL:Bonobo/Unknown:1.0"/>
- </oaf_attribute>
-
-- <oaf_attribute name="name" type="string" value="Pilot Applet"/>
-+ <oaf_attribute name="name" type="string" _value="Pilot Applet"/>
-+ <oaf_attribute name="description" type="string" _value="Pilot Applet"/>
-
- <oaf_attribute name="panel:category" type="string" _value="Utility"/>
- <oaf_attribute name="panel:icon" type="string" value="sync_icon.png"/>
---- ../gnome-pilot-2.0.10.old/applet/GNOME_PilotAppletOff.xml 1970-01-01 01:00:00.000000000 +0100
-+++ ./applet/GNOME_PilotAppletOff.xml 2004-02-18 16:53:23.000000000 +0000
-@@ -0,0 +1,15 @@
-+<Root>
-+ <popups>
-+ <popup name="button3">
-+ <menuitem name="Restore" verb="Restore" _label="Restore..." pixtype="stock" pixname="gtk-properties"/>
-+ <menuitem name="Restart" verb="Restart" _label="Restart" pixtype="stock" pixname="gtk-execute"/>
-+ <menuitem name="Log" verb="Log" _label="Last log..." pixtype="stock" pixname="gtk-new"/>
-+ <menuitem name="Pause Daemon" verb="Pause Daemon" _label="Pause Daemon" pixtype="stock" pixname="stop"/>
-+ <separator/>
-+ <menuitem name="Props" verb="Props" _label="Preferences..." pixtype="stock" pixname="gtk-properties"/>
-+ <menuitem name="Item 2" verb="Help" _label="Help" pixtype="stock" pixname="gtk-help"/>
-+ <menuitem name="Item 3" verb="About" _label="About..." pixtype="stock" pixname="gnome-stock-about"/>
-+ </popup>
-+ </popups>
-+</Root>
-+
---- ../gnome-pilot-2.0.10.old/applet/GNOME_PilotAppletOn.xml 1970-01-01 01:00:00.000000000 +0100
-+++ ./applet/GNOME_PilotAppletOn.xml 2004-02-18 16:53:27.000000000 +0000
-@@ -0,0 +1,15 @@
-+<Root>
-+ <popups>
-+ <popup name="button3">
-+ <menuitem name="Restore" verb="Restore" _label="Restore..." pixtype="stock" pixname="gtk-properties"/>
-+ <menuitem name="Restart" verb="Restart" _label="Restart" pixtype="stock" pixname="gtk-execute"/>
-+ <menuitem name="Log" verb="Log" _label="Last log..." pixtype="stock" pixname="gtk-new"/>
-+ <menuitem name="Continue" verb="Continue" _label="Continue" pixtype="stock" pixname="refresh"/>
-+ <separator/>
-+ <menuitem name="Props" verb="Props" _label="Preferences..." pixtype="stock" pixname="gtk-properties"/>
-+ <menuitem name="Item 2" verb="Help" _label="Help" pixtype="stock" pixname="gtk-help"/>
-+ <menuitem name="Item 3" verb="About" _label="About..." pixtype="stock" pixname="gnome-stock-about"/>
-+ </popup>
-+ </popups>
-+</Root>
-+
---- ../gnome-pilot-2.0.10.old/applet/Makefile.am 2004-02-18 16:37:00.000000000 +0000
-+++ ./applet/Makefile.am 2004-02-18 16:48:12.000000000 +0000
-@@ -54,6 +54,9 @@
-
- @INTLTOOL_SERVER_RULE@
-
-+uidir = $(datadir)/gnome-2.0/ui
-+ui_DATA = GNOME_PilotAppletOn.xml GNOME_PilotAppletOff.xml
-+
- schemasdir = $(GCONF_SCHEMA_FILE_DIR)
- schemas_in_files = pilot.schemas.in
- schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-@@ -69,6 +72,7 @@
-
- EXTRA_DIST = \
- GNOME_PilotApplet.server.in.in \
-+ $(ui_DATA) \
- $(pixmap_DATA) \
- $(glade_DATA) \
- $(gobfiles) \
---- ../gnome-pilot-2.0.10.old/applet/pilot.c 2004-02-18 16:37:00.000000000 +0000
-+++ ./applet/pilot.c 2004-02-18 16:52:05.000000000 +0000
-@@ -664,36 +664,33 @@
- install_popup_menu (PilotApplet *self, gboolean on_off)
- {
- char *menu_xml;
-- const char *menu_template =
-- "<popup name=\"button3\">"
-- "<menuitem name=\"Restore\" verb=\"Restore\" _label=\"Restore...\""
-- " pixtype=\"stock\" pixname=\"gtk-properties\"/>"
-- "<menuitem name=\"State\" verb=\"State\" _label=\"%s\""
-- " pixtype=\"stock\" pixname=\"%s\"/>"
-- "<menuitem name=\"Restart\" verb=\"Restart\" _label=\"Restart\""
-- " pixtype=\"stock\" pixname=\"gtk-execute\"/>"
-- "<menuitem name=\"Log\" verb=\"Log\" _label=\"Last log...\""
-- " pixtype=\"stock\" pixname=\"gtk-new\"/>"
-- "<separator/>"
-- "<menuitem name=\"Props\" verb=\"Props\" _label=\"Preferences...\""
-- " pixtype=\"stock\" pixname=\"gtk-properties\"/>"
-- "<menuitem name=\"Item 2\" verb=\"Help\" _label=\"Help\""
-- " pixtype=\"stock\" pixname=\"gtk-help\"/>"
-- "<menuitem name=\"Item 3\" verb=\"About\" _label=\"About...\""
-- " pixtype=\"stock\" pixname=\"gnome-stock-about\"/>"
-- "</popup>";
-
- if (on_off)
-- menu_xml = g_strdup_printf (menu_template, _("Continue"), "refresh");
-+ panel_applet_setup_menu_from_file (self->applet,
-+ NULL, /* opt_datadir */
-+ "GNOME_PilotAppletOn.xml",
-+ NULL,
-+ pilot_applet_menu_verbs,
-+ self);
- else
-- menu_xml = g_strdup_printf (menu_template, _("Pause Daemon"), "stop");
-+ panel_applet_setup_menu_from_file (self->applet,
-+ NULL, /* opt_datadir */
-+ "GNOME_PilotAppletOff.xml",
-+ NULL,
-+ pilot_applet_menu_verbs,
-+ self);
-
-+ /*
-+ menu_xml = g_strdup_printf (menu_template, _("Continue"), "refresh");
-+ else
-+ menu_xml = g_strdup_printf (menu_template, _("Pause Daemon"), "stop");
- panel_applet_setup_menu ( self->applet,
- menu_xml,
- pilot_applet_menu_verbs,
- self);
-
- g_free (menu_xml);
-+ */
- }
-
- static void
---- ../gnome-pilot-2.0.10.old/configure.in 2004-02-18 16:55:57.000000000 +0000
-+++ ./configure.in 2004-02-18 16:57:24.000000000 +0000
-@@ -145,7 +145,103 @@
- AC_MSG_ERROR([GOB2 not found and the gob outputfiles are not present, check http://www.5z.com/jirka/gob.html and read the HACKING file])
- fi
- else
-- GOB2_CHECK(2.0.3)
-+# Extract the first word of "gob2", so it can be a program name with args.
-+set dummy gob2; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_GOB2+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $GOB2 in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_GOB2="$GOB2" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_path_GOB2="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ ;;
-+esac
-+fi
-+GOB2=$ac_cv_path_GOB2
-+
-+if test -n "$GOB2"; then
-+ echo "$as_me:$LINENO: result: $GOB2" >&5
-+echo "${ECHO_T}$GOB2" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ if test ! x$GOB2 = x; then
-+ if test ! x2.0.3 = x; then
-+ echo "$as_me:$LINENO: checking for gob-2 >= 2.0.3" >&5
-+echo $ECHO_N "checking for gob-2 >= 2.0.3... $ECHO_C" >&6
-+ g_r_ve=`echo 2.0.3|sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-+ g_r_ma=`echo 2.0.3|sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-+ g_r_mi=`echo 2.0.3|sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-+ g_ve=`$GOB2 --version 2>&1|sed 's/Gob version \([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-+ g_ma=`$GOB2 --version 2>&1|sed 's/Gob version \([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-+ g_mi=`$GOB2 --version 2>&1|sed 's/Gob version \([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-+
-+ if test $g_ve -eq $g_r_ve; then
-+ if test $g_ma -ge $g_r_ma; then
-+ if test $g_mi -ge $g_r_mi; then
-+ echo "$as_me:$LINENO: result: ok" >&5
-+echo "${ECHO_T}ok" >&6
-+ else
-+ if test $g_ma -gt $g_r_ma; then
-+ echo "$as_me:$LINENO: result: ok" >&5
-+echo "${ECHO_T}ok" >&6
-+ else
-+ { { echo "$as_me:$LINENO: error: \"found $g_ve.$g_ma.$g_mi requires $g_r_ve.$g_r_ma.$g_r_mi\"" >&5
-+echo "$as_me: error: \"found $g_ve.$g_ma.$g_mi requires $g_r_ve.$g_r_ma.$g_r_mi\"" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+ fi
-+ else
-+ { { echo "$as_me:$LINENO: error: \"found $g_ve.$g_ma.$g_mi requires $g_r_ve.$g_r_ma.$g_r_mi\"" >&5
-+echo "$as_me: error: \"found $g_ve.$g_ma.$g_mi requires $g_r_ve.$g_r_ma.$g_r_mi\"" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+ else
-+ if test $g_ve -gt $g_r_ve; then
-+ echo "$as_me:$LINENO: result: ok" >&5
-+echo "${ECHO_T}ok" >&6
-+ else
-+ { { echo "$as_me:$LINENO: error: major version $g_ve found but $g_r_ve required" >&5
-+echo "$as_me: error: major version $g_ve found but $g_r_ve required" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+ fi
-+
-+ unset gob_version
-+ unset g_ve
-+ unset g_ma
-+ unset g_mi
-+ unset g_r_ve
-+ unset g_r_ma
-+ unset g_r_mi
-+ fi
-+
-+
-+ else
-+ { echo "$as_me:$LINENO: WARNING: Cannot find GOB-2, check http://www.5z.com/jirka/gob.html" >&5
-+echo "$as_me: WARNING: Cannot find GOB-2, check http://www.5z.com/jirka/gob.html" >&2;}
-+ fi
-+
-+
- fi
-
- dnl ***********
---- ../gnome-pilot-2.0.10.old/po/POTFILES.in 2004-02-18 16:55:57.000000000 +0000
-+++ ./po/POTFILES.in 2004-02-18 16:57:42.000000000 +0000
-@@ -1,6 +1,8 @@
- # List of source files containing translatable strings.
- # Please keep this file sorted alphabetically.
- applet/GNOME_PilotApplet.server.in.in
-+applet/GNOME_PilotAppletOn.xml
-+applet/GNOME_PilotAppletOff.xml
- applet/pilot-applet.glade
- applet/pilot.c
- applet/pilot.schemas.in