Commit 060e3638 authored by Carlos Garcia Campos's avatar Carlos Garcia Campos
Browse files

Remove bonobo dependency

Libpanel-applet and gnome-panel have been ported to dbus and the applets
have been migrated to the new libpanel-applet API.
See bug #572131.
parent 032315ed
SUBDIRS = \
po \
idl \
data \
icons \
gnome-panel \
libpanel-applet \
......
[Applet Factory]
Id=ClockAppletFactory
InProcess=@IN_PROCESS@
Location=@LOCATION@
_Name=Clock Applet Factory
_Description=Factory for creating clock applets.
[ClockApplet]
_Name=Clock
_Description=Get the current time and date
Icon=gnome-panel-clock
BonoboId=OAFIID:GNOME_ClockApplet
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-panel
X-GNOME-Bugzilla-Component=clock
X-GNOME-Bugzilla-Version=@VERSION@
X-GNOME-Bugzilla-OtherBinaries=clock-applet
<Root>
<popups>
<popup name="button3">
<menuitem name="Clock Copy Time Item" verb="ClockCopyTime" _label="Copy _Time"
pixtype="stock" pixname="gtk-copy"/>
<menuitem name="Clock Copy Date Item" verb="ClockCopyDate" _label="Copy _Date"
pixtype="stock" pixname="gtk-copy"/>
<separator/>
<menuitem name="Clock Configure Item" verb="ClockConfig"
_label="Ad_just Date &amp; Time"
pixtype="stock" pixname="gtk-preferences"/>
<menuitem name="Clock Preferences Item" verb="ClockPreferences" _label="_Preferences"
pixtype="stock" pixname="gtk-properties"/>
<menuitem name="Clock Help Item" verb="ClockHelp" _label="_Help"
pixtype="stock" pixname="gtk-help"/>
<menuitem name="Clock About Item" verb="ClockAbout" _label="_About"
pixtype="stock" pixname="gtk-about"/>
</popup>
</popups>
</Root>
<menuitem name="Clock Copy Time Item" action="ClockCopyTime" />
<menuitem name="Clock Copy Date Item" action="ClockCopyDate" />
<separator/>
<menuitem name="Clock Configure Item" action="ClockConfig" />
<menuitem name="Clock Preferences Item" action="ClockPreferences" />
<menuitem name="Clock Help Item" action="ClockHelp" />
<menuitem name="Clock About Item" action="ClockAbout" />
<oaf_info>
<oaf_server iid="OAFIID:GNOME_ClockApplet_Factory"
type="@TYPE@"
location="@LOCATION@">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/GenericFactory:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" _value="Clock Applet Factory"/>
<oaf_attribute name="description" type="string" _value="Factory for creating clock applets."/>
</oaf_server>
<oaf_server iid="OAFIID:GNOME_ClockApplet"
type="factory"
location="OAFIID:GNOME_ClockApplet_Factory">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" _value="Clock"/>
<oaf_attribute name="description" type="string" _value="Get the current time and date"/>
<oaf_attribute name="panel:icon" type="string" value="gnome-panel-clock"/>
<oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
<oaf_attribute name="bugzilla:product" type="string" value="gnome-panel"/>
<oaf_attribute name="bugzilla:component" type="string" value="clock"/>
<oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
<oaf_attribute name="bugzilla:other_binaries" type="string" value="clock-applet"/>
</oaf_server>
</oaf_info>
......@@ -11,6 +11,7 @@ INCLUDES = \
$(LIBPANEL_APPLET_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DBUILDERDIR=\""$(uidir)"\" \
-DCLOCK_MENU_UI_DIR=\""$(xmluidir)"\" \
-DICONDIR=\""$(datadir)/gnome-panel/pixmaps"\" \
-DLIBDIR=\""$(libdir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
......@@ -137,8 +138,8 @@ gnome_clock_applet_mechanism_LDADD = \
$(POLKIT_LIBS)
if CLOCK_INPROCESS
APPLET_TYPE = shlib
APPLET_LOCATION = $(pkglibdir)/libclock-applet.so
APPLET_IN_PROCESS = true
APPLET_LOCATION = $(pkglibdir)/libclock-applet.so
clock_appletlibdir = $(pkglibdir)
clock_appletlib_LTLIBRARIES = libclock-applet.la
......@@ -150,7 +151,7 @@ $(libclock_applet_la_OBJECTS): $(BUILT_SOURCES)
libexec_PROGRAMS =
else
APPLET_TYPE = exe
APPLET_IN_PROCESS = false
APPLET_LOCATION = $(libexecdir)/clock-applet
libexec_PROGRAMS = clock-applet
......@@ -170,18 +171,29 @@ ui_DATA = clock.ui
xmluidir = $(datadir)/gnome-2.0/ui
xmlui_DATA = GNOME_ClockApplet.xml
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_ClockApplet_Factory.server.in
server_DATA = $(server_in_files:.server.in=.server)
appletdir = $(datadir)/gnome-panel/applets
applet_in_files = GNOME_ClockApplet.panel-applet.in
applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
$(server_in_files): $(server_in_files).in Makefile
$(applet_in_files): $(applet_in_files).in Makefile
$(AM_V_GEN)sed \
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
-e "s|\@TYPE\@|$(APPLET_TYPE)|" \
-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
$< > $@
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
-e "s|\@IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
$< > $@
@INTLTOOL_SERVER_RULE@
@PANEL_INTLTOOL_PANEL_APPLET_RULE@
if !CLOCK_INPROCESS
servicedir = $(datadir)/dbus-1/services
service_in_files = org.gnome.panel.applet.ClockAppletFactory.service.in
service_DATA = $(service_in_files:.service.in=.service)
org.gnome.panel.applet.ClockAppletFactory.service: $(service_in_files)
$(AM_V_GEN)sed \
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
$< > $@
endif
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_in_files = clock.schemas.in
......@@ -238,11 +250,12 @@ test_system_timezone_LDADD = \
$(NULL)
EXTRA_DIST = \
GNOME_ClockApplet_Factory.server.in.in \
GNOME_ClockApplet.panel-applet.in.in \
$(schemas_in_files) \
$(xmlui_DATA) \
$(ui_DATA) \
clock-marshallers.list \
$(service_in_files) \
$(dbus_services_in_files) \
org.gnome.ClockApplet.Mechanism.conf \
$(polkit_in_files) \
......@@ -250,8 +263,9 @@ EXTRA_DIST = \
CLEANFILES = \
$(BUILT_SOURCES) \
$(server_in_files) \
$(server_DATA) \
$(applet_DATA) \
$(applet_DATA).in \
$(service_DATA) \
$(schemas_DATA) \
$(polkit_DATA) \
$(dbus_services_DATA)
......
......@@ -211,19 +211,16 @@ static float get_itime (time_t current_time);
static void set_atk_name_description (GtkWidget *widget,
const char *name,
const char *desc);
static void verb_display_properties_dialog (BonoboUIComponent *uic,
ClockData *cd,
const gchar *verbname);
static void display_properties_dialog (ClockData *cd,
gboolean start_in_locations_page);
static void display_help_dialog (BonoboUIComponent *uic,
ClockData *cd,
const gchar *verbname);
static void display_about_dialog (BonoboUIComponent *uic,
ClockData *cd,
const gchar *verbname);
static void position_calendar_popup (ClockData *cd);
static void verb_display_properties_dialog (GtkAction *action,
ClockData *cd);
static void display_properties_dialog (ClockData *cd,
gboolean start_in_locations_page);
static void display_help_dialog (GtkAction *action,
ClockData *cd);
static void display_about_dialog (GtkAction *action,
ClockData *cd);
static void position_calendar_popup (ClockData *cd);
static void update_orient (ClockData *cd);
static void applet_change_orient (PanelApplet *applet,
PanelAppletOrient orient,
......@@ -1532,9 +1529,8 @@ panel_button_change_pixel_size (GtkWidget *widget,
}
static void
copy_time (BonoboUIComponent *uic,
ClockData *cd,
const gchar *verbname)
copy_time (GtkAction *action,
ClockData *cd)
{
char string[256];
char *utf8;
......@@ -1606,9 +1602,8 @@ copy_time (BonoboUIComponent *uic,
}
static void
copy_date (BonoboUIComponent *uic,
ClockData *cd,
const gchar *verbname)
copy_date (GtkAction *action,
ClockData *cd)
{
struct tm *tm;
char string[256];
......@@ -1856,22 +1851,32 @@ run_time_settings (GtkWidget *unused, ClockData *cd)
}
static void
config_date (BonoboUIComponent *uic,
ClockData *cd,
const char *verbname)
config_date (GtkAction *action,
ClockData *cd)
{
run_time_settings (NULL, cd);
}
/* current timestamp */
static const BonoboUIVerb clock_menu_verbs [] = {
BONOBO_UI_UNSAFE_VERB ("ClockPreferences", verb_display_properties_dialog),
BONOBO_UI_UNSAFE_VERB ("ClockHelp", display_help_dialog),
BONOBO_UI_UNSAFE_VERB ("ClockAbout", display_about_dialog),
BONOBO_UI_UNSAFE_VERB ("ClockCopyTime", copy_time),
BONOBO_UI_UNSAFE_VERB ("ClockCopyDate", copy_date),
BONOBO_UI_UNSAFE_VERB ("ClockConfig", config_date),
BONOBO_UI_VERB_END
static const GtkActionEntry clock_menu_actions [] = {
{ "ClockPreferences", GTK_STOCK_PROPERTIES, N_("_Preferences"),
NULL, NULL,
G_CALLBACK (verb_display_properties_dialog) },
{ "ClockHelp", GTK_STOCK_HELP, N_("_Help"),
NULL, NULL,
G_CALLBACK (display_help_dialog) },
{ "ClockAbout", GTK_STOCK_ABOUT, N_("_About"),
NULL, NULL,
G_CALLBACK (display_about_dialog) },
{ "ClockCopyTime", GTK_STOCK_COPY, N_("Copy _Time"),
NULL, NULL,
G_CALLBACK (copy_time) },
{ "ClockCopyDate", GTK_STOCK_COPY, N_("Copy _Date"),
NULL, NULL,
G_CALLBACK (copy_date) },
{ "ClockConfig", GTK_STOCK_PREFERENCES, N_("Ad_just Date & Time"),
NULL, NULL,
G_CALLBACK (config_date) }
};
static void
......@@ -2569,10 +2574,12 @@ load_gconf_settings (ClockData *cd)
static gboolean
fill_clock_applet (PanelApplet *applet)
{
ClockData *cd;
BonoboUIComponent *popup_component;
char *filename;
GError *error;
ClockData *cd;
GtkActionGroup *action_group;
GtkAction *action;
gchar *ui_path;
char *filename;
GError *error;
panel_applet_add_preferences (applet, CLOCK_SCHEMA_DIR, NULL);
panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
......@@ -2624,34 +2631,32 @@ fill_clock_applet (PanelApplet *applet)
panel_applet_set_background_widget (PANEL_APPLET (cd->applet),
GTK_WIDGET (cd->applet));
action_group = gtk_action_group_new ("ClockApplet Menu Actions");
gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
gtk_action_group_add_actions (action_group,
clock_menu_actions,
G_N_ELEMENTS (clock_menu_actions),
cd);
ui_path = g_build_filename (CLOCK_MENU_UI_DIR, "GNOME_ClockApplet.xml", NULL);
panel_applet_setup_menu_from_file (PANEL_APPLET (cd->applet),
NULL,
"GNOME_ClockApplet.xml",
NULL,
clock_menu_verbs,
cd);
popup_component = panel_applet_get_popup_component (PANEL_APPLET (cd->applet));
ui_path, action_group);
g_free (ui_path);
if (panel_applet_get_locked_down (PANEL_APPLET (cd->applet))) {
bonobo_ui_component_set_prop (popup_component,
"/commands/ClockPreferences",
"hidden", "1",
NULL);
bonobo_ui_component_set_prop (popup_component,
"/commands/ClockConfig",
"hidden", "1",
NULL);
action = gtk_action_group_get_action (action_group, "ClockPreferences");
gtk_action_set_visible (action, FALSE);
action = gtk_action_group_get_action (action_group, "ClockConfig");
gtk_action_set_visible (action, FALSE);
}
cd->systz = system_timezone_new ();
g_signal_connect (cd->systz, "changed",
G_CALLBACK (clock_timezone_changed), cd);
bonobo_ui_component_set_prop (popup_component,
"/commands/ClockConfig",
"hidden", can_set_system_time () ? "0" : "1",
NULL);
action = gtk_action_group_get_action (action_group, "ClockConfig");
gtk_action_set_visible (action, can_set_system_time ());
g_object_unref (action_group);
return TRUE;
}
......@@ -3624,25 +3629,22 @@ display_properties_dialog (ClockData *cd, gboolean start_in_locations_page)
}
static void
verb_display_properties_dialog (BonoboUIComponent *uic,
ClockData *cd,
const gchar *verbname)
verb_display_properties_dialog (GtkAction *action,
ClockData *cd)
{
display_properties_dialog (cd, FALSE);
}
static void
display_help_dialog (BonoboUIComponent *uic,
ClockData *cd,
const gchar *verbname)
display_help_dialog (GtkAction *action,
ClockData *cd)
{
clock_utils_display_help (cd->applet, "clock", NULL);
}
static void
display_about_dialog (BonoboUIComponent *uic,
ClockData *cd,
const gchar *verbname)
display_about_dialog (GtkAction *action,
ClockData *cd)
{
static const gchar *authors[] =
{
......@@ -3697,23 +3699,22 @@ clock_factory (PanelApplet *applet,
{
gboolean retval = FALSE;
if (!strcmp (iid, "OAFIID:GNOME_ClockApplet"))
if (!strcmp (iid, "ClockApplet"))
retval = fill_clock_applet (applet);
return retval;
}
#ifdef CLOCK_INPROCESS
PANEL_APPLET_BONOBO_SHLIB_FACTORY ("OAFIID:GNOME_ClockApplet_Factory",
PANEL_TYPE_APPLET,
"ClockApplet",
clock_factory,
NULL)
PANEL_APPLET_IN_PROCESS_FACTORY ("ClockAppletFactory",
PANEL_TYPE_APPLET,
"ClockApplet",
clock_factory,
NULL)
#else
PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_ClockApplet_Factory",
PANEL_TYPE_APPLET,
"ClockApplet",
"0",
clock_factory,
NULL)
PANEL_APPLET_OUT_PROCESS_FACTORY ("ClockAppletFactory",
PANEL_TYPE_APPLET,
"ClockApplet",
clock_factory,
NULL)
#endif
[D-BUS Service]
Name=org.gnome.panel.applet.ClockAppletFactory
Exec=@LOCATION@
[Applet Factory]
Id=FishAppletFactory
InProcess=@IN_PROCESS@
Location=@LOCATION@
_Name=Wanda Factory
_Description=From Whence That Stupid Fish Came
[FishApplet]
_Name=Fish
_Description=Display a swimming fish or another animated creature
Icon=gnome-panel-fish
BonoboId=OAFIID:GNOME_FishApplet
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-panel
X-GNOME-Bugzilla-Component=fish
X-GNOME-Bugzilla-Version=@VERSION@
X-GNOME-Bugzilla-OtherBinaries=fish-applet-2
<Root>
<popups>
<popup name="button3">
<menuitem name="Fish Preferences Item" verb="FishPreferences" _label="_Preferences"
pixtype="stock" pixname="gtk-properties"/>
<menuitem name="Fish Help Item" verb="FishHelp" _label="_Help"
pixtype="stock" pixname="gtk-help"/>
<menuitem name="Fish About Item" verb="FishAbout" _label="_About"
pixtype="stock" pixname="gtk-about"/>
</popup>
</popups>
</Root>
<menuitem name="Fish Preferences Item" action="FishPreferences"/>
<menuitem name="Fish Help Item" action="FishHelp"/>
<menuitem name="Fish About Item" action="FishAbout"/>
<oaf_info>
<oaf_server iid="OAFIID:GNOME_FishApplet_Factory"
type="@TYPE@"
location="@LOCATION@">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/GenericFactory:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" _value="Wanda Factory"/>
<oaf_attribute name="description" type="string" _value="From Whence That Stupid Fish Came"/>
</oaf_server>
<oaf_server iid="OAFIID:GNOME_FishApplet"
type="factory"
location="OAFIID:GNOME_FishApplet_Factory">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" _value="Fish"/>
<oaf_attribute name="description" type="string" _value="Display a swimming fish or another animated creature"/>
<oaf_attribute name="panel:icon" type="string" value="gnome-panel-fish"/>
<oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
<oaf_attribute name="bugzilla:product" type="string" value="gnome-panel"/>
<oaf_attribute name="bugzilla:component" type="string" value="fish"/>
<oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
<oaf_attribute name="bugzilla:other_binaries" type="string" value="fish-applet-2"/>
</oaf_server>
</oaf_info>
......@@ -5,6 +5,7 @@ INCLUDES = \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DFISH_ICONDIR=\""$(fishbitmapsdir)"\" \
-DFISH_BUILDERDIR=\""$(uidir)"\" \
-DFISH_MENU_UI_DIR=\""$(xmluidir)"\" \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
$(FISH_CFLAGS) \
......@@ -18,8 +19,8 @@ FISH_LDADD = \
$(LIBPANEL_APPLET_LIBS)
if FISH_INPROCESS
APPLET_TYPE = shlib
APPLET_LOCATION = $(pkglibdir)/libfish-applet-2.so
APPLET_IN_PROCESS = true
APPLET_LOCATION = $(pkglibdir)/libfish-applet-2.so
fish_applet_2libdir = $(pkglibdir)
fish_applet_2lib_LTLIBRARIES = libfish-applet-2.la
......@@ -28,7 +29,7 @@ libfish_applet_2_la_LIBADD = $(FISH_LDADD)
libfish_applet_2_la_LDFLAGS = -module -avoid-version
libfish_applet_2_la_CFLAGS =
else
APPLET_TYPE = exe
APPLET_IN_PROCESS = false
APPLET_LOCATION = $(libexecdir)/fish-applet-2
libexec_PROGRAMS = fish-applet-2
......@@ -47,7 +48,8 @@ FISH_BITMAPS = \
EXTRA_DIST = \
wanda.svg \
$(FISH_BITMAPS) \
GNOME_FishApplet_Factory.server.in.in \
GNOME_FishApplet.panel-applet.in.in \
$(service_in_files) \
fish.schemas.in \
$(ui_DATA) \
$(xmlui_DATA)
......@@ -61,20 +63,31 @@ fishbitmaps_DATA = $(FISH_BITMAPS)
xmluidir = $(datadir)/gnome-2.0/ui
xmlui_DATA = GNOME_FishApplet.xml
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_FishApplet_Factory.server.in
server_DATA = $(server_in_files:.server.in=.server)
CLEANFILES = $(schemas_DATA) $(applet_DATA) $(applet_DATA).in $(service_DATA)
$(server_in_files): $(server_in_files).in Makefile
appletdir = $(datadir)/gnome-panel/applets
applet_in_files = GNOME_FishApplet.panel-applet.in
applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
$(applet_in_files): $(applet_in_files).in Makefile
$(AM_V_GEN)sed \
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
-e "s|\@TYPE\@|$(APPLET_TYPE)|" \
-e "s|\@IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
$< > $@
CLEANFILES = $(server_DATA) $(server_DATA).in $(schemas_DATA)
@PANEL_INTLTOOL_PANEL_APPLET_RULE@
if !FISH_INPROCESS
servicedir = $(datadir)/dbus-1/services
service_in_files = org.gnome.panel.applet.FishAppletFactory.service.in
service_DATA = $(service_in_files:.service.in=.service)
@INTLTOOL_SERVER_RULE@
org.gnome.panel.applet.FishAppletFactory.service: $(service_in_files)
$(AM_V_GEN)sed \
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
$< > $@
endif
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_in_files = fish.schemas.in
......
......@@ -408,9 +408,8 @@ chooser_preview_update (GtkFileChooser *file_chooser,
}
static void
display_preferences_dialog (BonoboUIComponent *uic,
FishApplet *fish,
const char *verbname)
display_preferences_dialog (GtkAction *action,
FishApplet *fish)
{
GtkBuilder *builder;
GError *error;
......@@ -570,17 +569,15 @@ display_preferences_dialog (BonoboUIComponent *uic,
}
static void
display_help_dialog (BonoboUIComponent *uic,
FishApplet *fish,
const char *verbname)
display_help_dialog (GtkAction *action,
FishApplet *fish)
{
show_help (fish, NULL);
}
static void
display_about_dialog (BonoboUIComponent *uic,
FishApplet *fish,
const char *verbname)
display_about_dialog (GtkAction *action,
FishApplet *fish)
{
const char *author_format = _("%s the Fish");
const char *about_format = _("%s has no use what-so-ever. "
......@@ -1804,12 +1801,16 @@ setup_fish_widget (FishApplet *fish)
gtk_widget_show_all (widget);
}
static const BonoboUIVerb fish_menu_verbs [] = {
BONOBO_UI_UNSAFE_VERB ("FishPreferences", display_preferences_dialog),
BONOBO_UI_UNSAFE_VERB ("FishHelp", display_help_dialog),
BONOBO_UI_UNSAFE_VERB ("FishAbout", display_about_dialog),
BONOBO_UI_VERB_END
static const GtkActionEntry fish_menu_verbs [] = {
{ "FishPreferences", GTK_STOCK_PROPERTIES, N_("_Preferences"),
NULL, NULL,
G_CALLBACK (display_preferences_dialog) },
{ "FishHelp", GTK_STOCK_HELP, N_("_Help"),
NULL, NULL,
G_CALLBACK (display_help_dialog) },
{ "FishAbout", GTK_STOCK_ABOUT, N_("_About"),