diff --git a/icons/wscript_build b/icons/wscript_build index 5a73b4bd..caaa19b9 100644 --- a/icons/wscript_build +++ b/icons/wscript_build @@ -15,11 +15,7 @@ def add_image (bld, category, name): if rsvg_convert: Utils.check_dir (blddir + '/icons') - if bld.env['HAVE_HILDON']: - category = 'hildon' - icon_sizes = [48, 64] - else: - icon_sizes = [16, 22, 24, 32, 48] + icon_sizes = [16, 22, 24, 32, 48] for size in icon_sizes: format = str (size) + 'x' + str (size) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index de1f0e67..cb153d2f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4925,18 +4925,10 @@ static const GtkActionEntry entries[] = { NULL, "r", N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) }, { "ZoomIn", GTK_STOCK_ZOOM_IN, - #if HAVE_HILDON - NULL, "F7", - #else NULL, "plus", - #endif N_("Increase the zoom level"), G_CALLBACK (_action_zoom_in_activate) }, { "ZoomOut", GTK_STOCK_ZOOM_OUT, - #if HAVE_HILDON - NULL, "F8", - #else NULL, "minus", - #endif N_("Decrease the zoom level"), G_CALLBACK (_action_zoom_out_activate) }, { "ZoomNormal", GTK_STOCK_ZOOM_100, NULL, "0", @@ -4950,11 +4942,7 @@ static const GtkActionEntry entries[] = { N_("View the source code of the selection"), NULL/*G_CALLBACK (_action_selection_source_view_activate)*/ }, { "Fullscreen", GTK_STOCK_FULLSCREEN, - #if HAVE_HILDON - NULL, "F6", - #else NULL, "F11", - #endif N_("Toggle fullscreen view"), G_CALLBACK (_action_fullscreen_activate) }, { "Go", NULL, N_("_Go") },