From 28217c72d91a6fdef4dddf3c276f84aa6f949822 Mon Sep 17 00:00:00 2001 From: Kaj-Michael Lang Date: Fri, 26 Oct 2007 13:28:07 +0300 Subject: [PATCH] Hildon help --- src/map-repo.c | 2 +- src/route.c | 4 +++- src/settings-gui.c | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/map-repo.c b/src/map-repo.c index 2480e95..f4fd282 100644 --- a/src/map-repo.c +++ b/src/map-repo.c @@ -1140,7 +1140,7 @@ gboolean menu_cb_mapman(GtkAction * action) 2, 3, 4, 5, GTK_EXPAND | GTK_FILL, 0, 4, 0); gtk_entry_set_alignment(GTK_ENTRY(mapman_info.txt_botright_lon), 1.f); -#ifdef WITH_DEVICE_770 +#if defined(WITH_DEVICE_770) && !defined(WITH_HILDON_NEW) /* Set hildon input hints */ g_object_set(G_OBJECT(mapman_info.txt_topleft_lon), HILDON_INPUT_MODE_HINT, diff --git a/src/route.c b/src/route.c index f3e064b..5b14251 100644 --- a/src/route.c +++ b/src/route.c @@ -276,9 +276,11 @@ dialog = gtk_dialog_new_with_buttons(_("Download Route"), GTK_RESPONSE_REJECT, NULL); #ifdef WITH_OSSO_HELP -/* Enable the help button. */ ossohelp_dialog_help_enable(GTK_DIALOG(dialog), HELP_ID_DOWNROUTE, _osso); #endif +#ifdef WITH_HILDON_HELP +hildon_help_dialog_help_enable(GTK_DIALOG(dialog), HELP_ID_DOWNROUTE, _osso); +#endif gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), table = gtk_table_new(2, 5, FALSE), TRUE, TRUE, 0); diff --git a/src/settings-gui.c b/src/settings-gui.c index ceb4ba3..17a9452 100644 --- a/src/settings-gui.c +++ b/src/settings-gui.c @@ -406,9 +406,11 @@ settings_dialog(void) GTK_RESPONSE_ACCEPT, NULL); #ifdef WITH_OSSO_HELP - /* Enable the help button. */ ossohelp_dialog_help_enable(GTK_DIALOG(dialog), HELP_ID_SETTINGS, _osso); #endif +#ifdef WITH_HILDON_HELP + hildon_help_dialog_help_enable(GTK_DIALOG(dialog), HELP_ID_SETTINGS, _osso); +#endif #ifdef WITH_DEVICE_770 gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), btn_buttons = gtk_button_new_with_label(_("Hardware Keys..."))); -- 2.39.5