[Xfce4-commits] <midori:master> Remove Hildon headers from browser and panel, update wscript_build

[Christian Dywan]

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

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

    Remove Hildon headers from browser and panel, update wscript_build

 midori/midori-browser.h |    7 -------
 midori/midori-panel.c   |    3 ---
 midori/wscript_build    |    4 ++--
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/midori/midori-browser.h b/midori/midori-browser.h
index 849d1be..43d7461 100644
--- a/midori/midori-browser.h
+++ b/midori/midori-browser.h
@@ -13,9 +13,6 @@
 #define __MIDORI_BROWSER_H__
 
 #include <webkit/webkit.h>
-#if defined(HAVE_HILDON) && HAVE_HILDON
-    #include <hildon/hildon.h>
-#endif
 
 #include <katze/katze.h>
 #include "midori-view.h"
@@ -40,11 +37,7 @@ typedef struct _MidoriBrowserClass           MidoriBrowserClass;
 
 struct _MidoriBrowserClass
 {
-    #if defined(HAVE_HILDON) && HAVE_HILDON
-    HildonWindowClass parent_class;
-    #else
     GtkWindowClass parent_class;
-    #endif
 
     /* Signals */
     void
diff --git a/midori/midori-panel.c b/midori/midori-panel.c
index 22ec10c..0296161 100644
--- a/midori/midori-panel.c
+++ b/midori/midori-panel.c
@@ -20,9 +20,6 @@
 #include <glib/gi18n.h>
 
 #include "config.h"
-#ifdef HAVE_HILDON_2_2
-    #include <hildon/hildon.h>
-#endif
 
 struct _MidoriPanel
 {
diff --git a/midori/wscript_build b/midori/wscript_build
index 179161a..0028a0a 100644
--- a/midori/wscript_build
+++ b/midori/wscript_build
@@ -8,8 +8,8 @@ import os
 
 progressive = True
 libs = 'M UNIQUE LIBSOUP GMODULE GTHREAD LIBIDN GIO GTK SQLITE ' \
-       'LIBNOTIFY WEBKIT JAVASCRIPTCOREGTK LIBXML X11 XSS WS2_32 HILDON' \
-       'HILDON_FM GCR GRANITE CLUTTER ZEITGEIST'
+       'LIBNOTIFY WEBKIT JAVASCRIPTCOREGTK LIBXML X11 XSS WS2_32 ' \
+       'GCR GRANITE CLUTTER ZEITGEIST'
 
 if Options.commands['build'] or Options.commands['check']:
     blddir = str (bld.bldnode)[6:] # dir:// + absolute path