Merge lp:~gero-bare/midori/midori-remove-dead-code into lp:midori

[Gero.Bare]

Remove dead code from browser and preferences

In order to compile Midori using clang first it's needed to fix some warnings.

This is dead code that prevents to clang to build properly Midori.

Of course those warnings can be disabled, but that does not address the issue of the dead code.

[Cris Dywan (kalikiana)]

Makes sense.

review: Approve

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2014-09-06 09:02:47 +0000
+++ midori/midori-browser.c	2014-11-05 21:15:41 +0000
@@ -5448,7 +5448,6 @@
         NULL, G_CALLBACK (_action_statusbar_activate),
         FALSE },
 };
-static const guint toggle_entries_n = G_N_ELEMENTS (toggle_entries);
 
 static const GtkRadioActionEntry encoding_entries[] =
 {
@@ -5481,7 +5480,6 @@
         N_("Custom…"), "",
         NULL, 1 },
 };
-static const guint encoding_entries_n = G_N_ELEMENTS (encoding_entries);
 
 typedef struct {
      MidoriBrowser* browser;
@@ -7679,4 +7677,4 @@
     g_return_if_fail (MIDORI_IS_BROWSER (browser));
 
     g_signal_emit (browser, signals[QUIT], 0);
-}
\ No newline at end of file
+}

=== modified file 'midori/midori-preferences.c'
--- midori/midori-preferences.c	2014-02-22 14:06:19 +0000
+++ midori/midori-preferences.c	2014-11-05 21:15:41 +0000
@@ -198,24 +198,6 @@
 }
 #endif
 
-static inline void
-midori_preferences_add_toolbutton (GtkWidget*   toolbar,
-                                   GtkWidget**  toolbutton,
-                                   const gchar* icon,
-                                   const gchar* label,
-                                   GtkWidget*   page)
-{
-#if HAVE_OSX
-    *toolbutton = GTK_WIDGET (*toolbutton ? gtk_radio_tool_button_new_from_widget (
-        GTK_RADIO_TOOL_BUTTON (*toolbutton)) : gtk_radio_tool_button_new (NULL));
-    gtk_tool_button_set_label (GTK_TOOL_BUTTON (*toolbutton), label);
-    gtk_tool_button_set_stock_id (GTK_TOOL_BUTTON (*toolbutton), icon);
-    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (*toolbutton), -1);
-    g_signal_connect (*toolbutton, "clicked",
-        G_CALLBACK (midori_preferences_toolbutton_clicked_cb), page);
-#endif
-}
-
 #if 0
 static void
 midori_preferences_list_dicts_cb (const gchar* lang_tag,