[Xfce4-commits] <midori:master> Drop Hildon from extension code

[Christian Dywan]

Updating branch refs/heads/master
         to 65d8e4987b7bbde56330de8303b4603b75df7b62 (commit)
       from 1c48073b42193c65c7afb6a8851f2fdb9529f979 (commit)

commit 65d8e4987b7bbde56330de8303b4603b75df7b62
Author: Paweł Forysiuk <tuxator at o2.pl>
Date:   Wed Dec 12 17:19:08 2012 +0100

    Drop Hildon from extension code

 extensions/adblock.c     |    2 --
 extensions/wscript_build |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/extensions/adblock.c b/extensions/adblock.c
index 8bb9125..97a7b93 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -493,9 +493,7 @@ adblock_get_preferences_dialog (MidoriExtension* extension)
     dialog = gtk_dialog_new_with_buttons (dialog_title, GTK_WINDOW (browser),
         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);
diff --git a/extensions/wscript_build b/extensions/wscript_build
index 69996c1..86910f1 100644
--- a/extensions/wscript_build
+++ b/extensions/wscript_build
@@ -30,7 +30,7 @@ for extension in extensions:
     obj.target = target
     obj.includes = '.. ../katze ../midori'
     obj.source = source
-    obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML HILDON CLUTTER GRANITE'
+    obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML CLUTTER GRANITE'
     if 'vala' in source:
         obj.env.append_value ('CCFLAGS', '-w')
         obj.vapi_dirs = '../midori ../katze'