Remove Hildon specific icon and shortcut values

diff --git a/icons/wscript_build b/icons/wscript_build
index 5a73b4bde8a000d18f3a8717e38828dcee1cfd46..caaa19b92a5b40349b231b44017181443879bdcc 100644 (file)
--- 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 de1f0e679062f50d92161babf8f6e31b67a81971..cb153d2f8792ef189bd41d79e4822b259b1793bf 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -4925,18 +4925,10 @@ static const GtkActionEntry entries[] = {
    NULL, "<Ctrl>r",
    N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
  { "ZoomIn", GTK_STOCK_ZOOM_IN,
-   #if HAVE_HILDON
-   NULL, "F7",
-   #else
    NULL, "<Ctrl>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, "<Ctrl>minus",
-   #endif
    N_("Decrease the zoom level"), G_CALLBACK (_action_zoom_out_activate) },
  { "ZoomNormal", GTK_STOCK_ZOOM_100,
    NULL, "<Ctrl>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") },