[Xfce4-commits] <midori:master> Remove hildon ifdefs from searchaction and preferences

[Christian Dywan]

Updating branch refs/heads/master
         to 8a544d205fda2caeee6bd0da2e256f0646a6175a (commit)
       from e3595152859edc59be11b5dc4946a272459aaf06 (commit)

commit 8a544d205fda2caeee6bd0da2e256f0646a6175a
Author: Paweł Forysiuk <tuxator at o2.pl>
Date:   Wed Dec 12 23:41:59 2012 +0100

    Remove hildon ifdefs from searchaction and preferences

 midori/midori-preferences.c  |    4 ----
 midori/midori-searchaction.c |    2 --
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 9c1db8d..0fe6c58 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -182,7 +182,6 @@ midori_preferences_homepage_current_clicked_cb (GtkWidget*         button,
     }
 }
 
-#if !HAVE_HILDON
 static void
 midori_preferences_notify_proxy_type_cb (MidoriWebSettings* settings,
                                          GParamSpec*        pspec,
@@ -192,7 +191,6 @@ midori_preferences_notify_proxy_type_cb (MidoriWebSettings* settings,
 
     gtk_widget_set_sensitive (entry, proxy_type == MIDORI_PROXY_HTTP);
 }
-#endif
 
 #if HAVE_OSX
 static void
@@ -433,7 +431,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
 
     /* Page "Interface" */
     PAGE_NEW (GTK_STOCK_CONVERT, _("Browsing"));
-    #if !HAVE_HILDON
     if (!g_getenv ("DESKTOP_SESSION"))
     {
         FRAME_NEW (NULL);
@@ -441,7 +438,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
         button = katze_property_proxy (settings, "toolbar-style", NULL);
         SPANNED_ADD (button);
     }
-    #endif
     FRAME_NEW (NULL);
     label = katze_property_label (settings, "open-new-pages-in");
     INDENTED_ADD (label);
diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index 2335113..73060c3 100644
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -1445,9 +1445,7 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action)
         toplevel ? GTK_WINDOW (toplevel) : NULL,
         GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
         #if !HAVE_OSX
-        #if !HAVE_HILDON
         GTK_STOCK_HELP, GTK_RESPONSE_HELP,
-        #endif
         GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
         #endif
         NULL);