[Xfce4-commits] <midori:master> Remove hildon ifdefs from midori view and websettings

[Christian Dywan]

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

commit fde086ab5822086edc9eab5002c0b619a66344c7
Author: Paweł Forysiuk <tuxator at o2.pl>
Date:   Wed Dec 12 23:43:24 2012 +0100

    Remove hildon ifdefs from midori view and websettings

 midori/midori-view.c        |    8 +-------
 midori/midori-websettings.c |    4 +---
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 653c93b..8a7d6c0 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -2639,14 +2639,12 @@ midori_view_populate_popup (MidoriView* view,
         g_signal_connect (menuitem, "activate",
             G_CALLBACK (midori_view_tab_label_menu_window_new_cb), view);
 
-        #if !HAVE_HILDON
         menuitem = sokoke_action_create_popup_menu_item (
                 gtk_action_group_get_action (actions, "ZoomIn"));
         gtk_menu_shell_append (menu_shell, menuitem);
         menuitem = sokoke_action_create_popup_menu_item (
                 gtk_action_group_get_action (actions, "ZoomOut"));
         gtk_menu_shell_append (menu_shell, menuitem);
-        #endif
 
         menuitem = sokoke_action_create_popup_menu_item (
                 gtk_action_group_get_action (actions, "Encoding"));
@@ -3990,11 +3988,7 @@ midori_view_set_uri (MidoriView*  view,
                     GCR_VERSION,
                     GRANITE_VERSION,
                     LIBNOTIFY_VERSION,
-                    #ifdef HAVE_HILDON_2_2
-                    "Hildon 2.2",
-                    #elif HAVE_HILDON
-                    "Hildon",
-                    #elif HAVE_UNIQUE
+                    #if HAVE_UNIQUE
                     "libunique " UNIQUE_VERSION,
                     #else
                     "Sockets",
diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index a56c8c4..781b978 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -688,9 +688,7 @@ midori_web_settings_get_system_name (gchar** architecture,
 
     if (platform != NULL)
         *platform =
-    #if HAVE_HILDON
-    "Maemo;"
-    #elif defined (G_OS_WIN32)
+    #if defined (G_OS_WIN32)
     "Windows";
     #elif defined(GDK_WINDOWING_QUARTZ)
     "Macintosh;";