[Xfce4-commits] <midori:master> Wrap variables in location entry in Hildon guards as appropriate

[Christian Dywan]

Updating branch refs/heads/master
         to a2891e0ddb97e73b9b1cd4d398922d3e9ed6913c (commit)
       from 09498f2473f168bb05f45cc5f0c6e36b7847bc8b (commit)

commit a2891e0ddb97e73b9b1cd4d398922d3e9ed6913c
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Oct 23 18:08:25 2009 +0200

    Wrap variables in location entry in Hildon guards as appropriate

 midori/midori-locationaction.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 46e5cea..6b7ad66 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -1262,11 +1262,11 @@ void
 midori_location_action_set_icon (MidoriLocationAction* location_action,
                                  GdkPixbuf*            icon)
 {
+    #if !HAVE_HILDON
     GSList* proxies;
     GtkWidget* location_entry;
     GtkWidget* entry;
 
-    #if !HAVE_HILDON
     g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action));
     g_return_if_fail (!icon || GDK_IS_PIXBUF (icon));
 
@@ -1309,9 +1309,11 @@ midori_location_action_add_item (MidoriLocationAction* location_action,
                                  GdkPixbuf*            icon,
                                  const gchar*          title)
 {
+    #if !HAVE_HILDON
     GSList* proxies;
     GtkWidget* location_entry;
     GtkWidget* entry;
+    #endif
 
     g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action));
     g_return_if_fail (uri != NULL);
@@ -1344,9 +1346,11 @@ midori_location_action_set_icon_for_uri (MidoriLocationAction* location_action,
                                          GdkPixbuf*            icon,
                                          const gchar*          uri)
 {
+    #if !HAVE_HILDON
     GSList* proxies;
     GtkWidget* location_entry;
     GtkWidget* entry;
+    #endif
 
     g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action));
     g_return_if_fail (!icon || GDK_IS_PIXBUF (icon));
@@ -1465,9 +1469,11 @@ void
 midori_location_action_set_secondary_icon (MidoriLocationAction* location_action,
                                            const gchar*          stock_id)
 {
+    #if !HAVE_HILDON
     GSList* proxies;
     GtkWidget* entry;
     GtkWidget* child;
+    #endif
     GtkStockItem stock_item;
 
     g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action));